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

nekral-guest at alioth.debian.org nekral-guest at alioth.debian.org
Mon Nov 26 22:00:57 UTC 2007


Author: nekral-guest
Date: 2007-11-26 22:00:57 +0000 (Mon, 26 Nov 2007)
New Revision: 1467

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/po/pt.po
   upstream/trunk/po/pt_BR.po
   upstream/trunk/po/ro.po
   upstream/trunk/po/ru.po
   upstream/trunk/po/sk.po
   upstream/trunk/po/sq.po
   upstream/trunk/po/sv.po
   upstream/trunk/po/tl.po
   upstream/trunk/po/tr.po
   upstream/trunk/po/uk.po
   upstream/trunk/po/vi.po
   upstream/trunk/po/zh_CN.po
   upstream/trunk/po/zh_TW.po
Log:
End of the PO unfuzzyfication (after tabulation removal in Usage strings)


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-11-25 22:05:08 UTC (rev 1466)
+++ upstream/trunk/ChangeLog	2007-11-26 22:00:57 UTC (rev 1467)
@@ -29,13 +29,15 @@
 	Usage strings.
 	* po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/es.po,
 	po/eu.po, po/fi.po, po/fr.po, po/gl.po, po/hu.po, po/id.po,
-	po/it.po, po/ja.po, po/nb.po, po/pl.po:
-	Unfuzzy previous changes.
-	* po/bs.po, po/he.po, po/nn.po:
-	No Usage string translated. Just updated PO.
-	* po/dz.po, po/km.po, po/ko.po, po/ne.po, po/nl.po:
-	It would be too error prone for me to unfuzzy these ones. Updated
-	PO. (km and ne should be reviewed: options are translated).
+	po/it.po, po/ja.po, po/nb.po, po/pl.po, po/pt_BR.po, po/pt.po,
+	po/ro.po, po/ru.po, po/sk.po, po/sv.po, po/tl.po, po/tr.po,
+	po/uk.po, po/vi.po: Unfuzzy previous changes.
+	* po/bs.po, po/he.po, po/nn.po, po/sq.po: No Usage string
+	translated. Just updated PO.
+	* po/dz.po, po/km.po, po/ko.po, po/ne.po, po/nl.po, po/zh_CN.po,
+	po/zh_TW.po: It would be too error prone for me to unfuzzy these
+	ones. Updated PO. (km and ne should be reviewed: options are
+	translated).
 
 2007-11-24  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/po/pt.po
===================================================================
--- upstream/trunk/po/pt.po	2007-11-25 22:05:08 UTC (rev 1466)
+++ upstream/trunk/po/pt.po	2007-11-26 22:00:57 UTC (rev 1467)
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
-"PO-Revision-Date: 2006-06-22 18:56+0000\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-26 22:45+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
 "MIME-Version: 1.0\n"
@@ -195,36 +195,37 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "Utilização: chage [opções] [LOGIN]\n"
 "\n"
 "Opções:\n"
-"  -d, --lastday ÚLTIMO_DIA\tdefinir para ÚLTIMO_DIA a última alteração da\n"
-"\t\t\t\tpassword\n"
-"  -E, --expiredate DATA_EXPIRA\tdefinir para DATA_EXPIRA a data em que a\n"
-"\t\t\t\tconta expira\n"
-"  -h, --help\t\t\tmostrar esta mensagem de ajuda e sair\n"
-"  -I, --inactive INACTIVO\tdefine para INACTIVO a password inactiva após\n"
-"\t\t\t\texpirar para INACTIVO\n"
-"  -l, --list\t\t\tmostra informação de envelhecimento da conta\n"
-"  -m, --mindays MIN_DIAS\tdefinir para MIN_DIAS o número minimo de dias\n"
-"\t\t\t\tpara alterar a password\n"
-"  -M, --maxdays MAX_DIAS\tdefinir para MAX_DIAS o número máximo de dias\n"
-"\t\t\t\tpara alterar a password\n"
-"  -W, --warndays DIAS_AVISO\tdefinir para DIAS_AVISO o número de dias para\n"
-"\t\t\t\taviso de expirar\n"
+"  -d, --lastday ÚLTIMO_DIA      definir para ÚLTIMO_DIA a última alteração\n"
+"                                da password\n"
+"  -E, --expiredate DATA_EXPIRA  definir para DATA_EXPIRA a data em que a\n"
+"                                conta expira\n"
+"  -h, --help                    strar esta mensagem de ajuda e sair\n"
+"  -I, --inactive INACTIVO       define para INACTIVO a password inactiva\n"
+"                                após expirar para INACTIVO\n"
+"  -l, --list                    mostra informação de envelhecimento da "
+"conta\n"
+"  -m, --mindays MIN_DIAS        definir para MIN_DIAS o número minimo de\n"
+"                                dias para alterar a password\n"
+"  -M, --maxdays MAX_DIAS        definir para MAX_DIAS o número máximo de\n"
+"                                dias para alterar a password\n"
+"  -W, --warndays DIAS_AVISO     definir para DIAS_AVISO o número de dias\n"
+"                                para aviso de expirar\n"
 "\n"
 
 #, c-format
@@ -467,23 +468,25 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "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"
+"  -e, --encrypted       as passwords fornecidas são encriptadas\n"
+"  -h, --help            mostra esta mensagem de ajuda e sai\n"
+"  -m, --md5             utilizar encriptação MD5 em vez de DES quando as\n"
+"                        passwords fornecidas não são encriptadas\n"
 "\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -563,15 +566,16 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "Utilização: chsh [opções] [LOGIN]\n"
 "\n"
 "Opções:\n"
-"  -h, --help\t\t\tmostrar esta mensagem de ajuda e sair\n"
-"  -s, --shell SHELL\t\t\tnova shell de login para a conta do utilizador\n"
+"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+"  -s, --shell SHELL             nova shell de login para a conta do "
+"utilizador\n"
 "\n"
 
 msgid "Login Shell"
@@ -606,30 +610,38 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "Utilização: faillog [opções]\n"
 "\n"
 "Opções:\n"
-"  -a, --all\t\t\tmostrar os registos de faillog para todos os utilizadores\n"
-"  -h, --help\t\t\tmostrar esta mensagem de ajuda e sair\n"
-"  -l, --lock-time SEG\t\tapós login falhado bloquear conta por SEG segundos\n"
-"  -m, --maximum MAX\t\tdefinir contadores de máximo de logins falhados para\n"
-"\t\t\t\tMAX\n"
-"  -r, --reset\t\t\tesvazia os contadores de login falhados\n"
-"  -t, --time DIAS\t\tmostrar registos do faillog mais recentes do que DIAS\n"
-"  -u, --user LOGIN\t\tmostra o registo de faillog ou contadores de falhas\n"
-"\t\t\t\tmantidos e limites (se utilizado com as opções -r, -m ou -l)\n"
-"\t\t\t\tapenas para o utilizador com o login LOGIN\n"
+"  -a, --all                     mostrar os registos de faillog para todos\n"
+"                                os utilizadores\n"
+"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+"  -l, --lock-time SEG           após login falhado bloquear conta por\n"
+"                                SEG segundos\n"
+"  -m, --maximum MAX             definir contadores de máximo de logins\n"
+"                                falhados para MAX\n"
+"  -r, --reset                   esvazia os contadores de login falhados\n"
+"  -t, --time DIAS               mostrar registos do faillog mais recentes\n"
+"                                do que DIAS\n"
+"  -u, --user LOGIN              mostra o registo de faillog ou contadores "
+"de\n"
+"                                falhas mantidos e limites (se utilizado com\n"
+"                                as opções -r, -m ou -l) apenas para o\n"
+"                                utilizador com o login LOGIN\n"
 "\n"
 
 #, c-format
@@ -758,24 +770,25 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "Utilização: groupadd [opções] GRUPO\n"
-"  -f, --force\t\tforçar sair com status de sucesso se o grupo\n"
-"\t\t\t\tespecificado já existir\n"
-"  -g, --gid GID\t\tutilizar GID para o novo grupo\n"
-"  -h, --help\t\t\tmostrar esta mensagem de ajuda e sair\n"
-"  -k, --key KEY=VALOR\t\tultrapassa os valores por omissão em\n"
-"\t\t\t\t/etc/login.defs\n"
-"  -o, --non-unique\t\tpermite criar grupos com GID duplicado\n"
-"\t\t\t\t(não-único)\n"
+"  -f, --force                   forçar sair com status de sucesso se o "
+"grupo\n"
+"                                especificado já existir\n"
+"  -g, --gid GID                 utilizar GID para o novo grupo\n"
+"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+"  -k, --key KEY=VALOR           ultrapassa os valores por omissão em\n"
+"                                /etc/login.defs\n"
+"  -o, --non-unique              permite criar grupos com GID duplicado\n"
+"                                (não-único)\n"
 "\n"
 
 #, c-format
@@ -906,20 +919,22 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "Utilização: groupmod [opções] GRUPO\n"
 "\n"
 "Opções:\n"
-"  -g, --gid GID\t\tforçar utilizar o novo GID pelo GRUPO\n"
-"  -h, --help\t\t\tmostrar esta mensagem de ajuda e sair\n"
-"  -n, --new-name NOVO_GRUPO\tforçar utilizar NOVO_GRUPO pelo GRUPO\n"
-"  -o, --non-unique\t\tpermitir utilizar,pelo GRUPO, grupos com GID\n"
-"\t\t\t\tduplicado (não-único)\n"
+"  -g, --gid GID                 forçar utilizar o novo GID pelo GRUPO\n"
+"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+"  -n, --new-name NOVO_GRUPO     forçar utilizar NOVO_GRUPO pelo GRUPO\n"
+"  -o, --non-unique              permitir utilizar,pelo GRUPO, grupos com "
+"GID\n"
+"                                duplicado (não-único)\n"
 "\n"
 
 #, c-format
@@ -1072,21 +1087,23 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "Utilização: lastlog [opções]\n"
 "\n"
 "Opções:\n"
-"  -b, --before DIAS\t\tescrever apenas registos de lastlog mais antigos que "
-"\t\t\t\tDIAS\n"
-"  -h, --help\t\t\tmostrar esta mensagem e sai\n"
-"  -t, --time DIAS\t\tescrever apenas registos de lastlog mais recentes que \t"
-"\t\t\t\tDIAS\n"
-"  -u, --user LOGIN\t\tmostra o registo de lastlog para o utilizador LOGIN\n"
+"  -b, --before DIAS             escrever apenas registos de lastlog mais\n"
+"                                antigos que DIAS\n"
+"  -h, --help                    mostrar esta mensagem e sai\n"
+"  -t, --time DIAS               escrever apenas registos de lastlog mais\n"
+"                                recentes que DIAS\n"
+"  -u, --user LOGIN              mostra o registo de lastlog para o\n"
+"                                utilizador LOGIN\n"
 "\n"
 
 #, c-format
@@ -1237,14 +1254,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: não é possível obter acesso exclusivo a /etc/passwd.\n"
@@ -1299,46 +1312,50 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "Utilização: passwd [opções] [LOGIN]\n"
 "\n"
 "Opções:\n"
-"  -a, --all\t\t\treportar o estado das passwords de todas as contas\n"
-"  -d, --delete\t\t\tapagar a password para a conta indicada\n"
-"  -e, --expire\t\t\tforçar que a password expire para a conta indicada\n"
-"  -h, --help\t\t\tmostrar esta mensagem de ajuda e sair\n"
-"  -k, --keep-tokens\t\tapenas mudar a password se tiver expirado\n"
-"  -i, --inactive INACTIVA\tdefinir a password como inactiva após expirar\n"
-"\t\t\t\tem INACTIVA (dias)\n"
-"  -l, --lock\t\t\tbloquear a conta indicada\n"
-"  -n, --mindays MIN_DIAS\tdefinir para MIN_DIAS o número de dias antes\n"
-"\t\t\t\tde alterar a password\n"
-"  -q, --quiet\t\t\tmodo discreto\n"
-"  -r, --repository REPOSITÓRIO\tmudar a password no repositório REPOSITÓRIO\n"
-"  -S, --status\t\t\treportar estado da password na conta indicada\n"
-"  -u, --unlock\t\t\tdesbloquear a conta indicada\n"
-"  -w, --warndays AVISAR_DIAS\tdefinir para AVISAR_DIAS o número de dias\n"
-"\t\t\t\tpara alerta de expirar\n"
-"  -x, --maxdays MAX_DIAS\tdefinir para MAX_DIAS o número de dias máximo\n"
-"\t\t\t\tantes de alterar a password\n"
+"  -a, --all                     reportar o estado das passwords de todas\n"
+"                                as contas\n"
+"  -d, --delete                  apagar a password para a conta indicada\n"
+"  -e, --expire                  forçar que a password expire para a conta\n"
+"                                indicada\n"
+"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+"  -k, --keep-tokens             apenas mudar a password se tiver expirado\n"
+"  -i, --inactive INACTIVA       definir a password como inactiva após\n"
+"                                expirar em INACTIVA (dias)\n"
+"  -l, --lock                    bloquear a conta indicada\n"
+"  -n, --mindays MIN_DIAS        definir para MIN_DIAS o número de dias\n"
+"                                antes de alterar a password\n"
+"  -q, --quiet                   modo discreto\n"
+"  -r, --repository REPOSITÓRIO  mudar a password no repositório REPOSITÓRIO\n"
+"  -S, --status                  reportar estado da password na conta\n"
+"                                indicada\n"
+"  -u, --unlock                  desbloquear a conta indicada\n"
+"  -w, --warndays AVISAR_DIAS    definir para AVISAR_DIAS o número de dias\n"
+"                                para alerta de expirar\n"
+"  -x, --maxdays MAX_DIAS        definir para MAX_DIAS o número de dias\n"
+"                                máximo antes de alterar a password\n"
 "\n"
 
 msgid "Old password: "
@@ -1524,25 +1541,25 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "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 sair\n"
-"  -, -l, --login\t\ttornar a shell numa shell de login\n"
+"  -c, --command COMANDO         passar COMANDO à shell invocada\n"
+"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+"  -, -l, --login                tornar a shell numa shell de login\n"
 "  -m, -p,\n"
-"  --preserve-environment\tnão fazer reset às variáveis de ambiente, e\n"
-"\t\t\t\tmanter a mesma shell\n"
-"  -s, --shell SHELL\t\tutilizar SHELL em vez da omissão em passwd\n"
+"  --preserve-environment        não fazer reset às variáveis de ambiente, e\n"
+"                                manter a mesma shell\n"
+"  -s, --shell SHELL             utilizar SHELL em vez da omissão em passwd\n"
 "\n"
 
 #, c-format
@@ -1629,61 +1646,66 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "Utilização: useradd [opções] LOGIN\n"
 "\n"
 "Opções:\n"
-"  -b, --base-dir BASE_DIR\tdirectório base para o directório home\n"
-"\t\t\t\tda conta do novo utilizador\n"
-"  -c, --comment COMENTÁRIO\t\tdefine o campo GECOS para a conta\n"
-"\t\t\t\tdo novo utilizador  -d, --home-dir HOME_DIR\tdirectório home para a\n"
-"\t\t\t\tconta do novo utilizador\n"
-"  -D, --defaults\t\tmostra ou grava a alterada configuração\n"
-"\t\t\t\tpor omissão do useradd\n"
-"  -e, --expiredate EXPIRE_DATE\tdefine para EXPIRE_DATE a data em\n"
-"\t\t\t\tque a conta expira\n"
-"  -f, --inactive INACTIVE\tdefine a password inactiva após expirar\n"
-"\t\t\t\tapós INACTIVE\n"
-"  -g, --gid GRUPO\t\tforça a utilização do GRUPO para a conta do\n"
-"\t\t\t\tnovo utilizador\n"
-"  -G, --groups GRUPOS\t\tlista de grupos adicionais para a conta\n"
-"\t\t\t\tdo novo utilizador\n"
-"  -h, --help\t\t\tmostra esta mensagem e termina\n"
-"  -k, --skel SKEL_DIR\t\tespecifica um directório SKEL alternativo\n"
-"  -K, --key KEY=VALUE\t\tultrapassa os valores padrão de /etc/login.defs\n"
-"  -m, --create-home\t\tcriar directório home para a conta\n"
-"\t\t\t\tdo novo utilizador\n"
-"  -o, --non-unique\t\tpermite criar utilizador com UID duplicado\n"
-"\t\t\t\t(não-único)\n"
-"  -p, --password PASSWORD\tutilizar password encriptada para a\n"
-"\t\t\t\tconta do novo utilizador\n"
-"  -s, --shell SHELL\t\tshell de login para a conta do novo utilizador\n"
-"  -u, --uid UID\t\t\tforça a utilização do UID para a conta do novo\n"
-"\t\t\t\tutilizador\n"
+"  -b, --base-dir BASE_DIR       directório base para o directório home\n"
+"                                da conta do novo utilizador\n"
+"  -c, --comment COMENTÁRIO      define o campo GECOS para a conta\n"
+"                                do novo utilizador\n"
+"  -d, --home-dir HOME_DIR       directório home para a\n"
+"                                conta do novo utilizador\n"
+"  -D, --defaults                mostra ou grava a alterada configuração\n"
+"                                por omissão do useradd\n"
+"  -e, --expiredate EXPIRE_DATE  define para EXPIRE_DATE a data em\n"
+"                                que a conta expira\n"
+"  -f, --inactive INACTIVE       define a password inactiva após expirar\n"
+"                                após INACTIVE\n"
+"  -g, --gid GRUPO               força a utilização do GRUPO para a conta do\n"
+"                                novo utilizador\n"
+"  -G, --groups GRUPOS           lista de grupos adicionais para a conta\n"
+"                                do novo utilizador\n"
+"  -h, --help                    mostra esta mensagem e termina\n"
+"  -k, --skel SKEL_DIR           especifica um directório SKEL alternativo\n"
+"  -K, --key KEY=VALUE           ultrapassa os valores padrão de /etc/login."
+"defs\n"
+"  -m, --create-home             criar directório home para a conta\n"
+"                                do novo utilizador\n"
+"  -o, --non-unique              permite criar utilizador com UID duplicado\n"
+"                                (não-único)\n"
+"  -p, --password PASSWORD       utilizar password encriptada para a\n"
+"                                conta do novo utilizador\n"
+"  -s, --shell SHELL             shell de login para a conta do novo "
+"utilizador\n"
+"  -u, --uid UID                 força a utilização do UID para a conta do "
+"novo\n"
+"                                utilizador\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1835,18 +1857,20 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 "Utilização: userdel [opções] LOGIN\n"
 "\n"
 "Opções:\n"
-"  -f, --force\t\t\tforçar a remoção de ficheiros, mesmo que não pertençam\n"
-"\t\t\t\tao utilizador\n"
-"  -h, --help\t\t\tmostrar esta mensagem de ajuda e sair\n"
-"  -r, --remove\t\t\tremover o directório home e o spool de mail\n"
+"  -f, --force                   forçar a remoção de ficheiros,\n"
+"                                mesmo que não pertençam\n"
+"                                ao utilizador\n"
+"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+"  -r, --remove                  remover o directório home e o spool de mail\n"
 "\n"
 
 #, c-format
@@ -1913,52 +1937,56 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "Utilização: usermod [opções] LOGIN\n"
 "\n"
 "Opções:\n"
-"  -a, --append\t\t\tjuntar o utilizador aos GRUPOS suplementares\n"
-"\t\t\t(usar apenas com -G)\n"
-"  -c, --comment COMENTÁRIO\tnovo valor do campo GECOS\n"
-"  -d, --home HOME_DIR\t\tnovo directório para a conta do utilizador\n"
-"  -e, --expiredate DATA_EXPIRAR\tdefine a data em que a conta expira\n"
-"\t\t\t\tpara DATA_EXPIRAR\n"
-"  -f, --inactive INACTIVA\tdefine a password como inactiva após expirar em\n"
-"\t\t\t\tINACTIVA\n"
-"  -g, --gid GRUPO\t\tforçar a utilização do GRUPO como novo grupo primário\n"
-"  -G, --groups GRUPOS\t\tnova lista de grupos adicionais\n"
-"  -h, --help\t\t\tmostrar esta mensagem de ajuda e sair\n"
-"  -l, --login NEW_LOGIN\t\tnovo valor para o nome de login\n"
-"  -L, --lock\t\t\tbloquear a conta do utilizador\n"
-"  -m, --move-home\t\tmover o conteúdo do directório home para o novo\n"
-"\t\t\t\tlocal (usar apenas com -d)\n"
-"  -o, --non-unique\t\tpermite utilizador UIDs duplicados (não únicos)\n"
-"  -p, --password PASSWORD\tutilizar password encriptada para a nova nova\n"
-"\t\t\t\tpassword\n"
-"  -s, --shell SHELL\t\tnova shell de login para a conta do utilizador\n"
-"  -u, --uid UID\t\t\tnovo UID para a conta do utilizador\n"
-"  -U, --unlock\t\t\tdesbloquear a conta do utilizador\n"
+"  -a, --append                  juntar o utilizador aos GRUPOS "
+"suplementares\n"
+"                                (usar apenas com -G)\n"
+"  -c, --comment COMENTÁRIO      novo valor do campo GECOS\n"
+"  -d, --home HOME_DIR           novo directório para a conta do utilizador\n"
+"  -e, --expiredate DATA_EXPIRAR define a data em que a conta expira\n"
+"                                para DATA_EXPIRAR\n"
+"  -f, --inactive INACTIVA       define a password como inactiva após\n"
+"                                expirar em INACTIVA\n"
+"  -g, --gid GRUPO               forçar a utilização do GRUPO como novo\n"
+"                                grupo primário\n"
+"  -G, --groups GRUPOS           nova lista de grupos adicionais\n"
+"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+"  -l, --login NEW_LOGIN         novo valor para o nome de login\n"
+"  -L, --lock                    bloquear a conta do utilizador\n"
+"  -m, --move-home               mover o conteúdo do directório home para\n"
+"                                o novo local (usar apenas com -d)\n"
+"  -o, --non-unique              permite utilizador UIDs duplicados (não "
+"únicos)\n"
+"  -p, --password PASSWORD       utilizar password encriptada para a nova\n"
+"                                password\n"
+"  -s, --shell SHELL             nova shell de login para a conta do "
+"utilizador\n"
+"  -u, --uid UID                 novo UID para a conta do utilizador\n"
+"  -U, --unlock                  desbloquear a conta do utilizador\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2029,19 +2057,19 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "Utilização: vipw [opções]\n"
-"  -g, --group\t\t\teditar a base de dados group\n"
-"  -h, --help\t\t\tmostrar esta mensagem de ajuda e terminar\n"
-"  -p, --passwd\t\t\teditar a base de dados passwd\n"
-"  -q, --quit\t\t\tmodo silencioso\n"
-"  -s, --shadow\t\t\teditar a base de dados shadow ou gshadow\n"
+"  -g, --group                   editar a base de dados group\n"
+"  -h, --help                    mostrar esta mensagem de ajuda e terminar\n"
+"  -p, --passwd                  editar a base de dados passwd\n"
+"  -q, --quit                    modo silencioso\n"
+"  -s, --shadow                  editar a base de dados shadow ou gshadow\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/pt_BR.po
===================================================================
--- upstream/trunk/po/pt_BR.po	2007-11-25 22:05:08 UTC (rev 1466)
+++ upstream/trunk/po/pt_BR.po	2007-11-26 22:00:57 UTC (rev 1467)
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.15\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
-"PO-Revision-Date: 2006-03-12 12:33-0300\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-26 11:23+0100\n"
 "Last-Translator: André Luís Lopes <andrelop at debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -199,35 +199,36 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "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\n"
-"\t\t\t\tDATA_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\n"
-"\t\t\t\tAVISO_DIAS\n"
+"  -d, --lastday ULTIMO_DIA         define última mudança de senha para "
+"ULTIMO_DIA\n"
+"  -E, --expiredate DATA_EXPIRAÇÂO  define data de expiração de senha para\n"
+"                                   DATA_EXPIRAÇÂO\n"
+"  -h, --help                       exibe esta mensagem de ajuda e finaliza\n"
+"  -I, --inactive INATIVO           define senha inativa após expiração\n"
+"                                   para INATIVO\n"
+"  -l, --list                       exibe informação sobre idade da conta\n"
+"  -m, --mindays MIN_DIAS           define números mínimo de dias antes da\n"
+"                                   troca de senha para MIN_DIAS\n"
+"  -M, --maxdays MAX_DIAS           define números máximo de dias antes da\n"
+"                                   troca de senha para MAX_DIAS\n"
+"  -W, --warndays AVISO_DIAS        define dias para aviso de expiração para\n"
+"                                   AVISO_DIAS\n"
 "\n"
 
 #, c-format
@@ -468,23 +469,27 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "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"
+"  -e, --encrypted               senhas fornecidas estão encriptadas\n"
+"  -h, --help                    exibir esta mensagem de ajuda e finalizar\n"
+"  -m, --md5                     utilizar ecriptação MD5 ao invés de DES "
+"quando\n"
+"                                as senhas fornecidas não estiverem "
+"encriptadas\n"
 "\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -564,8 +569,8 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 
@@ -601,29 +606,32 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "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"
+"  -a, --all             exibir registros faillog para todos os usuários\n"
+"  -h, --help            exibiri esta mensagem de ajuda e finalizar\n"
+"  -l, --lock-time SEG   após falha de login travar conta por SEG segundos\n"
+"  -m, --maximum MAX     define contadores de logins falhos para MAX\n"
+"  -r, --reset           zerar os contadores de falhas de login\n"
+"  -t, --time DIAS       exibir registros faillog mais recentes que DIAS\n"
+"  -u, --user LOGIN      exibir registros faillog ou manter somente\n"
+"                        contadores de falhas e limites (caso usado com\n"
+"                        as opções -r, -m ou -l) para usuário com LOGIN\n"
 "\n"
 
 #, c-format
@@ -752,25 +760,25 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "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"
+"  -f, --force                   forçar sair com estado de sucesso caso\n"
+"                                grupo especificado já exista\n"
+"  -g, --gid GID                 utilizar GID para o novo grupo\n"
+"  -h, --help                    exibir esta mensagem de ajuda e finalizar\n"
+"  -K, --key CHAVE=VALOR         sobrepõe os padrões em /etc/login.defs\n"
+"  -o, --non-unique              permiti criar grupo com GID duplicado\n"
+"                                (não-único)\n"
 "\n"
 
 #, c-format
@@ -898,22 +906,23 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "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"
+"  -f, --force                   forçar sair com estado de sucesso caso\n"
+"                                grupo especificado já exista\n"
+"  -g, --gid GID                 utilizar GID para o novo grupo\n"
+"  -h, --help                    exibir esta mensagem de ajuda e finalizar\n"
+"  -K, --key CHAVE=VALOR         sobrepõe os padrões em /etc/login.defs\n"
+"  -o, --non-unique              permiti criar grupo com GID duplicado\n"
+"                                (não-único)\n"
 "\n"
 
 #, c-format
@@ -1065,21 +1074,23 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "Uso: lastlog [opções]\n"
 "\n"
 "Opções:\n"
-"  -b, --before DIAS\timprime somente registros lastlog mais antigos que\n"
-"\t\t\t\tDIAS\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\n"
-"\t\t\t\tespecificado\n"
+"  -b, --before DIAS             imprime somente registros lastlog mais\n"
+"                                antigos que DIAS\n"
+"  -h, --help                    exibe esta mensagem de ajuda e finaliza\n"
+"  -t, --time DIAS               imprime somente registros lastlog mais\n"
+"                                recentes que DIAS\n"
+"  -u, --user LOGIN              imprime registro lastlog para usuário com\n"
+"                                LOGIN especificado\n"
 "\n"
 
 #, c-format
@@ -1230,14 +1241,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s : não foi possível obter de /etc/passwd.\n"
@@ -1292,46 +1299,49 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "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\n"
-"\t\t\t\tDIAS_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"
+"  -a, --all                     reportar estado de senhas em toda as contas\n"
+"  -d, --delete                  remover a senha para a conta indicada\n"
+"  -e, --expire                  forcçar expiração da senha para a conta "
+"indicada\n"
+"  -h, --help                    exibir esta mensagem de ajuda e finalizar\n"
+"  -k, --keep-tokens             mudar senha somente caso expirada\n"
+"  -i, --inactive INATIVO        definir senha inativa após expiração para\n"
+"                                INATIVO\n"
+"  -l, --lock                    travar a conta indicada\n"
+"  -n, --mindays MIN_DIAS        define número mínimo de dias antes da troca\n"
+"                                de senhas para MIN_DIAS\n"
+"  -q, --quiet                   modo quieto\n"
+"  -r, --repository REPOSITÓRIO  mudar senha no repositório REPOSITÓRIO\n"
+"  -S, --status                  reportar estado de senha para a conta "
+"indicada\n"
+"  -u, --unlock                  destravar a conta indicada\n"
+"  -w, --warndays DIAS_AVISO     define dias de aviso de expiração para\n"
+"                                DIAS_AVISO\n"
+"  -x, --maxdays MAX_DIAS        define número máximo de dias antes da troca\n"
+"                                de senhas para MAX_DIAS\n"
 "\n"
 
 msgid "Old password: "
@@ -1518,25 +1528,25 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "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"
+"  -c, --command COMANDO         passa COMANDO para o shell invocado\n"
+"  -h, --help                    exibe esta mensagem de ajuda e finaliza\n"
+"  -, -l, --login                torna 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"
+"  --preserver-environment       não zera variáveis de ambiente e\n"
+"                                mantém o mesmo shell\n"
+"  -s, --shell SHELL             utiliza SHELL ao invés do padrão no passwd\n"
 "\n"
 
 #, c-format
@@ -1623,60 +1633,64 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "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\tdefine o campo GECOS para a nova conta de\n"
-"\t\t\t\tusuário\n"
-"  -d, --home-dir DIR_PESSOAL\tdiretório pessoal para a nova conta de\n"
-"\t\t\t\tusuá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\n"
-"\t\t\t\tDATA_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"
+"  -b, --base-dir DIR_BASE       diretório base para o diretório pessoal\n"
+"                                da nova conta de usuário\n"
+"  -c, --comment COMENTÁRIO      define o campo GECOS para a nova conta de\n"
+"                                usuário\n"
+"  -d, --home-dir DIR_PESSOAL    diretório pessoal para a nova conta de\n"
+"                                usuário\n"
+"  -D, --defaults                imprime ou salva configuração padrão do\n"
+"                                useradd modificada\n"
+"  -e, --expiredate DATA_EXPIRA  define data de expiração de conta para\n"
+"                                DATA_EXPIRA\n"
+"  -f, --inactive INATIVO        define inatividade de senha após expiração\n"
+"                                para INATIVO\n"
+"  -g, --gid GRUPO               força utilização de GRUPO para nova conta\n"
+"                                de usuário\n"
+"  -G, --groups GRUPOS           lista de grupos suplementares para a nova\n"
+"                                conta de usuário\n"
+"  -h, --help                    exibe esta mensagem de ajuda e finaliza\n"
+"  -k, --skel DIR_SKEL           especifica um diretório skel alternativo\n"
+"  -K, --key CHAVE=VALOR         sobrepões os padrões do /etc/login.defs\n"
+"  -m, --create-home             cria diretório pessoal para a nova conta de\n"
+"                                usuário\n"
+"  -o, --non-unique              permite cirar usuário com UID duplicado\n"
+"                                (não-único)\n"
+"  -p, --password SENHA          utiliza senha encriptada para a nova conta\n"
+"                                de usuário\n"
+"  -s, --shell SHELL             o shell de login para a nova conta\n"
+"                                de usuário\n"
+"  -u, --uid UID                 força o uso de UID para a nova conta\n"
+"                                de usuário\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1822,9 +1836,10 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 
@@ -1891,51 +1906,53 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "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\n"
-"\t\t\t\tusuário\n"
-"  -e, --expiredate DATA_EXPIRA\tdefine data de expiração de conta para\n"
-"\t\t\t\tDATA_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"
+"  -a, --append GRUPO            inserir o usuário no grup suplementar GRUPO\n"
+"  -c, --comment COMENTÁRIO      novo valor do campo GECOS\n"
+"  -d, --home DIR_PESSOAL        novo diretório de login para a nova conta "
+"de\n"
+"                                usuário\n"
+"  -e, --expiredate DATA_EXPIRA  define data de expiração de conta para\n"
+"                                DATA_EXPIRA\n"
+"  -f, --inactive INATIVO        define inatividade de senha após expiração\n"
+"                                para INATIVO\n"
+"  -g, --gid GRUPO               forçar usar GRUPO como novo grupo de\n"
+"                                login inicial\n"
+"  -G, --groups GRUPOS           lista de GRUPOS suplementares\n"
+"  -h, --help                    exibe esta mensagem de ajuda e finaliza\n"
+"  -l, --login LOGIN             novo valor do nome de login\n"
+"  -L, --lock                    trava a conta de usuário\n"
+"  -m, --move-home               move o conteúdo do diretório pessoal para\n"
+"                                a novo localização (use somente com -d)\n"
+"  -o, --non-unique              permitir usar UID duplicados (não-únicos)\n"
+"  -p, --password SENHA          usar senha encriptada para a nova senha\n"
+"  -s, --shell SHELL             novo shell de login para a conta de usuário\n"
+"  -u, --uid UID                 novo UID para a conta de usuário\n"
+"  -U, --unlock                  destravar a conta de usuário\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2005,21 +2022,21 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "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"
+"  -g, --group                   editar base de dados de grupo\n"
+"  -h, --help                    exibir esta mensagem de ajuda e finalizar\n"
+"  -p, --passwd                  editar base de dados de senhas\n"
+"  -q, --quiet                   modo quieto\n"
+"  -s, --shadow                  editar base de dados shadow ou gshadow\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/ro.po
===================================================================
--- upstream/trunk/po/ro.po	2007-11-25 22:05:08 UTC (rev 1466)
+++ upstream/trunk/po/ro.po	2007-11-26 22:00:57 UTC (rev 1467)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
-"PO-Revision-Date: 2006-06-25 12:36+0300\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-26 18:18+0100\n"
 "Last-Translator: Sorin Batariuc <sorin at bonbon.net>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -201,35 +201,37 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "Folosire: chage [opţiuni] utilizator\n"
 "\n"
 "Opţiuni:\n"
-"  -d, --lastday ULTIMA_ZI\tsetează ultima schimbare de parolă la ULTIMA_ZI\n"
-"  -E, --expiredate DATA_EXPIRARE\tsetează data expirării contului la\n"
-"\t\t\t\tDATA_EXPIRARE\n"
-"  -h, --help\t\t\tafişează acest mesaj de ajutor şi ieşi\n"
-"  -I, --inactive INACTIVĂ\tsetează parolă inactivă după expirare\n"
-"\t\t\t\tla INACTIVĂ\n"
-"  -l, --list\t\t\tarată informaţiile de temporalitate ale contului\n"
-"  -m, --mindays MIN_ZILE\tsetează numărul minim de zile înainde de\n"
-"\t\t\t\tschimbarea parolei to MIN_ZILE\n"
-"  -M, --maxdays MAX_ZILE\tsetează numărul maxim de zile înainte de\n"
-"\t\t\t\tschimbarea parolei la MAX_ZILE\n"
-"  -W, --warndays AVERTIZ_ZILE\tsetează zilele de avertisment pentru\n"
-"\t\t\t\texpirare la AVERTIZ_ZILE\n"
+"  -d, --lastday ULTIMA_ZI        setează ultima schimbare de parolă\n"
+"                                 la ULTIMA_ZI\n"
+"  -E, --expiredate DATA_EXPIRARE setează data expirării contului la\n"
+"                                 DATA_EXPIRARE\n"
+"  -h, --help                     afişează acest mesaj de ajutor şi ieşi\n"
+"  -I, --inactive INACTIVĂ        setează parolă inactivă după expirare\n"
+"                                 la INACTIVĂ\n"
+"  -l, --list                     arată informaţiile de temporalitate ale\n"
+"                                 contului\n"
+"  -m, --mindays MIN_ZILE         setează numărul minim de zile înainde de\n"
+"                                 schimbarea parolei to MIN_ZILE\n"
+"  -M, --maxdays MAX_ZILE         setează numărul maxim de zile înainte de\n"
+"                                 schimbarea parolei la MAX_ZILE\n"
+"  -W, --warndays AVERTIZ_ZILE    setează zilele de avertisment pentru\n"
+"                                 expirare la AVERTIZ_ZILE\n"
 "\n"
 
 #, c-format
@@ -468,22 +470,26 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "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"
+"  -e, --encrypted               parolele oferite sunt criptate\n"
+"  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
+"  -m, --md5                     foloseşte criptarea MD5 în loc de DES "
+"atunci\n"
+"                                când parolele oferite nu sunt criptate\n"
+"%s\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -563,17 +569,18 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "Folosire: userdel [opţiuni] NUME\n"
 "\n"
 "Opţiuni:\n"
-"  -f, --force\t\t\tforţează ştergerea fişierelor, chiar dacă nu sunt "
-"proprietatea utilizatorului\n"
-"  -h, --help\t\t\tafişează acest mesaj de ajutor şi ieşi\n"
-"  -r, --remove\t\t\tşterge directorul personal şi cel pentru mesaje\n"
+"  -f, --force                   forţează ştergerea fişierelor, chiar\n"
+"                                dacă nu sunt proprietatea utilizatorului\n"
+"  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
+"  -r, --remove                  şterge directorul personal şi cel pentru "
+"mesaje\n"
 "\n"
 
 msgid "Login Shell"
@@ -608,32 +615,37 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "Utilizare: faillog [opţiuni]\n"
 "\n"
 "Opţiuni:\n"
-"  -a, --all\t\t\tafişează jurnalul înregistrărilor de eşuări pentru toţi\n"
-"\t\t\t\tutilizatorii\n"
-"  -h, --help\t\t\tafişează acest mesaj de ajutor şi ieşi\n"
-"  -l, --lock-time SEC\t\tblochează contul la SEC secunde după o\n"
-"\t\t\t\tautentificare eşuată\n"
-"  -m, --maximum MAX\t\tsetează numărul maxim de autentificări eşuate la MAX\n"
-"  -r, --reset\t\t\tresetează contorul de autentificări eşuate\n"
-"  -t, --time DAYS\t\tafişează jurnalul înregistrărilor de eşuări mai\n"
-"\t\t\t\trecente de DAYS zile\n"
-"  -u, --user LOGIN\t\tafişează jurnalul înregistrărilor de eşuări sau\n"
-"\t\t\t\tmenţine contoarele de eşuări şi limite (dacă este folosit cu\n"
-"\t\t\t\topţiunile -r, -m sau -l) doar pentru utilizatorul LOGIN\n"
+"  -a, --all                     afişează jurnalul înregistrărilor de eşuări\n"
+"                                pentru toţi utilizatorii\n"
+"  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
+"  -l, --lock-time SEC           blochează contul la SEC secunde după o\n"
+"                                autentificare eşuată\n"
+"  -m, --maximum MAX             setează numărul maxim de autentificări\n"
+"                                eşuate la MAX\n"
+"  -r, --reset                   resetează contorul de autentificări eşuate\n"
+"  -t, --time DAYS               afişează jurnalul înregistrărilor de eşuări\n"
+"                                mai recente de DAYS zile\n"
+"  -u, --user LOGIN              afişează jurnalul înregistrărilor de eşuări\n"
+"                                sau menţine contoarele de eşuări şi limite\n"
+"                                (dacă este folosit cu opţiunile -r, -m sau\n"
+"                                -l) doar pentru utilizatorul LOGIN\n"
 "\n"
 
 #, c-format
@@ -762,25 +774,26 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "Utilizare: groupadd [opţiuni] grup\n"
 "\n"
 "Opţiuni:\n"
-"  -f, --force\t\tforţează terminarea cu starea de succes dacă\n"
-"\t\t\t\tgrupul specificat există deja\n"
-"  -g, --gid GID\t\tfoloseşte GID pentru noul grup\n"
-"  -h, --help\t\t\tafişează acest mesaj de ajutor şi ieşi\n"
-"  -K, --key KEY=VALUE\t\tînlocuieşte cu setările implicite /etc/login.defs\n"
-"  -o, --non-unique\t\tpermite crearea grupului cu GID duplicat\n"
-"\t\t\t\t(ne-unic)\n"
+"  -f, --force                   forţează terminarea cu starea de succes\n"
+"                                dacă grupul specificat există deja\n"
+"  -g, --gid GID                 foloseşte GID pentru noul grup\n"
+"  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
+"  -K, --key KEY=VALUE           înlocuieşte cu setările implicite\n"
+"                                /etc/login.defs\n"
+"  -o, --non-unique              permite crearea grupului cu GID duplicat\n"
+"                                (ne-unic)\n"
 "\n"
 
 #, c-format
@@ -908,22 +921,23 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "Utilizare: groupadd [opţiuni] grup\n"
 "\n"
 "Opţiuni:\n"
-"  -f, --force\t\tforţează terminarea cu starea de succes dacă\n"
-"\t\t\t\tgrupul specificat există deja\n"
-"  -g, --gid GID\t\tfoloseşte GID pentru noul grup\n"
-"  -h, --help\t\t\tafişează acest mesaj de ajutor şi ieşi\n"
-"  -K, --key KEY=VALUE\t\tînlocuieşte cu setările implicite /etc/login.defs\n"
-"  -o, --non-unique\t\tpermite crearea grupului cu GID duplicat\n"
-"\t\t\t\t(ne-unic)\n"
+"  -f, --force           forţează terminarea cu starea de succes\n"
+"                        dacă grupul specificat există deja\n"
+"  -g, --gid GID         foloseşte GID pentru noul grup\n"
+"  -h, --help            afişează acest mesaj de ajutor şi ieşi\n"
+"  -K, --key KEY=VALUE   înlocuieşte cu setările implicite /etc/login.defs\n"
+"  -o, --non-unique      permite crearea grupului cu GID duplicat\n"
+"                        (ne-unic)\n"
 "\n"
 
 #, c-format
@@ -1075,23 +1089,24 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "Utilizaree: lastlog [opţiuni]\n"
 "\n"
 "Opţiuni:\n"
-"  -b, --before ZILE\tafişează doar înregistrările ultimului jurnal mai\n"
-"\t\t\tvechi de ZILE\n"
-"  -h, --help\t\tafişează acest mesaj de ajutor şi ieşi\n"
-"  -t, --time ZILE\tafişează doar înregistrările ultimului jurnal mai\n"
-"\t\t\trecente\n"
-"\t\t\t\tde ZILE\n"
-"  -u, --user LOGIN\tafişează înregistrarea ultimului jurnal pentru\n"
-"\t\t\t\tutilizatorul cu autentificarea specificată\n"
+"  -b, --before ZILE             afişează doar înregistrările ultimului\n"
+"                                jurnal mai vechi de ZILE\n"
+"  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
+"  -t, --time ZILE               afişează doar înregistrările ultimului\n"
+"                                jurnal mai recente de ZILE\n"
+"  -u, --user LOGIN              afişează înregistrarea ultimului jurnal "
+"pentru\n"
+"                                utilizatorul cu autentificarea specificată\n"
 "\n"
 
 #, c-format
@@ -1242,14 +1257,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: nu pot încuia /etc/passwd.\n"
@@ -1303,46 +1314,50 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "Utilizare: passwd [opţiuni] [nume_cont]\n"
 "\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\n"
-"\t\t\t\tINACTIV după 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\n"
-"\t\t\t\texpirare 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"
+"  -a, --all                     afişează starea parolelor din toate "
+"conturile\n"
+"  -d, --delete                  şterge parola respectivului cont\n"
+"  -e, --expire                  forţează expirarea parolei pentru\n"
+"                                respectivul cont\n"
+"  -h, --help                    afisează acest mesaj de ajutor şi ieşi\n"
+"  -k, --keep-tokens             schimbă parola doar dacă este expirată\n"
+"  -i, --inactive INACTIV        fixează durata de inactivitate a parolei la\n"
+"                                INACTIV după expirarea sa\n"
+"  -l, --lock                    blochează respectivul cont\n"
+"  -n, --mindays ZILE_MIN        fixează numărul minim de zile la ZILE_MIN\n"
+"                                înainte de schimbarea parolei\n"
+"  -q, --quiet                   modul silenţios\n"
+"  -r, --repository DEPOZIT      schimbă parola în depozitul DEPOZIT\n"
+"  -S, --status                  raportează starea parolei respectivului "
+"cont\n"
+"  -u, --unlock                  deblochează respectivul cont\n"
+"  -w, --warndays ZILE_AVERT     fixează numărul de zile de avertisment de\n"
+"                                expirare la ZILE_AVERT\n"
+"  -x, --maxdays ZILE__MAX       fixează numărul maxim de zile înainde de\n"
+"                                schimbarea parolei la ZILE_MAX\n"
 "\n"
 
 msgid "Old password: "
@@ -1528,25 +1543,26 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "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"
+"  -c, --command COMANDA         trimite COMANDA la consola invocată\n"
+"  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
+"  -, -l, --login                face 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"
+"  --preserve-environment        nu reface variabilele de mediu, şi\n"
+"                                păstrează aceeaşi consolă\n"
+"  -s, --shell SHELL             foloseşte SHELL în locul celei implicite\n"
+"                                din passwd\n"
 "\n"
 
 #, c-format
@@ -1633,59 +1649,65 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "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"
-"  -e, --expiredate DATA_EXPIRĂRII\tsetează data expirării contului la\n"
-"\t\t\t\tDATA_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"
-"  -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\n"
-"\t\t\t\t/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"
+"  -b, --base-dir DIR_BAZA         baza directorului pentru noul director\n"
+"                                  personal al contului\n"
+"  -c, --comment COMENTARIU        setează câmpul GECOS pentru noul cont\n"
+"  -d, --home-dir DIR_ACASA        directorul personal pentru noul cont\n"
+"  -D, --defaults                  afişează sau salvează configuraţia "
+"useradd\n"
+"                                  implicită modificată\n"
+"  -e, --expiredate DATA_EXPIRĂRII setează data expirării contului la\n"
+"                                  DATA_EXPIRĂRII\n"
+"  -f, --inactive INACTIVĂ         setează parola inactivă după expirare\n"
+"                                  la INACTIVĂ\n"
+"  -g, --gid GRUP                  forţează folosirea GRUPULUI pentru noul "
+"cont\n"
+"  -G, --groups GRUPURI            afişează grupurile suplimentare pentru\n"
+"                                  noul cont utilizator\n"
+"  -h, --help                      afişează acest mesaj de ajutor şi ieşi\n"
+"  -k, --skel DIR_SKELET           specifică un schelet director alternativ\n"
+"  -K, --key KEY=VALOARE           suprascrie valorile implicite ale\n"
+"                                  /etc/login.defs\n"
+"  -m, --create-home               crează directorul personal pentru noul\n"
+"                                  cont utilizator\n"
+"  -o, --non-unique                permite creare unui utilizator cu un UID\n"
+"                                  duplicat (non-unic)\n"
+"  -p, --password PAROLA           foloseşte parola criptată pentru noul "
+"cont\n"
+"                                  utilizator\n"
+"  -s, --shell SHELL               mediul de autentificare pentru noul\n"
+"                                  cont utilizator\n"
+"  -u, --uid UID                   forţează utilizarea UID pentru noul\n"
+"                                  cont utilizator\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1833,18 +1855,20 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 "Folosire: userdel [opţiuni] NUME\n"
 "\n"
 "Opţiuni:\n"
-"  -f, --force\t\t\tforţează ştergerea fişierelor, chiar dacă nu sunt "
-"proprietatea utilizatorului\n"
-"  -h, --help\t\t\tafişează acest mesaj de ajutor şi ieşi\n"
-"  -r, --remove\t\t\tşterge directorul personal şi cel pentru mesaje\n"
+"  -f, --force                   forţează ştergerea fişierelor, chiar dacă\n"
+"                                nu sunt proprietatea utilizatorului\n"
+"  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
+"  -r, --remove                  şterge directorul personal şi cel pentru "
+"mesaje\n"
 "\n"
 
 #, c-format
@@ -1911,50 +1935,54 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "Folosire: usermod [opţiuni] NUME\n"
 "\n"
 "Opţiuni:\n"
-"  -a, --append GRUP\t\ttadaugă utilizatorul în GRUPUL suplimentar\n"
-"  -c, --comment COMENTARIU\tvaloarea nouă a câmpului GECOS\n"
-"  -d, --home 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 ca nou iniţial grup\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"
-"  -l, --login NUME_NOU\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\t\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"
+"  -a, --append GRUP               tadaugă utilizatorul în GRUPUL "
+"suplimentar\n"
+"  -c, --comment COMENTARIU        valoarea nouă a câmpului GECOS\n"
+"  -d, --home DIR_ACASA            noul director personal pentru noul cont\n"
+"  -e, --expiredate DATA_EXPIRĂRII setează data expirării contului la\n"
+"                                  DATA_EXPIRĂRII\n"
+"  -f, --inactive INACTIVĂ         setează parola inactivă după expirare\n"
+"                                  la INACTIVĂ\n"
+"  -g, --gid GRUP                  forţează folosirea GRUPULUI ca nou\n"
+"                                  iniţial grup\n"
+"  -G, --groups GRUPURI            afişează grupurile suplimentare GRUPURI\n"
+"  -h, --help                      afişează acest mesaj de ajutor şi ieşi\n"
+"  -l, --login NUME_NOU            noua valoare a numelui de autentificare\n"
+"  -L, --lock                      blochează contul\n"
+"  -m, --move-home                 mută conţinutul directorului personal în\n"
+"                                  noua locaţie (foloseşte doar cu -d)\n"
+"  -o, --non-unique                permite folosirea UID-urilor duplicate\n"
+"                                  (non-unice)\n"
+"  -p, --password PAROLA           foloseşte criptarea pentru noua parolă\n"
+"  -s, --shell SHELL               noul mediu de autentificare pentru\n"
+"                                  contul utilizator\n"
+"  -u, --uid UID                   noul UID pentru contul utilizator\n"
+"  -U, --unlock                    deblochează contul utilizator\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2025,21 +2053,21 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "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"
+"  -g, --group                   editează baza de date de grupuri\n"
+"  -h, --help                    afişează acest mesaj de ajutor şi ieşi\n"
+"  -p, --passwd                  editează baza de date de conturi\n"
+"  -q, --quiet                   modul tăcut\n"
+"  -s, --shadow                  editează baza de date shadow sau gshadow\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/ru.po
===================================================================
--- upstream/trunk/po/ru.po	2007-11-25 22:05:08 UTC (rev 1466)
+++ upstream/trunk/po/ru.po	2007-11-26 22:00:57 UTC (rev 1467)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: 1:4.0.18.2-1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
-"PO-Revision-Date: 2007-11-21 21:02+0300\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-26 20:19+0100\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -204,35 +204,36 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "Использование: chage [параметры] [ИМЯ]\n"
 "\n"
 "Параметры:\n"
-"  -d, --lastday LAST_DAY\tустановить последний день смены пароля в LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tустановить дату окончания действия\n"
-"\t\t\t\tучётной записи до EXPIRE_DATE\n"
-"  -h, --help\t\t\tпоказать это сообщение и закончить работу\n"
-"  -I, --inactive INACTIVE\tустановить неактивность пароля после устаревания\n"
-"\t\t\t\tв значение INACTIVE\n"
-"  -l, --list\t\t\tпоказать длительность работы учётной записи\n"
-"  -m, --mindays MIN_DAYS\tустановить минимальное число дней перед сменой\n"
-"\t\t\t\tпароля в MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tустановить максимальное число дней перед сменой\n"
-"\t\t\t\tпароля в MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tустановить количество дней с выдачей\n"
-"\t\t\t\tпредупреждения в WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        установить последний день смены пароля\n"
+"                                в LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  установить дату окончания действия\n"
+"                                учётной записи до EXPIRE_DATE\n"
+"  -h, --help                    показать это сообщение и закончить работу\n"
+"  -I, --inactive INACTIVE       установить неактивность пароля после\n"
+"                                устаревания в значение INACTIVE\n"
+"  -l, --list                    показать длительность работы учётной записи\n"
+"  -m, --mindays MIN_DAYS        установить минимальное число дней перед\n"
+"                                сменой пароля в MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        установить максимальное число дней перед\n"
+"                                сменой пароля в MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      установить количество дней с выдачей\n"
+"                                предупреждения в WARN_DAYS\n"
 "\n"
 
 #, c-format
@@ -473,23 +474,25 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "Использование: chpasswd [параметры]\n"
 "\n"
 "Параметры:\n"
-"  -e, --encrypted\tвводится уже шифрованный пароль\n"
-"  -h, --help\t\tпоказать это сообщение и завершить работу программы\n"
-"  -m, --md5\t\tиспользовать шифрование MD5 вместо DES, если пароль\n"
-"\t\t\tвводится не шифрованным\n"
+"  -e, --encrypted       вводится уже шифрованный пароль\n"
+"  -h, --help            показать это сообщение и завершить работу программы\n"
+"  -m, --md5             использовать шифрование MD5 вместо DES, если пароль\n"
+"                        вводится не шифрованным\n"
 "\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -569,15 +572,15 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "Использование: chsh [параметры] [ИМЯ]\n"
 "\n"
 "Параметры:\n"
-"  -h, --help\t\t\tпоказать данное сообщение и закончить работу\n"
-"  -s, --shell SHELL\t\tновая регистрационная оболочка для учётной записи\n"
+"  -h, --help            показать данное сообщение и закончить работу\n"
+"  -s, --shell SHELL     новая регистрационная оболочка для учётной записи\n"
 "\n"
 
 msgid "Login Shell"
@@ -612,31 +615,34 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "Использование: faillog [параметры]\n"
 "\n"
 "Параметры:\n"
-"  -a, --all\t\t\tпоказать записи faillog обо всех пользователях\n"
-"  -h, --help\t\t\tпоказать это сообщение и завершить работу программы\n"
-"  -l, --lock-time SEC\t\tпри неудачной попытке входа блокировать\n"
-"\t\t\t\tучётную запись на SEC секунд\n"
-"  -m, --maximum MAX\t\tустановить максимальное число неудачных попыток\n"
-"\t\t\t\tвхода равным MAX\n"
-"  -r, --reset\t\t\tобнулить счётчики неудачных попыток входа\n"
-"  -t, --time DAYS\t\tпоказать записи faillog за последние DAYS дней\n"
-"  -u, --user ИМЯ\t\tпоказать запись faillog или настроить счётчики\n"
-"\t\t\t\tнеудачных попыток и ограничения (с помощью -r, -m или -l) только\n"
-"\t\t\t\tдля учётной записи с заданным ИМЕНЕМ\n"
+"  -a, --all             показать записи faillog обо всех пользователях\n"
+"  -h, --help            показать это сообщение и завершить работу программы\n"
+"  -l, --lock-time SEC   при неудачной попытке входа блокировать\n"
+"                        учётную запись на SEC секунд\n"
+"  -m, --maximum MAX     установить максимальное число неудачных попыток\n"
+"                        входа равным MAX\n"
+"  -r, --reset           обнулить счётчики неудачных попыток входа\n"
+"  -t, --time DAYS       показать записи faillog за последние DAYS дней\n"
+"  -u, --user ИМЯ        показать запись faillog или настроить счётчики\n"
+"                        неудачных попыток и ограничения (с помощью -r, -m\n"
+"                        или -l) только для учётной записи с заданным ИМЕНЕМ\n"
 "\n"
 
 #, c-format
@@ -767,25 +773,25 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "Использование: groupadd [параметры] ГРУППА\n"
 "\n"
 "Параметры:\n"
-"  -f, --force\t\t\tзакончить работу с успешным кодом возврата, если\n"
-"\t\t\t\tзаданная группа уже существует\n"
-"  -g, --gid GID\t\t\tдля новой группы использовать GID\n"
-"  -h, --help\t\t\tпоказать данное сообщение и закончить работу\n"
-"  -K, --key KEY=VALUE\t\tизменить значения по умолчанию из /etc/login.defs\n"
-"  -o, --non-unique\t\tразрешить создание группы с уже имеющимся\n"
-"\t\t\t\t(не уникальным) GID\n"
+"  -f, --force           закончить работу с успешным кодом возврата, если\n"
+"                        заданная группа уже существует\n"
+"  -g, --gid GID         для новой группы использовать GID\n"
+"  -h, --help            показать данное сообщение и закончить работу\n"
+"  -K, --key KEY=VALUE   изменить значения по умолчанию из /etc/login.defs\n"
+"  -o, --non-unique      разрешить создание группы с уже имеющимся\n"
+"                        (не уникальным) GID\n"
 "\n"
 
 #, c-format
@@ -915,20 +921,22 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "Использование: groupmod [параметры] ГРУППА\n"
 "\n"
 "Параметры:\n"
-"  -g, --gid GID\t\t\tдля новой ГРУППЫ использовать GID\n"
-"  -h, --help\t\t\tпоказать данное сообщение и закончить работу\n"
-"  -n, --new-name NEW_GROUP\tиспользовать имя NEW_GROUP для ГРУППЫ\n"
-"  -o, --non-unique\t\tразрешить создание группы с уже имеющимся\n"
-"\t\t\t\t(не уникальным) GID\n"
+"  -g, --gid GID                 для новой ГРУППЫ использовать GID\n"
+"  -h, --help                    показать данное сообщение и закончить "
+"работу\n"
+"  -n, --new-name NEW_GROUP      использовать имя NEW_GROUP для ГРУППЫ\n"
+"  -o, --non-unique              разрешить создание группы с уже имеющимся\n"
+"                                (не уникальным) GID\n"
 "\n"
 
 #, c-format
@@ -1080,19 +1088,20 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "Использование: lastlog [параметры]\n"
 "\n"
 "Параметры:\n"
-"  -b, --before DAYS\tпоказать записи lastlog за последние DAYS дней\n"
-"  -h, --help\t\tпоказать это сообщение и завершить работу программы\n"
-"  -t, --time DAYS\tпоказать записи lastlog за последние DAYS дней\n"
-"  -u, --user ИМЯ\tпоказать запись lastlog для учётной записи ИМЯ\n"
+"  -b, --before DAYS     показать записи lastlog за последние DAYS дней\n"
+"  -h, --help            показать это сообщение и завершить работу программы\n"
+"  -t, --time DAYS       показать записи lastlog за последние DAYS дней\n"
+"  -u, --user ИМЯ        показать запись lastlog для учётной записи ИМЯ\n"
 "\n"
 
 #, c-format
@@ -1243,14 +1252,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: не удалось заблокировать /etc/passwd.\n"
@@ -1304,46 +1309,51 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "Использование: 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установить неактивность пароля после истечения\n"
-"\t\t\t\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установить установить количество дней с выдачей\n"
-"\t\t\t\tпредупреждения в WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tустановить максимальное число дней перед сменой\n"
-"\t\t\t\tпароля в MAX_DAYS\n"
+"  -a, --all                     показать состояние паролей всех учётных\n"
+"                                записей\n"
+"  -d, --delete                  удалить пароль заданной учётной записи\n"
+"  -e, --expire                  просрочить пароль заданной учётной записи\n"
+"  -h, --help                    показать это сообщение и завершить работу\n"
+"                                программы\n"
+"  -k, --keep-tokens             изменять пароль только с истёкшим сроком\n"
+"                                действия\n"
+"  -i, --inactive INACTIVE       установить неактивность пароля после\n"
+"                                истечения срока в значение INACTIVE\n"
+"  -l, --lock                    заблокировать заданную учётную запись\n"
+"  -n, --mindays MIN_DAYS        установить минимальное число дней перед\n"
+"                                сменой пароля в MIN_DAYS\n"
+"  -q, --quiet                   не показывать сообщений\n"
+"  -r, --repository REPOSITORY   изменить пароль в репозитории REPOSITORY\n"
+"  -S, --status                  показать состояние пароля заданной учётной\n"
+"                                записи\n"
+"  -u, --unlock                  разблокировать заданную учётную запись\n"
+"  -w, --warndays WARN_DAYS      установить установить количество дней с\n"
+"                                выдачей предупреждения в WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        установить максимальное число дней перед\n"
+"                                сменой пароля в MAX_DAYS\n"
 "\n"
 
 msgid "Old password: "
@@ -1529,26 +1539,28 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "Использование: su [параметры] [имя пользователя]\n"
 "\n"
 "Параметры:\n"
-"  -c, --command COMMAND\t\tпередать команду COMMAND вызываемой оболочке\n"
-"  -h, --help\t\t\tпоказать данное сообщение и закончить работу\n"
-"  -, -l, --login\t\tзапускать оболочку как регистрационную\n"
+"  -c, --command COMMAND         передать команду COMMAND вызываемой "
+"оболочке\n"
+"  -h, --help                    показать данное сообщение и закончить "
+"работу\n"
+"  -, -l, --login                запускать оболочку как регистрационную\n"
 "  -m, -p,\n"
-"  --preserve-environment\tне сбрасывать переменные окружения и сохранить\n"
-"\t\t\t\tзапустившую оболочку\n"
-"  -s, --shell SHELL\t\tиспользовать значение переменной SHELL\n"
-"\t\t\t\tвместо значения из файла passwd\n"
+"  --preserve-environment        не сбрасывать переменные окружения и\n"
+"                                сохранить запустившую оболочку\n"
+"  -s, --shell SHELL             использовать значение переменной SHELL\n"
+"                                вместо значения из файла passwd\n"
 "\n"
 
 #, c-format
@@ -1636,61 +1648,64 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "Использование: useradd [параметры] ИМЯ\n"
 "\n"
 "Параметры:\n"
-"  -b, --base-dir BASE_DIR\tбазовый каталог для домашнего каталога\n"
-"\t\t\t\tновой учётной записи\n"
-"  -c, --comment COMMENT\t\tзаполнить поле GECOS новой учётной записи\n"
-"  -d, --home-dir HOME_DIR\tдомашний каталог новой учётной записи\n"
-"  -D, --defaults\t\tпоказать или сохранить изменённые настройки useradd\n"
-"\t\t\t\tпо умолчанию useradd\n"
-"  -e, --expiredate EXPIRE_DATE\tустановить дату окончания действия\n"
-"\t\t\t\tучётной записи до EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tустановить пароль для устаревших учётных записей\n"
-"\t\t\t\tв INACTIVE\n"
-"  -g, --gid GROUP\t\tпринудительно назначить группу GROUP\n"
-"\t\t\t\tдля новой учётной записи\n"
-"  -G, --groups GROUPS\t\tзадать список групп для новой\n"
-"\t\t\t\tучётной записи\n"
-"  -h, --help\t\t\tпоказать данное сообщение и закончить работу\n"
-"  -k, --skel SKEL_DIR\t\tуказать альтернативный каталог с шаблонами\n"
-"  -K, --key KEY=VALUE\t\tизменить значения по умолчанию из /etc/login.defs\n"
-"  -m, --create-home\t\tсоздать домашний каталог для новой\n"
-"\t\t\t\tучётной записи\n"
-"  -o, --non-unique\t\tразрешить создание учётной записи с уже имеющимся\n"
-"\t\t\t\t(не уникальным) UID\n"
-"  -p, --password PASSWORD\tзадать шифрованный пароль для новой\n"
-"\t\t\t\tучётной записи\n"
-"  -s, --shell SHELL\t\tзадать командную оболочку для новой\n"
-"\t\t\t\tучётной записи\n"
-"  -u, --uid UID\t\t\tпринудительно назначить UID для новой\n"
-"\t\t\t\tучётной записи\n"
+"  -b, --base-dir BASE_DIR       базовый каталог для домашнего каталога\n"
+"                                новой учётной записи\n"
+"  -c, --comment COMMENT         заполнить поле GECOS новой учётной записи\n"
+"  -d, --home-dir HOME_DIR       домашний каталог новой учётной записи\n"
+"  -D, --defaults                показать или сохранить изменённые настройки\n"
+"                                useradd по умолчанию useradd\n"
+"  -e, --expiredate EXPIRE_DATE  установить дату окончания действия\n"
+"                                учётной записи до EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       установить пароль для устаревших учётных\n"
+"                                записей в INACTIVE\n"
+"  -g, --gid GROUP               принудительно назначить группу GROUP\n"
+"                                для новой учётной записи\n"
+"  -G, --groups GROUPS           задать список групп для новой\n"
+"                                учётной записи\n"
+"  -h, --help                    показать данное сообщение и закончить "
+"работу\n"
+"  -k, --skel SKEL_DIR           указать альтернативный каталог с шаблонами\n"
+"  -K, --key KEY=VALUE           изменить значения по умолчанию из\n"
+"                                /etc/login.defs\n"
+"  -m, --create-home             создать домашний каталог для новой\n"
+"                                учётной записи\n"
+"  -o, --non-unique              разрешить создание учётной записи с уже\n"
+"                                имеющимся (не уникальным) UID\n"
+"  -p, --password PASSWORD       задать шифрованный пароль для новой\n"
+"                                учётной записи\n"
+"  -s, --shell SHELL             задать командную оболочку для новой\n"
+"                                учётной записи\n"
+"  -u, --uid UID                 принудительно назначить UID для новой\n"
+"                                учётной записи\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1838,17 +1853,20 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 "Использование: userdel [параметры] ИМЯ\n"
 "\n"
 "Параметры:\n"
-"  -f, --force\t\t\tудалять файлы, даже если они не принадлежат пользователю\n"
-"  -h, --help\t\t\tпоказать данное сообщение и закончить работу\n"
-"  -r, --remove\t\t\tудалить домашний каталог и почтовый ящик\n"
+"  -f, --force                   удалять файлы, даже если они\n"
+"                                не принадлежат пользователю\n"
+"  -h, --help                    показать данное сообщение и закончить "
+"работу\n"
+"  -r, --remove                  удалить домашний каталог и почтовый ящик\n"
 "\n"
 
 #, c-format
@@ -1915,55 +1933,57 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "Использование: usermod [параметры] ПОЛЬЗОВАТЕЛЬ\n"
 "\n"
 "Параметры:\n"
-"  -c, --comment КОММЕНТАРИЙ\t\tновое значение поля GECOS\n"
-"  -d, --home ДОМ_КАТ\tновый домашний каталог учётной записи\n"
-"  -e, --expiredate EXPIRE_DATE\tустановить дату окончания действия\n"
-"\t\t\t\tучётной записи в EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tустановить пароль после устаревания учётной\n"
-"\t\t\t\tзаписи в INACTIVE\n"
-"  -g, --gid ГРУППА\t\tпринудительно назначить первичную ГРУППУ\n"
-"  -G, --groups ГРУППЫ\t\tсписок дополнительных ГРУПП\n"
-"  -a, --append\t\tдобавить пользователя в дополнительные ГРУППЫ,\n"
-"\t\t\t\tуказанные в параметре -G не удаляя пользователя\n"
-"\t\t\t\tиз других групп\n"
-"  -h, --help\t\t\tпоказать данное сообщение и закончить работу\n"
-"  -l, --login НОВОЕ_ИМЯ\t\tновое значение имени учётной записи\n"
-"  -L, --lock\t\t\tзаблокировать учётную запись\n"
-"  -m, --move-home\t\tпереместить содержимое домашнего каталога\n"
-"\t\t\t\tв новое место (использовать только вместе с -d)\n"
-"  -o, --non-unique\t\tразрешить создание учётной записи с уже имеющимся\n"
-"\t\t\t\t(не уникальным) UID\n"
-"  -p, --password ПАРОЛЬ\tзадать новый шифрованный пароль для\n"
-"\t\t\t\tучётной записи\n"
-"  -s, --shell ОБОЛОЧКА\t\tзадать новую оболочку для\n"
-"\t\t\t\tучётной записи\n"
-"  -u, --uid UID\t\t\tновый UID для учётной записи\n"
-"  -U, --unlock\t\t\tразблокировать учётную запись\n"
+"  -c, --comment КОММЕНТАРИЙ     новое значение поля GECOS\n"
+"  -d, --home ДОМ_КАТ            новый домашний каталог учётной записи\n"
+"  -e, --expiredate EXPIRE_DATE  установить дату окончания действия\n"
+"                                учётной записи в EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       установить пароль после устаревания учётной\n"
+"                                записи в INACTIVE\n"
+"  -g, --gid ГРУППА              принудительно назначить первичную ГРУППУ\n"
+"  -G, --groups ГРУППЫ           список дополнительных ГРУПП\n"
+"  -a, --append                  добавить пользователя в дополнительные\n"
+"                                ГРУППЫ, указанные в параметре -G не удаляя\n"
+"                                пользователя из других групп\n"
+"  -h, --help                    показать данное сообщение и закончить "
+"работу\n"
+"  -l, --login НОВОЕ_ИМЯ         новое значение имени учётной записи\n"
+"  -L, --lock                    заблокировать учётную запись\n"
+"  -m, --move-home               переместить содержимое домашнего каталога\n"
+"                                в новое место (использовать только вместе с -"
+"d)\n"
+"  -o, --non-unique              разрешить создание учётной записи с уже\n"
+"                                имеющимся (не уникальным) UID\n"
+"  -p, --password ПАРОЛЬ         задать новый шифрованный пароль для\n"
+"                                учётной записи\n"
+"  -s, --shell ОБОЛОЧКА          задать новую оболочку для\n"
+"                                учётной записи\n"
+"  -u, --uid UID                 новый UID для учётной записи\n"
+"  -U, --unlock                  разблокировать учётную запись\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2033,22 +2053,23 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "Использование: vipw [параметры]\n"
 "\n"
 "Параметры:\n"
-"  -g, --group\t\t\tредактировать базу данных групп\n"
-"  -h, --help\t\t\tпоказать данное сообщение и закончить работу\n"
-"  -p, --passwd\t\t\tредактировать базу данных паролей\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tредактировать базу данных теневых\n"
-"\t\t\t\tпаролей пользователей или групп\n"
+"  -g, --group                   редактировать базу данных групп\n"
+"  -h, --help                    показать данное сообщение и закончить "
+"работу\n"
+"  -p, --passwd                  редактировать базу данных паролей\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  редактировать базу данных теневых\n"
+"                                паролей пользователей или групп\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/sk.po
===================================================================
--- upstream/trunk/po/sk.po	2007-11-25 22:05:08 UTC (rev 1466)
+++ upstream/trunk/po/sk.po	2007-11-26 22:00:57 UTC (rev 1467)
@@ -4,8 +4,8 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
-"PO-Revision-Date: 2006-06-23 11:05+0200\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-26 20:45+0100\n"
 "Last-Translator: Peter Mann <Peter.Mann at tuke.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
@@ -199,34 +199,36 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "Použitie: chage [voľby] používateľ\n"
 "\n"
 "Options:\n"
-"  -d, --lastday POSL_DEN\tnastaví dátum poslednej zmeny hesla na POSL_DEN\n"
-"  -E, --expiredate EXP_DATUM\tnastaví dátum vypršania platnosti účtu na\n"
-"\t\t\t\tEXP_DATUM\n"
-"  -h, --help\t\t\tzobrazí túto nápovedu a ukončí sa\n"
-"  -I, --inactive NEAKTIV\tnastaví nefunkčnosť hesla na NEAKTIV dní\n"
-"\t\t\t\tpo vypršaní platnosti účtu\n"
-"  -l, --list\t\t\tzobrazí časové údaje o účte\n"
-"  -m, --mindays MIN_DNÍ\tnastaví minimálny počet dní pred zmenou\n"
-"\t\t\t\thesla na MIN_DNÍ\n"
-"  -M, --maxdays MAX_DNÍ\tnastaví maximálny počet dní pred zmenou\n"
-"\t\t\t\thesla na MAX_DNÍ\n"
-"  -W, --warndays UPOZ_DNÍ\tnastaví upozornenie o platnosti účtu na UPOZ_DNÍ\n"
+"  -d, --lastday POSL_DEN        nastaví dátum poslednej zmeny hesla na "
+"POSL_DEN\n"
+"  -E, --expiredate EXP_DATUM    nastaví dátum vypršania platnosti účtu na\n"
+"                                EXP_DATUM\n"
+"  -h, --help                    zobrazí túto nápovedu a ukončí sa\n"
+"  -I, --inactive NEAKTIV        nastaví nefunkčnosť hesla na NEAKTIV dní\n"
+"                                po vypršaní platnosti účtu\n"
+"  -l, --list                    zobrazí časové údaje o účte\n"
+"  -m, --mindays MIN_DNÍ         nastaví minimálny počet dní pred zmenou\n"
+"                                hesla na MIN_DNÍ\n"
+"  -M, --maxdays MAX_DNÍ         nastaví maximálny počet dní pred zmenou\n"
+"                                hesla na MAX_DNÍ\n"
+"  -W, --warndays UPOZ_DNÍ       nastaví upozornenie o platnosti účtu na "
+"UPOZ_DNÍ\n"
 "\n"
 
 #, c-format
@@ -469,22 +471,25 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "Použ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"
+"  -e, --encrypted               zadané heslá sú zakódované\n"
+"  -h, --help                    vypíše túto nápovedu a ukončí sa\n"
+"  -m, --md5                     použije MD5 kódovanie namiesto DES, ak\n"
+"                                zadané heslá nie sú zakódované\n"
+"%s\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -564,17 +569,17 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "Použitie: userdel [voľby] LOGIN\n"
 "\n"
 "Voľby:\n"
-"  -f, --force\t\t\tvynúti odstránenie súborov, aj keď používateľ nie je ich "
-"vlastníkom\n"
-"  -h, --help\t\t\tzobrazí túto nápovedu a ukončí sa\n"
-"  -r, --remove\t\t\todstráni domovský adresár a súbor s poštami\n"
+"  -f, --force                   vynúti odstránenie súborov, aj keď\n"
+"                                používateľ nie je ich vlastníkom\n"
+"  -h, --help                    zobrazí túto nápovedu a ukončí sa\n"
+"  -r, --remove                  odstráni domovský adresár a súbor s poštami\n"
 "\n"
 
 msgid "Login Shell"
@@ -609,29 +614,33 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "Použitie: faillog [voľby]\n"
 "\n"
 "Voľby:\n"
-"  -a, --all\t\t\tzobrazí faillog záznamy všetkých používateľov\n"
-"  -h, --help\t\t\tzobrazí túto nápovedu a ukončí sa\n"
-"  -l, --lock-time SEC\t\tpo chybnom prihlásení zablokuje účet na SEC sekúnd\n"
-"  -m, --maximum MAX\t\tnastaví maximálny počet chybných prihlásení na MAX\n"
-"  -r, --reset\t\t\tvynuluje počítadlá chybných prihlásení\n"
-"  -t, --time DAYS\t\tzobrazí faillog záznamy nie staršie ako DAYS dní\n"
-"  -u, --user LOGIN\t\tzobrazí faillog záznam alebo nastaví počítadlá\n"
-"\t\t\t\tchybných prihlásení a limitov (iba s použitím volieb -r, -m or -l)\n"
-"\t\t\t\tpre používateľa s loginom LOGIN\n"
+"  -a, --all             zobrazí faillog záznamy všetkých používateľov\n"
+"  -h, --help            zobrazí túto nápovedu a ukončí sa\n"
+"  -l, --lock-time SEC   po chybnom prihlásení zablokuje účet na SEC sekúnd\n"
+"  -m, --maximum MAX     nastaví maximálny počet chybných prihlásení na MAX\n"
+"  -r, --reset           vynuluje počítadlá chybných prihlásení\n"
+"  -t, --time DAYS       zobrazí faillog záznamy nie staršie ako DAYS dní\n"
+"  -u, --user LOGIN      zobrazí faillog záznam alebo nastaví počítadlá\n"
+"                        chybných prihlásení a limitov (iba s použitím "
+"volieb\n"
+"                        -r, -m or -l) pre používateľa s loginom LOGIN\n"
 "\n"
 
 #, c-format
@@ -760,25 +769,26 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "Použitie: groupadd [voľby] skupina\n"
 "\n"
 "Voľby:\n"
-"  -f, --force\t\tvynúti úspešnú návratovú hodnotu aj napriek\n"
-"\t\t\t\texistencii zadanej skupiny\n"
-"  -g, --gid GID\t\tpre novú skupinu použije GID\n"
-"  -h, --help\t\t\tzobrazí túto nápovedu a ukončí sa\n"
-"  -K, --key KEY=VALUE\t\tnahradí predvolené hodnoty z /etc/login.defs\n"
-"  -o, --non-unique\t\tpovolí vytvorenie skupiny s duplicitným\n"
-"\t\t\t\t(nejedinečným) GID\n"
+"  -f, --force                   vynúti úspešnú návratovú hodnotu aj napriek\n"
+"                                existencii zadanej skupiny\n"
+"  -g, --gid GID                 pre novú skupinu použije GID\n"
+"  -h, --help                    zobrazí túto nápovedu a ukončí sa\n"
+"  -K, --key KEY=VALUE           nahradí predvolené hodnoty z /etc/login."
+"defs\n"
+"  -o, --non-unique              povolí vytvorenie skupiny s duplicitným\n"
+"                                (nejedinečným) GID\n"
 "\n"
 
 #, c-format
@@ -907,22 +917,24 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "Použitie: groupadd [voľby] skupina\n"
 "\n"
 "Voľby:\n"
-"  -f, --force\t\tvynúti úspešnú návratovú hodnotu aj napriek\n"
-"\t\t\t\texistencii zadanej skupiny\n"
-"  -g, --gid GID\t\tpre novú skupinu použije GID\n"
-"  -h, --help\t\t\tzobrazí túto nápovedu a ukončí sa\n"
-"  -K, --key KEY=VALUE\t\tnahradí predvolené hodnoty z /etc/login.defs\n"
-"  -o, --non-unique\t\tpovolí vytvorenie skupiny s duplicitným\n"
-"\t\t\t\t(nejedinečným) GID\n"
+"  -f, --force                   vynúti úspešnú návratovú hodnotu aj napriek\n"
+"                                existencii zadanej skupiny\n"
+"  -g, --gid GID                 pre novú skupinu použije GID\n"
+"  -h, --help                    zobrazí túto nápovedu a ukončí sa\n"
+"  -K, --key KEY=VALUE           nahradí predvolené hodnoty z /etc/login."
+"defs\n"
+"  -o, --non-unique              povolí vytvorenie skupiny s duplicitným\n"
+"                                (nejedinečným) GID\n"
 "\n"
 
 #, c-format
@@ -1075,20 +1087,22 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "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\n"
-"\t\t\tLOGIN\n"
+"  -b, --before DAYS     vypíše posledné prihlásenia staršie ako DAYS dní\n"
+"  -h, --help            zobrazí túto nápovedu a ukončí sa\n"
+"  -t, --time DAYS       vypíše posledné prihlásenia nie staršie ako DAYS "
+"dní\n"
+"  -u, --user LOGIN      vypíše posledné prihlásenia používateľa uvedeného\n"
+"                        ako LOGIN\n"
 
 #, c-format
 msgid "Username         Port     From             Latest\n"
@@ -1238,14 +1252,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: súbor /etc/passwd sa nedá zamknúť\n"
@@ -1299,47 +1309,48 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "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\n"
-"\t\t\t\tplatnosti\n"
-"  -i, --inactive INACTIVE\tnastaví neplatnosť hesla po vypršaní času\n"
-"\t\t\t\tplatnosti na 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í\n"
-"\t\t\t\tplatnosti na WARN_DAYS dní\n"
-"  -x, --maxdays MAX_DAYS\tnastaví maximálny počet dní pred zmenou hesla na\n"
-"\t\t\t\tMAX_DAYS dní\n"
+"  -a, --all                     zobrazí stav hesiel pre všetky účty\n"
+"  -d, --delete                  odstráni heslo pre zadaný účet\n"
+"  -e, --expire                  vynúti platnosť hesla pre zadaný účet\n"
+"  -h, --help                    zobrazí túto nápovedu a ukončí sa\n"
+"  -k, --keep-tokens             zmení heslo iba v prípade vypršania času\n"
+"                                jeho platnosti\n"
+"  -i, --inactive INACTIVE       nastaví neplatnosť hesla po vypršaní času\n"
+"                                platnosti na INACTIVE dní\n"
+"  -l, --lock                    zablokuje zadaný účet\n"
+"  -n, --mindays MIN_DAYS        nastaví minimálny počet dní pred zmenou\n"
+"                                hesla na MIN_DAYS dní\n"
+"  -q, --quiet                   stručný mód\n"
+"  -r, --repository REPOSITORY   zmení heslo v repozitári REPOSITORY\n"
+"  -S, --status                  zobrazí stav hesla pre zadaný účet\n"
+"  -u, --unlock                  odblokuje zadaný účet\n"
+"  -w, --warndays WARN_DAYS      nastaví počet dní na upozornenie o vypršaní\n"
+"                                platnosti na WARN_DAYS dní\n"
+"  -x, --maxdays MAX_DAYS        nastaví maximálny počet dní pred zmenou\n"
+"                                hesla na MAX_DAYS dní\n"
 "\n"
 
 msgid "Old password: "
@@ -1524,25 +1535,26 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "Použitie: su [voľby] [účet]\n"
 "\n"
 "Voľby:\n"
-"  -c, --command PRÍKAZ\t\tpredá PRÍKAZ vyvolanému shell-u  -h, --help\n"
-"\t\t\t\tzobrazí túto nápovedu a ukončí sa\n"
-"  -, -l, --login\t\tnastaví shell ako prihlasovací shell\n"
+"  -c, --command PRÍKAZ          predá PRÍKAZ vyvolanému shell-u\n"
+"  -h, --help                    zobrazí túto nápovedu a ukončí sa\n"
+"  -, -l, --login                nastaví 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"
+"  --preserve-environment        zachová premenné prostredia a ponechá\n"
+"                                ten istý shell\n"
+"  -s, --shell SHELL             použije SHELL namiesto predvoleného v "
+"passwd\n"
 "\n"
 
 #, c-format
@@ -1629,56 +1641,60 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "Použitie: useradd [voľby] účet\n"
 "\n"
 "Voľby:\n"
-"  -b, --base-dir ZÁKL_ADR\tzákladný adresár domovského 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\tdomovský adresár nového účtu\n"
-"  -D, --defaults\t\tvypíše alebo nastaví predvolené nastavenia programu\n"
-"\t\t\t\tuseradd\n"
-"  -e, --expiredate EXP_DATUM\tnastaví čas vypršania platnosti účtu na\n"
-"\t\t\t\tEXP_DATUM\n"
-"  -f, --inactive NEAKTIV\tzablokuje účet po NEAKTIV dňoch od času vypršania\n"
-"\t\t\t\tplatnosti\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 má patriť\n"
-"\t\t\t\tnový úč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í domovský adresár pre nový použí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é heslo\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"
+"  -b, --base-dir ZÁKL_ADR       základný adresár domovského adresára nového\n"
+"                                používateľského účtu\n"
+"  -c, --comment KOMENTÁR        nastaví pole GECOS nového účtu\n"
+"  -d, --home-dir DOM_ADR        domovský adresár nového účtu\n"
+"  -D, --defaults                vypíše alebo nastaví predvolené nastavenia\n"
+"                                programu useradd\n"
+"  -e, --expiredate EXP_DATUM    nastaví čas vypršania platnosti účtu na\n"
+"                                EXP_DATUM\n"
+"  -f, --inactive NEAKTIV        zablokuje účet po NEAKTIV dňoch od času\n"
+"                                vypršania platnosti\n"
+"  -g, --gid SKUPINA             vynúti použitie tejto skupiny pre nový účet\n"
+"  -G, --groups SKUPINY          zoznam dodatočných skupín, do ktorých má\n"
+"                                patriť nový účet\n"
+"  -h, --help                    zobrazí túto nápovedu a skončí\n"
+"  -k, --skel VZOR_ADR           zadá alternatívny vzorový adresár\n"
+"  -K, --key KĽÚČ=HODNOTA        nahradí predvolené nastavenia /etc/login."
+"defs\n"
+"  -m, --create-home             vytvorí domovský adresár pre nový\n"
+"                                používateľský účet\n"
+"  -o, --non-unique              povolí vytvorenie používateľa s duplicitným\n"
+"                                (nejedinečným) UID\n"
+"  -p, --password HESLO          pre nový účet použije zadané zašifrované\n"
+"                                heslo\n"
+"  -s, --shell SHELL             prihlasovací shell nového účtu\n"
+"  -u, --uid UID                 vynúti použitie tohto UID pre nový účet\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1826,18 +1842,19 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 "Použitie: userdel [voľby] LOGIN\n"
 "\n"
 "Voľby:\n"
-"  -f, --force\t\t\tvynúti odstránenie súborov, aj keď používateľ nie je ich\n"
-"\t\t\t\tvlastníkom\n"
-"  -h, --help\t\t\tzobrazí túto nápovedu a ukončí sa\n"
-"  -r, --remove\t\t\todstráni domovský adresár a súbor s poštami\n"
+"  -f, --force                   vynúti odstránenie súborov, aj keď\n"
+"                                používateľ nie je ich vlastníkom\n"
+"  -h, --help                    zobrazí túto nápovedu a ukončí sa\n"
+"  -r, --remove                  odstráni domovský adresár a súbor s poštami\n"
 "\n"
 
 #, c-format
@@ -1903,52 +1920,57 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "Použitie: usermod [voľby] účet\n"
 "\n"
 "Voľby:\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 DOM_ADR\t\tnový domovský adresár pre nový používateľský\n"
-"\t\t\t\túčet\n"
-"  -e, --expiredate EXP_DATUM\tnastaví čas vypršania platnosti účtu na\n"
-"\t\t\t\tEXP_DATUM\n"
-"  -f, --inactive NEAKTIV\tzablokuje platnosť hesla po NEAKTIV dňoch\n"
-"\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 domovského 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\t\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"
+"  -a, --append SKUPINA          pridá používateľa do prídavnej skupiny\n"
+"  -c, --comment KOMENTÁR        nová hodnota poľa GECOS\n"
+"  -d, --home DOM_ADR            nový domovský adresár pre nový "
+"používateľský\n"
+"                                účet\n"
+"  -e, --expiredate EXP_DATUM    nastaví čas vypršania platnosti účtu na\n"
+"                                EXP_DATUM\n"
+"  -f, --inactive NEAKTIV        zablokuje platnosť hesla po NEAKTIV dňoch\n"
+"                                od času vypršania platnosti\n"
+"  -g, --gid SKUPINA             vynúti použitie skupiny SKUPINA ako novej\n"
+"                                prvotnej prihlasovacej skupiny\n"
+"  -G, --groups SKUPINY          zobrazí prídavné skupiny\n"
+"  -h, --help                    zobrazí túto nápovedu a ukončí sa\n"
+"  -l, --login LOGIN             nová hodnota prihlasovacieho mena\n"
+"  -L, --lock                    zablokuje používateľský účet\n"
+"  -m, --move-home               presunie obsah domovského adresára do "
+"nového\n"
+"                                umiestnenia (používať iba s -d)\n"
+"  -o, --non-unique              dovolí použitie duplicitného\n"
+"                                (nejedinečného) UID\n"
+"  -p, --password HESLO          ako nové heslo použije zadané zašifrované\n"
+"                                HESLO\n"
+"  -s, --shell SHELL             nový prihlasovací shell pre používateľský\n"
+"                                účet\n"
+"  -u, --uid UID                 nový UID pre používateľský účet\n"
+"  -U, --unlock                  odblokuje používateľský účet\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2019,21 +2041,21 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "Použ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"
+"  -g, --group                   upraví databázu skupín\n"
+"  -h, --help                    zobrazí túto nápovedu a ukončí sa\n"
+"  -p, --passwd                  upraví databázu passwd\n"
+"  -q, --quiet                   stručný mód\n"
+"  -s, --shadow                  upraví databázu shadow alebo gshadow\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/sq.po
===================================================================
--- upstream/trunk/po/sq.po	2007-11-25 22:05:08 UTC (rev 1466)
+++ upstream/trunk/po/sq.po	2007-11-26 22:00:57 UTC (rev 1467)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.3\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
 "PO-Revision-Date: 2004-11-20 03:28+0100\n"
 "Last-Translator: Elian Myftiu <pinguini AT fastwebnet DOT it>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit at lists.sourceforge.net>\n"
@@ -194,17 +194,17 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 
@@ -440,15 +440,17 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -528,8 +530,8 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 
@@ -565,15 +567,18 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 
@@ -703,13 +708,13 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 
@@ -838,10 +843,11 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 
@@ -994,10 +1000,11 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 
@@ -1139,14 +1146,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr ""
@@ -1200,23 +1203,24 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 
@@ -1395,13 +1399,13 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 
@@ -1484,29 +1488,30 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 
@@ -1649,9 +1654,10 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 
@@ -1716,26 +1722,26 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 
@@ -1806,11 +1812,11 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 

Modified: upstream/trunk/po/sv.po
===================================================================
--- upstream/trunk/po/sv.po	2007-11-25 22:05:08 UTC (rev 1466)
+++ upstream/trunk/po/sv.po	2007-11-26 22:00:57 UTC (rev 1467)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
-"PO-Revision-Date: 2006-07-19 12:18+0100\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-26 22:48+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -197,34 +197,34 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "Användning: chage [flaggor] [INLOGGNINGSNAMN]\n"
 "\n"
 "Flaggor:\n"
-"  -d, --lastday DAG\t\tsätt senaste lösenordsändringen till DAG\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 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 innan lösenordet\n"
-"\t\t\t\tmåste bytas till MIN_DAG\n"
-"  -M, --maxdays MAX_DAG\t\tsätt maximum antal dagar innan lösenordet\n"
-"\t\t\t\tmåste bytas till MAX_DAG\n"
-"  -W, --warndays VARN_DAG\tsätt antal dagar för varning innan utgångsdatum\n"
-"\t\t\t\ttill VARN_DAG\n"
+"  -d, --lastday DAG             sätt senaste lösenordsändringen till DAG\n"
+"  -E, --expiredate DATUM        sätt utgångsdatum för konto till DATUM\n"
+"  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
+"  -I, --inactive INAKTIV        sätt lösenordet inaktivt efter utgångsdatum\n"
+"                                till INAKTIV\n"
+"  -l, --list                    visa åldringsinformation för konto\n"
+"  -m, --mindays MIN_DAG         sätt minimum antal dagar innan lösenordet\n"
+"                                måste bytas till MIN_DAG\n"
+"  -M, --maxdays MAX_DAG         sätt maximum antal dagar innan lösenordet\n"
+"                                måste bytas till MAX_DAG\n"
+"  -W, --warndays VARN_DAG       sätt antal dagar för varning innan\n"
+"                                utgångsdatum till VARN_DAG\n"
 "\n"
 
 #, c-format
@@ -462,23 +462,25 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "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"
+"  -e, --encrypted               angivna lösenord är krypterade\n"
+"  -h, --help                    visa detta hjälpmeddelande och avsluta.\n"
+"  -m, --md5                     använd MD5-kryptering istället för DES när\n"
+"                                de angivna lösenorden inte är krypterade\n"
 "\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -558,15 +560,15 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "Användning: chsh [flaggor] [INLOGGNINGSNAMN]\n"
 "\n"
 "Flaggor:\n"
-"  -h, --help\t\t\t\tvisa detta hjälpmeddelande och avsluta\n"
-"  -s, --shell SHELL\t\t\tnytt inloggningsskal för användarkontot\n"
+"  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
+"  -s, --shell SHELL             nytt inloggningsskal för användarkontot\n"
 "\n"
 
 msgid "Login Shell"
@@ -601,31 +603,34 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "Användning: faillog [flaggor]\n"
 "\n"
 "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 inloggningar i SEK\n"
-"\t\t\t\tsekunder\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 KONTO\t\tvisa faillog information eller hantera räknare för\n"
-"\t\t\t\tmisslyckade inloggningar och begränsa\n"
-"\t\t\t\t(om använd med -r, -m eller -l flaggor) endast\n"
-"\t\t\t\tför användaren KONTO\n"
+"  -a, --all             visa faillog information för alla användare\n"
+"  -h, --help            visa detta hjälpmeddelande och avsluta\n"
+"  -l, --lock-time SEK   lås kontot efter misslyckade inloggningar\n"
+"                        i SEK sekunder\n"
+"  -m, --maximum MAX     sätt maximum misslyckade inloggningar till MAX\n"
+"  -r, --reset           återställ räknaren för misslyckade inloggningar\n"
+"  -t, --time DAGAR      visa faillog information för senare än DAGAR\n"
+"  -u, --user KONTO      visa faillog information eller hantera räknare för\n"
+"                        misslyckade inloggningar och begränsa\n"
+"                        (om använd med -r, -m eller -l flaggor) endast\n"
+"                        för användaren KONTO\n"
 "\n"
 
 #, c-format
@@ -754,25 +759,26 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "Användning: groupadd [flaggor] GRUPP\n"
 "\n"
 "Flaggor:\n"
-"  -f, --force\t\ttvinga avslut med lyckad status om den specificerade\n"
-"\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\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"
+"  -f, --force                   tvinga avslut med lyckad status om den\n"
+"                                specificerade gruppen redan finns\n"
+"  -g, --gid GID                 använd GID för den nya gruppen\n"
+"  -h, --help                    visa detta hjälpmeddelandet och avsluta\n"
+"  -K, --key KEY=VÄRDE           åsidosätter standardvärden från /etc/login."
+"defs\n"
+"  -o, --non-unique              tillåter skapa grupp med duplikat\n"
+"                                (icke-unikt) GID\n"
 "\n"
 
 #, c-format
@@ -902,20 +908,21 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "Användning: groupmod [flaggor] GRUPP\n"
 "\n"
 "Flaggor:\n"
-"  -g, --gid GID\t\t\ttvinga användning av nytt GID för GRUPP\n"
-"  -h, --help\t\t\tvisa detta hjälpmeddelande och avsluta\n"
-"  -n, --new-name NY_GRUPP\ttvinga användning av namnet NY_GRUPP för GRUPP\n"
-"  -o, --non-unique\t\ttillåt användning av dubblett (icke-unikt) GID för\n"
-"\t\t\t\tGRUPP\n"
+"  -g, --gid GID             tvinga användning av nytt GID för GRUPP\n"
+"  -h, --help                visa detta hjälpmeddelande och avsluta\n"
+"  -n, --new-name NY_GRUPP   tvinga användning av namnet NY_GRUPP för GRUPP\n"
+"  -o, --non-unique          tillåt användning av dubblett (icke-unikt) GID\n"
+"                            för GRUPP\n"
 "\n"
 
 #, c-format
@@ -1067,20 +1074,21 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "Användning: lastlog [flaggor]\n"
 "\n"
 "Flaggor:\n"
-"  -b, --before DAGAR\tskriv bara ut lastlog information äldre än DAGAR\n"
-"  -h, --help\t\tvisa detta hjälpmeddelande och avsluta\n"
-"  -t, --time DAGAR\tskriv bara ut lastlog information senare än DAGAR\n"
-"  -u, --user LOGIN\tskriv ut lastlog information för användare angiven med\n"
-"\t\t\tLOGIN\n"
+"  -b, --before DAGAR    skriv bara ut lastlog information äldre än DAGAR\n"
+"  -h, --help            visa detta hjälpmeddelande och avsluta\n"
+"  -t, --time DAGAR      skriv bara ut lastlog information senare än DAGAR\n"
+"  -u, --user LOGIN      skriv ut lastlog information för användare\n"
+"                        angiven med LOGIN\n"
 "\n"
 
 #, c-format
@@ -1231,14 +1239,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: kan inte låsa /etc/passwd.\n"
@@ -1292,45 +1296,49 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "Användning: passwd [flaggor] [INLOGGNINGSNAMN]\n"
 "\n"
 "Flaggor:\n"
-"  -a, --all\t\t\trapportera lösenordsstatus för alla konton\n"
-"  -d, --delete\t\t\tradera lösenordet för det angivna kontot\n"
-"  -e, --expire\t\t\ttvinga utlopp av lösenord för det angiva kontot\n"
-"  -h, --help\t\t\tvisa detta hjälpmeddelande och avsluta\n"
-"  -k, --keep-tokens\t\tändra lösenord bara om det har löpt ut\n"
-"  -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 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"
-"  -S, --status\t\t\trapportera lösenordsstatus för angivet konto\n"
-"  -u, --unlock\t\t\tlås upp det angivna kontot\n"
-"  -w, --warndays VARN_DAG\tsätt antal dagar för utlöpsvarning till VARN_DAG\n"
-"  -x, --maxdays MAX_DAG\t\tsätt maximum antal dagar för lösenordet måste\n"
-"\t\t\t\tändras till MAX_DAG\n"
+"  -a, --all                     rapportera lösenordsstatus för alla konton\n"
+"  -d, --delete                  radera lösenordet för det angivna kontot\n"
+"  -e, --expire                  tvinga utlopp av lösenord för det angiva "
+"kontot\n"
+"  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
+"  -k, --keep-tokens             ändra lösenord bara om det har löpt ut\n"
+"  -i, --inactive INAKTIVT       sätt lösenordet till inaktivt efter\n"
+"                                utlöpsdatum till INAKTIVT\n"
+"  -l, --lock                    lås det angivna kontot\n"
+"  -n, --mindays MIN_DAG         sätt minimum antal dagar före lösenordet\n"
+"                                kan ändras till MIN_DAG\n"
+"  -q, --quiet                   tyst läge\n"
+"  -r, --repository REPOSITORY   ändra lösenordet i REPOSITORY repository\n"
+"  -S, --status                  rapportera lösenordsstatus för angivet "
+"konto\n"
+"  -u, --unlock                  lås upp det angivna kontot\n"
+"  -w, --warndays VARN_DAG       sätt antal dagar för utlöpsvarning till "
+"VARN_DAG\n"
+"  -x, --maxdays MAX_DAG         sätt maximum antal dagar för lösenordet\n"
+"                                måste ändras till MAX_DAG\n"
 "\n"
 
 msgid "Old password: "
@@ -1514,25 +1522,26 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "Användning: su [flaggor] [INLOGGNINGSNAMN]\n"
 "\n"
 "Flaggor:\n"
-"  -c, --command KOMMANDO\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"
+"  -c, --command KOMMANDO        skicka KOMMANDO till anropade skalet\n"
+"  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
+"  -, -l, --login                gö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"
+"  --preserve-environment        återställ inte miljövariabler och behåll\n"
+"                                samma skal\n"
+"  -s, --shell SKAL              använd SKAL istället för det angivna i "
+"passwd\n"
 "\n"
 
 #, c-format
@@ -1619,56 +1628,63 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "Användning: useradd [flaggor] LOGIN\n"
 "\n"
 "Flaggor:\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_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 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_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"
-"\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"
+"  -b, --base-dir BAS_KATALOG    baskatalog för det nya användarkontots\n"
+"                                hem-map\n"
+"  -c, --comment KOMMENTAR       sätt ett GECOS-fält för det nya "
+"användarkontot\n"
+"  -d, --home-dir HEM_KATALOG    hemkatalog för det nya kontot\n"
+"  -D, --defaults                skriv ut eller spara modifierad standard "
+"för\n"
+"                                useradd konfiguration\n"
+"  -e, --expiredate UTLÖPSDATUM  sätt kontots utgångsdatum till UTLÖPSDATUM\n"
+"  -f, --inactive INAKTIV        sätt lösenordet inaktivt efter utlöpsdatum\n"
+"                                till INAKTIV\n"
+"  -g, --gid GRUPP               tvinga använda GRUPP för nya användarkontot\n"
+"  -G, --groups GRUPPER          lista av tilläggsgrupper för det nya\n"
+"                                användarkontot\n"
+"  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
+"  -k, --skel SKEL_KATALOG       specificera ett alternativ skel-katalog\n"
+"  -K, --key KEY=VÄRDE           åsidosätter standardvärden från /etc/login."
+"defs\n"
+"  -m, --create-home             skapa hem-katalog för det nya "
+"användarkontot\n"
+"  -o, --non-unique              tillåt skapa användare med samma dublerat\n"
+"                                (icke-unikt) UID\n"
+"  -p, --password LÖSENORD       använd krypterat lösenord för det nya\n"
+"                                användarkontot\n"
+"  -s, --shell SKAL              inloggningsskalet för det nya "
+"användarkontot\n"
+"  -u, --uid UID                 tvinga använda UID för det nya "
+"användarkontot\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1816,18 +1832,19 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 "Användning: userdel [flaggor] INLOGGNINGSNAMN\n"
 "\n"
 "Flaggor:\n"
-"  -f, --force\t\t\ttvinga borttagning av filer, även om de inte ägs av\n"
-"\t\t\t\tanvändaren\n"
-"  -h, --help\t\t\tvisa detta hjälpmeddelandet och avsluta\n"
-"  -r, --remove\t\t\tta bort hemkatalog och postkö\n"
+"  -f, --force                   tvinga borttagning av filer, även om\n"
+"                                de inte ägs av användaren\n"
+"  -h, --help                    visa detta hjälpmeddelandet och avsluta\n"
+"  -r, --remove                  ta bort hemkatalog och postkö\n"
 "\n"
 
 #, c-format
@@ -1894,52 +1911,53 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "Användning: usermod [flaggor] INLOGGNINGSNAMN\n"
 "\n"
 "Flaggor:\n"
-"  -a, --append GRUPP\t\tlägg till användaren till tilläggsGRUPP\n"
-"\t\t\t\t(använd endast med -G)\n"
-"  -c, --comment KOMMENTAR\tnytt värde för GECOS-fält\n"
-"  -d, --home HEMKATALOG\themkatalog för nya användarkontot\n"
-"  -e, --expiredate UTGÅNGSDATUM\tsätt kontots utgångsdatum till\n"
-"\t\t\t\tUTGÅ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 som ny initial inloggningsgrupp\n"
-"  -G, --groups GRUPPER\t\tlista tilläggsgrupper\n"
-"  -h, --help\t\t\tvisa detta hjälpmeddelande och avsluta\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\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"
+"  -a, --append GRUPP            lägg till användaren till tilläggsGRUPP\n"
+"                                (använd endast med -G)\n"
+"  -c, --comment KOMMENTAR       nytt värde för GECOS-fält\n"
+"  -d, --home HEMKATALOG         hemkatalog för nya användarkontot\n"
+"  -e, --expiredate UTGÅNGSDATUM sätt kontots utgångsdatum till\n"
+"                                UTGÅNGSDATUM\n"
+"  -f, --inactive INAKTIV        sätt lösenordet inaktivt efter utgångsdatum\n"
+"                                till INAKTIV\n"
+"  -g, --gid GRUPP               tvinga använda GRUPP som ny initial\n"
+"                                inloggningsgrupp\n"
+"  -G, --groups GRUPPER          lista tilläggsgrupper\n"
+"  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
+"  -l, --login KONTO             nytt värde för inloggningskontots namn\n"
+"  -L, --lock                    lås användarkontot\n"
+"  -m, --move-home               flytta innehållet i hemkatalogen till den\n"
+"                                nya platsen (använd endast med -d)\n"
+"  -o, --non-unique              tillåt dubblett av (icke-unikt) UID\n"
+"  -p, --password LÖSENORD       använd krypterat lösenord för det nya\n"
+"                                lösenordet\n"
+"  -s, --shell SKAL              nytt inloggningsskal för användarkontot\n"
+"  -u, --uid UID                 nytt UID för användarkontot\n"
+"  -U, --unlock                  lås upp användarkontot\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2010,21 +2028,21 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "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"
+"  -g, --group                   redigera gruppdatabas\n"
+"  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
+"  -p, --passwd                  redigera lösenordsdatabas\n"
+"  -q, --quiet                   tyst läge\n"
+"  -s, --shadow                  redigera databaserna shadow eller gshadow\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/tl.po
===================================================================
--- upstream/trunk/po/tl.po	2007-11-25 22:05:08 UTC (rev 1466)
+++ upstream/trunk/po/tl.po	2007-11-26 22:00:57 UTC (rev 1467)
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
-"PO-Revision-Date: 2006-08-14 08:27+0800\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-26 21:34+0100\n"
 "Last-Translator: Eric Pareja <xenos at upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl at banwa.upm.edu.ph>\n"
 "MIME-Version: 1.0\n"
@@ -208,36 +208,36 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "Pag-gamit: chage [mga opsiyon] [LOGIN]\n"
 "\n"
 "Mga opsiyon:\n"
-"  -d, --lastday HULING_ARAW\titakda ang huling pagpalit ng kontrasenyas\n"
-"\t\t\t\tsa HULING_ARAW\n"
-"  -E, --expiredate EXPIRE_DATE\titakda ang pagkapaso ng account sa\n"
-"\t\t\t\tEXPIRE_DATE\n"
-"  -h, --help\t\t\tipakita ang tulong at lumabas\n"
-"  -I, --inactive INACTIVE\titakda ang kontrasenyas na inaktibo matapos\n"
-"\t\t\t\tmapaso at gawin itong INACTIVE\n"
-"  -l, --list\t\t\tipakita ang impormasyon tungkol sa account\n"
-"  -m, --mindays MIN_DAYS\titakda na hindi kukulang sa MIN_DAYS\n"
-"\t\t\t\tbago palitan ang kontrasenyas\n"
-"  -M, --maxdays MAX_DAYS\titakda na hindi hihigit sa MAX_DAYS\n"
-"\t\t\t\tbago palitan ang kontrasenyas\n"
-"  -W, --warndays WARN_DAYS\titakda ang babala tungkol sa pagpaso sa\n"
-"\t\t\t\tWARN_DAYS\n"
+"  -d, --lastday HULING_ARAW     itakda ang huling pagpalit ng kontrasenyas\n"
+"                                sa HULING_ARAW\n"
+"  -E, --expiredate EXPIRE_DATE  itakda ang pagkapaso ng account sa\n"
+"                                EXPIRE_DATE\n"
+"  -h, --help                    ipakita ang tulong at lumabas\n"
+"  -I, --inactive INACTIVE       itakda ang kontrasenyas na inaktibo matapos\n"
+"                                mapaso at gawin itong INACTIVE\n"
+"  -l, --list                    ipakita ang impormasyon tungkol sa account\n"
+"  -m, --mindays MIN_DAYS        itakda na hindi kukulang sa MIN_DAYS\n"
+"                                bago palitan ang kontrasenyas\n"
+"  -M, --maxdays MAX_DAYS        itakda na hindi hihigit sa MAX_DAYS\n"
+"                                bago palitan ang kontrasenyas\n"
+"  -W, --warndays WARN_DAYS      itakda ang babala tungkol sa pagpaso sa\n"
+"                                WARN_DAYS\n"
 "\n"
 
 #, c-format
@@ -477,23 +477,25 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "Pag-gamit: chpasswd [mga opsiyon]\n"
 "\n"
 "Mga opsiyon:\n"
-"  -e, --encrypted\tang mga bigay na mga kontrasenyas 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 kontrasenyas ay hindi naka-encrypt\n"
+"  -e, --encrypted   ang mga bigay na mga kontrasenyas ay naka-encrypt\n"
+"  -h, --help        ipakita itong payo na ito at lumabas\n"
+"  -m, --md5         gamitin ang MD5 encryption imbes na DES kapag ang\n"
+"                    mga ibinigay na mga kontrasenyas ay hindi naka-encrypt\n"
 "\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -573,15 +575,15 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "Pag-gamit: chsh [mga opsiyon] [LOGIN]\n"
 "\n"
 "Mga opsiyon:\n"
-"  -h, --help            ipakita ito at lumabas\n"
-"  -s, --shell SHELL                 bagong login shell para sa gumagamit\n"
+"  -h, --help                    ipakita ito at lumabas\n"
+"  -s, --shell SHELL             bagong login shell para sa gumagamit\n"
 "\n"
 
 msgid "Login Shell"
@@ -616,31 +618,38 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "Pag-gamit: faillog [mga opsiyon]\n"
 "\n"
 "Mga opsiyon:\n"
-"  -a, --all\t\tipakita ang mga record ng faillog para sa lahat\n"
-"  -h, --help\t\tipakita ang tulong na ito at lumabas\n"
-"  -l, --lock-time SEG\tmatapos mabigo sa pagpasok, i-lock ng SEG segundo\n"
-"\t\t\tang account\n"
-"  -m, --maximum MAX\titakda ang maximum na bilang ng kabiguan sa pagpasok\n"
-"\t\t\tna hanggang MAX lamang\n"
-"  -r, --reset\t\tireset ang mga tagabilang ng kabiguan sa pagpasok\n"
-"  -t, --time ARAW\tipakita ang faillog records na hindi tatanda sa ARAW\n"
-"  -u, --user LOGIN\tipakita ang faillog record o pangasiwaan ang tagabilang\n"
-"\t\t\tng pagkabigo at mga palugit (kung gamit ang -r, -m o\n"
-"\t\t\t-l na opsiyon) para sa gumagamit ng LOGIN lamang\n"
+"  -a, --all             ipakita ang mga record ng faillog para sa lahat\n"
+"  -h, --help            ipakita ang tulong na ito at lumabas\n"
+"  -l, --lock-time SEG   matapos mabigo sa pagpasok, i-lock ng SEG segundo\n"
+"                        ang account\n"
+"  -m, --maximum MAX     itakda ang maximum na bilang ng kabiguan sa "
+"pagpasok\n"
+"                        na hanggang MAX lamang\n"
+"  -r, --reset           ireset ang mga tagabilang ng kabiguan sa pagpasok\n"
+"  -t, --time ARAW       ipakita ang faillog records na hindi tatanda sa "
+"ARAW\n"
+"  -u, --user LOGIN      ipakita ang faillog record o pangasiwaan ang "
+"tagabilang\n"
+"                        ng pagkabigo at mga palugit (kung gamit ang -r, -m "
+"o\n"
+"                        -l na opsiyon) para sa gumagamit ng LOGIN lamang\n"
 "\n"
 
 #, c-format
@@ -769,24 +778,24 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "Pag-gamit: groupadd [mga opsiyon] GRUPO\n"
 "\n"
 "Mga opsiyon:\n"
-"  -f, --force\t\tipilit ang paglabas na kalagayang matagumpay kung\n"
-"\t\t\tang ibinigay na grupo ay mayroon na\n"
-"  -g, --gid GID\t\tgamitin ang GID para sa bagong grupo\n"
-"  -h, --help\t\tipakita ang patalastas na ito at lumabas\n"
-"  -K, --key KEY=HALAGA\tnangingibabaw sa mga default sa /etc/login.defs\n"
-"  -o, --non-unique\tpayagang gumawa ng grupo na may GID na kapareho\n"
+"  -f, --force           ipilit ang paglabas na kalagayang matagumpay kung\n"
+"                        ang ibinigay na grupo ay mayroon na\n"
+"  -g, --gid GID         gamitin ang GID para sa bagong grupo\n"
+"  -h, --help            ipakita ang patalastas na ito at lumabas\n"
+"  -K, --key KEY=HALAGA  nangingibabaw sa mga default sa /etc/login.defs\n"
+"  -o, --non-unique      payagang gumawa ng grupo na may GID na kapareho\n"
 "\n"
 
 #, c-format
@@ -916,19 +925,21 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "Pag-gamit: groupmod [mga opsiyon] GRUPO\n"
 "\n"
 "Mga opsiyon:\n"
-"  -g, --gid GID\t\tgamitin ang bagong GID ng GRUPO\n"
-"  -h, --help\t\tipakita ang tulong na ito at lumabas\n"
+"  -g, --gid GID                 gamitin ang bagong GID ng GRUPO\n"
+"  -h, --help                    ipakita ang tulong na ito at lumabas\n"
 "  -n, --new-name BAGONG_GRUPO   ipilit na gamitin ang BAGONG_GRUPO ng GRUPO\n"
-"  -o, --non-unique\tpayagang gumawa ng grupo na may kaparehong GID ng GRUPO\n"
+"  -o, --non-unique              payagang gumawa ng grupo na may kaparehong\n"
+"                                GID ng GRUPO\n"
 "\n"
 
 #, c-format
@@ -1080,19 +1091,22 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "Pag-gamit: lastlog [mga option]\n"
 "\n"
 "Mga option:\n"
-"  -b, --before ARAW\tipakita lamang ang lastlog record na mas-luma sa ARAW\n"
-"  -h, --help\t\tipakita ang tulong na ito at lumabas\n"
-"  -t, --time ARAW\tipakita lamang ang lastlog record na mas-bagos sa ARAW\n"
-"  -u, --user LOGIN\tipakita lamang ang gumagamit na LOGIN\n"
+"  -b, --before ARAW     ipakita lamang ang lastlog record na mas-luma sa "
+"ARAW\n"
+"  -h, --help            ipakita ang tulong na ito at lumabas\n"
+"  -t, --time ARAW       ipakita lamang ang lastlog record na mas-bagos sa "
+"ARAW\n"
+"  -u, --user LOGIN      ipakita lamang ang gumagamit na LOGIN\n"
 "\n"
 
 #, c-format
@@ -1243,14 +1257,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: hindi maaldaba ang /etc/passwd.\n"
@@ -1299,51 +1309,53 @@
 msgid "%s: error updating files\n"
 msgstr "%s: error sa pag-apdeyt ng mga talaksan\n"
 
-#, c-format
+#, fuzzy, 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"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "Pag-gamit: passwd [mga opsiyon] [login]\n"
 "\n"
 "Mga opsiyon:\n"
-"  -a, --all\t\tmag-ulat tungkol sa kalagayan ng kontrasenyas ng lahat\n"
-"  -d, --delete\t\tburahin ang kontrasenyas ng account\n"
-"  -e, --expire\t\tpiliting mapaso ang kontrasenyas ng account\n"
-"  -h, --help\t\tipakita ang tulong na ito at lumabas\n"
-"  -k, --keep-tokens\tpalitan ang kontrasenyas kung paso lamang\n"
-"  -i, --inactive INACTIVE\titakdang inaktibo matapos na mapaso\n"
-"\t\t\t\tsa INACTIVE\n"
-"  -l, --lock\t\ti-lock ang account\n"
+"  -a, --all                     mag-ulat tungkol sa kalagayan ng\n"
+"                                kontrasenyas ng lahat\n"
+"  -d, --delete                  burahin ang kontrasenyas ng account\n"
+"  -e, --expire                  piliting mapaso ang kontrasenyas ng account\n"
+"  -h, --help                    ipakita ang tulong na ito at lumabas\n"
+"  -k, --keep-tokens             palitan ang kontrasenyas kung paso lamang\n"
+"  -i, --inactive INACTIVE       itakdang inaktibo matapos na mapaso\n"
+"                                sa INACTIVE\n"
+"  -l, --lock                    i-lock ang account\n"
 "  -n, --mindays MIN_ARAW\n"
-"  -q, --quiet           tahimik lamang\n"
+"  -q, --quiet                   tahimik lamang\n"
 "  -r, --repository REPOSITORYO  palitan ang kontrasenyas sa REPOSITORYO\n"
-"  -S, --status                  iulat ang kalagayan ng kontrasenyas ng "
-"ibinigay na account\n"
+"  -S, --status                  iulat ang kalagayan ng kontrasenyas ng\n"
+"                                ibinigay na account\n"
 "  -u, --unlock                  tanggalin ang pagkaaldaba ng account\n"
-"  -w, --warndays BABALA_ARAW    itakda ang pagbabala ng taning sa "
-"BABALA_ARAW\n"
-"  -x, --maxdays MAX_ARAW        itakda kung hanggang ilang araw bago "
-"magpalit ng kontrasenyas sa MAX_ARAW\n"
+"  -w, --warndays BABALA_ARAW    itakda ang pagbabala ng taning sa\n"
+"                                BABALA_ARAW\n"
+"  -x, --maxdays MAX_ARAW        itakda kung hanggang ilang araw bago\n"
+"                                magpalit ng kontrasenyas sa MAX_ARAW\n"
 "\n"
 
 msgid "Old password: "
@@ -1528,27 +1540,27 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "Pag-gamit: su [mga opsiyon] [login]\n"
 "\n"
 "Mga opsiyon:\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"
+"  -c, --command UTOS            ipasa ang UTOS sa tinawag na shell\n"
+"  -h, --help                    ipakita ang payo na ito\n"
+"  -, -l, --login                gawing login shell ang shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\thuwag i-reset ang mga variable\n"
-"\t\t\t\tna pangkapaligiran at gamitin\n"
-"\t\t\t\tang parehong shell\n"
-"  -s, --shell SHELL\t\tgamitin ang SHELL sa halip ng\n"
-"\t\t\t\tdefault sa passwd\n"
+"  --preserve-environment        huwag i-reset ang mga variable\n"
+"                                na pangkapaligiran at gamitin\n"
+"                                ang parehong shell\n"
+"  -s, --shell SHELL             gamitin ang SHELL sa halip ng\n"
+"                                default sa passwd\n"
 "\n"
 
 #, c-format
@@ -1635,58 +1647,63 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "Pag-gamit: useradd [mga opsiyon] LOGIN\n"
 "\n"
 "Mga opsiyon:\n"
-"  -b, --base-dir BASE_DIR\tpunong directory para sa bagong mga tahanang\n"
-"\t\t\t\tdirectory ng account\n"
-"  -c, --comment KOMENTO\t\titakda ang GECOS field ng bagong account\n"
-"  -d, --home-dir HOME_DIR\tang tahanang directory ng bagong account\n"
-"  -D, --defaults\t\tipakita o imbakin ang binagong default na\n"
-"\t\t\t\tpagkaayos ng useradd\n"
-"  -e, --expiredate EXPIRE_DATE\titakda ang petsa ng expiration ng account\n"
-"\t\t\t\tsa EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\titakda ang password na inaktibo matapos ng\n"
-"\t\t\t\tpagkapaso na INACTIVE\n"
-"  -g, --gid GRUPO\t\tipilit na gamitin ang GRUPO para sa bagong\n"
-"\t\t\t\taccount\n"
-"  -G, --groups MGAGRUPO\t\tidagdag ang mga grupo sa MGAGRUPO sa bagong\n"
-"\t\t\t\taccount\n"
-"  -h, --help\t\t\tipakita itong tulong na ito at lumabas\n"
-"  -k, --skel SKEL_DIR\t\titakda ang alternatibong skel directory\n"
-"  -K, --key KEY=HALAGA\t\tnangingibabaw sa default sa /etc/login.defs\n"
-"  -m, --create-home\t\tlikhain ang tahanang directory para sa bagong\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tpayagang lumikha ng user na may kaparehong UID\n"
-"  -p, --password PASSWOWRD\tgumamit ng encrypted password para sa bagong\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\titakda ang login shell para sa bagong account\n"
-"  -u, --uid UID\t\t\tgamitin ang UID para sa bagong account\n"
+"  -b, --base-dir BASE_DIR       punong directory para sa bagong mga "
+"tahanang\n"
+"                                directory ng account\n"
+"  -c, --comment KOMENTO         itakda ang GECOS field ng bagong account\n"
+"  -d, --home-dir HOME_DIR       ang tahanang directory ng bagong account\n"
+"  -D, --defaults                ipakita o imbakin ang binagong default na\n"
+"                                pagkaayos ng useradd\n"
+"  -e, --expiredate EXPIRE_DATE  itakda ang petsa ng expiration ng account\n"
+"                                sa EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       itakda ang password na inaktibo matapos ng\n"
+"                                pagkapaso na INACTIVE\n"
+"  -g, --gid GRUPO               ipilit na gamitin ang GRUPO para sa bagong\n"
+"                                account\n"
+"  -G, --groups MGAGRUPO         idagdag ang mga grupo sa MGAGRUPO sa bagong\n"
+"                                account\n"
+"  -h, --help                    ipakita itong tulong na ito at lumabas\n"
+"  -k, --skel SKEL_DIR           itakda ang alternatibong skel directory\n"
+"  -K, --key KEY=HALAGA          nangingibabaw sa default sa /etc/login.defs\n"
+"  -m, --create-home             likhain ang tahanang directory para sa\n"
+"                                bagong account\n"
+"  -o, --non-unique              payagang lumikha ng user na may kaparehong "
+"UID\n"
+"  -p, --password PASSWOWRD      gumamit ng encrypted password para sa "
+"bagong\n"
+"                                account\n"
+"  -s, --shell SHELL             itakda ang login shell para sa bagong "
+"account\n"
+"  -u, --uid UID                 gamitin ang UID para sa bagong account\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1834,20 +1851,19 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 "Paggamit: userdel [mga opsiyon] LOGIN\n"
 "\n"
 "Mga opsiyon:\n"
-"  -f, --force                   ipilit ang pagtanggal ng mga talaksan, kahit "
-"hindi pag-aari ng gumagamit\n"
-"  -h, --help                               ipakita ang patalastas na ito at "
-"lumabas\n"
-"  -r, --remove                           tanggalin ang home directory at "
-"mail spool\n"
+"  -f, --force                   ipilit ang pagtanggal ng mga talaksan,\n"
+"                                kahit hindi pag-aari ng gumagamit\n"
+"  -h, --help                    ipakita ang patalastas na ito at lumabas\n"
+"  -r, --remove                  tanggalin ang home directory at mail spool\n"
 "\n"
 
 #, c-format
@@ -1913,53 +1929,57 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "Pag-gamit: usermod [mga opsiyon] LOGIN\n"
 "\n"
 "Mga opsiyon:\n"
-"  -a, --append GRUPO\t\tidagdag ang gumagamit sa karagdagang GRUPO\n"
-"  -c, --comment KOMENTO\t\titakda ang GECOS field\n"
-"  -d, --home HOME_DIR\t\tang tahanang directory ng bagong account\n"
-"  -e, --expiredate EXPIRE_DATE\titakda ang petsa ng expiration ng account\n"
-"\t\t\t\tsa EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\titakda ang password na inaktibo matapos ng\n"
-"\t\t\t\tpagkapaso na INACTIVE\n"
-"  -g, --gid GRUPO\t\tipilit na gamitin ang GRUPO para sa bagong\n"
-"\t\t\t\taccount\n"
-"  -G, --groups MGAGRUPO\t\tidagdag ang mga grupo sa MGAGRUPO sa bagong\n"
-"\t\t\t\taccount\n"
-"  -h, --help\t\t\tipakita ang payo na ito\n"
-"  -l, --login LOGIN\t\tbagong halaga ng pangalang panglogin\n"
-"  -L, --lock\t\t\tialdaba ang account ng gumagamit\n"
-"  -m, --move-home\t\tilipat ang laman ng tahanang directory sa bagong\n"
-"\t\t\t\tlugar (gamitin lamang kasama ng -d)\n"
-"  -o, --non-unique\t\tpayagang lumikha ng user na may kaparehong UID\n"
-"  -p, --password PASSWOWRD\tgumamit ng encrypted password para sa bagong\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\titakda ang login shell para sa bagong account\n"
-"  -u, --uid UID\t\t\tgamitin ang UID para sa bagong account\n"
-"  -U, --unlock\t\t\ttanggalin ang pagkaaldaba ng account ng gumagamit\n"
+"  -a, --append GRUPO            idagdag ang gumagamit sa karagdagang GRUPO\n"
+"  -c, --comment KOMENTO         itakda ang GECOS field\n"
+"  -d, --home HOME_DIR           ang tahanang directory ng bagong account\n"
+"  -e, --expiredate EXPIRE_DATE  itakda ang petsa ng expiration ng account\n"
+"                                sa EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       itakda ang password na inaktibo matapos ng\n"
+"                                pagkapaso na INACTIVE\n"
+"  -g, --gid GRUPO               ipilit na gamitin ang GRUPO para sa bagong\n"
+"                                account\n"
+"  -G, --groups MGAGRUPO         idagdag ang mga grupo sa MGAGRUPO sa bagong\n"
+"                                account\n"
+"  -h, --help                    ipakita ang payo na ito\n"
+"  -l, --login LOGIN             bagong halaga ng pangalang panglogin\n"
+"  -L, --lock                    ialdaba ang account ng gumagamit\n"
+"  -m, --move-home               ilipat ang laman ng tahanang directory sa\n"
+"                                bagong lugar (gamitin lamang kasama ng -d)\n"
+"  -o, --non-unique              payagang lumikha ng user na may kaparehong "
+"UID\n"
+"  -p, --password PASSWOWRD      gumamit ng encrypted password para sa "
+"bagong\n"
+"                                account\n"
+"  -s, --shell SHELL             itakda ang login shell para sa bagong "
+"account\n"
+"  -u, --uid UID                 gamitin ang UID para sa bagong account\n"
+"  -U, --unlock                  tanggalin ang pagkaaldaba ng account ng\n"
+"                                gumagamit\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2030,21 +2050,21 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "Pag-gamit: vipw [mga opsiyon]\n"
 "\n"
 "Mga opsiyon:\n"
-"  -g, --group\t\tbaguhin ang database ng mga grupo\n"
-"  -h, --help\t\tipakita ang payo na ito\n"
-"  -p, --passwd\t\tbaguhin ang database na passwd\n"
-"  -q, --quiet\t\tmodong tahimik\n"
-"  -s, --shadow\t\tbaguhin ang database na shadow o gshadow\n"
+"  -g, --group                   baguhin ang database ng mga grupo\n"
+"  -h, --help                    ipakita ang payo na ito\n"
+"  -p, --passwd                  baguhin ang database na passwd\n"
+"  -q, --quiet                   modong tahimik\n"
+"  -s, --shadow                  baguhin ang database na shadow o gshadow\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/tr.po
===================================================================
--- upstream/trunk/po/tr.po	2007-11-25 22:05:08 UTC (rev 1466)
+++ upstream/trunk/po/tr.po	2007-11-26 22:00:57 UTC (rev 1467)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
-"PO-Revision-Date: 2006-07-20 15:58+0200\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-26 22:50+0100\n"
 "Last-Translator: Mehmet Türker <mturker at innova.com.tr>\n"
 "Language-Team: Türkçe <tr at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -198,36 +198,43 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "Kullanım: chage [seçenekler] kullanıcı\n"
 "\n"
 "Seçenekler:\n"
-"  -d, --lastday SON_GÜN(LAST_DAY)\tson şifre değiştirme gününü SON_GÜN\n"
-"\t\t\t\tolarak belirle\n"
-"  -E, --expiredate GEÇERLİLİK_TARİHİ(EXPIRE_DATE)\thesap geçerlilik\n"
-"\t\t\t\ttarihini GEÇERLİLİK_TARİHİ olarak belirle\n"
-"  -h, --help\t\t\tbu yardım mesajını görüntüle ve çık\n"
-"  -I, --inactive INACTIVE\tkullanım süresi dolduktan sonra şifreyi\n"
-"\t\t\t\tINACTIVE olarak belirle\n"
-"  -l, --list\t\t\thesap aging bilgisini göster\n"
-"  -m, --mindays ASGARİ_GÜN(MIN_DAYS)\tşifre değişikliği için asgari gün\n"
-"\t\t\t\tsayısını ASGARİ_GÜN olarak belirle\n"
-"  -M, --maxdays AZAMİ_GÜN(MAX_DAYS)\tşifre değişikliği için azami gün\n"
-"\t\t\t\tsayısını AZAMİ_GÜN olarak belirle\n"
-"  -W, --warndays UYARI_GÜN_SAYISI (WARN_DAYS)\tzorunlu şifre değişikliği\n"
-"\t\t\t\tuyarısından önceki gün sayısını UYARI_GÜN_SAYISI olarak belirle\n"
+"  -d, --lastday SON_GÜN(LAST_DAY)\n"
+"                                son şifre değiştirme gününü SON_GÜN olarak\n"
+"                                belirle\n"
+"  -E, --expiredate GEÇERLİLİK_TARİHİ(EXPIRE_DATE)\n"
+"                                hesap geçerlilik tarihini GEÇERLİLİK_TARİHİ\n"
+"                                olarak belirle\n"
+"  -h, --help                    bu yardım mesajını görüntüle ve çık\n"
+"  -I, --inactive INACTIVE       kullanım süresi dolduktan sonra şifreyi\n"
+"                                INACTIVE olarak belirle\n"
+"  -l, --list                    hesap aging bilgisini göster\n"
+"  -m, --mindays ASGARİ_GÜN(MIN_DAYS)\n"
+"                                şifre değişikliği için asgari gün\n"
+"                                sayısını ASGARİ_GÜN olarak belirle\n"
+"  -M, --maxdays AZAMİ_GÜN(MAX_DAYS)\n"
+"                                şifre değişikliği için azami gün\n"
+"                                sayısını AZAMİ_GÜN olarak belirle\n"
+"  -W, --warndays UYARI_GÜN_SAYISI (WARN_DAYS)\n"
+"                                zorunlu şifre değişikliği uyarısından "
+"önceki\n"
+"                                gün sayısını UYARI_GÜN_SAYISI olarak "
+"belirle\n"
 "\n"
 
 #, c-format
@@ -464,23 +471,25 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "Kullanım: chpasswd [seçenekler]\n"
 "\n"
 "Seçenekler:\n"
-"  -e, --encrypted\tverilen parolalar, şifrelendirilir\n"
-"  -h, --help\t\tbu yardım dosyasını gösterir ve çıkar\n"
-"  -m, --md5\t\tgirilen şifreler şifrelenmediğinde, DES yerine MD5\n"
-"\t\t\tşifrelemesi kullanır\n"
+"  -e, --encrypted               verilen parolalar, şifrelendirilir\n"
+"  -h, --help                    bu yardım dosyasını gösterir ve çıkar\n"
+"  -m, --md5                     girilen şifreler şifrelenmediğinde, DES\n"
+"                                yerine MD5 şifrelemesi kullanır\n"
 "\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -560,15 +569,15 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "Kullanım: chsh [seçenekler] [KULLANICI]\n"
 "\n"
 "Seçenekler:\n"
-"  -h, --help\t\t\tbu yardım mesajını göster ve çık\n"
-"  -s, --shell KABUK(SHELL)\t\t\tkullanıcı hesabı için yeni kabuk\n"
+"  -h, --help                    bu yardım mesajını göster ve çık\n"
+"  -s, --shell KABUK(SHELL)      kullanıcı hesabı için yeni kabuk\n"
 "\n"
 
 msgid "Login Shell"
@@ -603,32 +612,38 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "Kullanım: faillog [seçenekler]\n"
 "\n"
 "Seçenekler:\n"
-"  -a, --all\t\t\ttüm kullanıcılar için faillog kayıtlarını gösterir\n"
-" -h, --help\t\tbu yardım dosyasını göster ve çık\n"
-"  -l, --lock-time SANİYE(SEC)\t\thatalı oturum açılımından sonra, hesabı\n"
-"\t\t\t\tSANİYE kadar saniye kilitler\n"
-"  -m, --maximum AZAMİ(MAX)\t\ten fazla hatalı oturum açılış sayacını AZAMİ\n"
-"\t\t\t\tdeğerine ayarlar\n"
-"  -r, --reset\t\t\toturum açılış sayacını sıfırlar\n"
-"  -t, --time GÜN_SAYISI(DAYS)\t\tGÜN_SAYISI kadar günden daha güncel olan\n"
-"\t\t\t\tfaillog kayıtlarını gösterir\n"
-"  -u, --user KULLANICI(LOGIN)\t\tfaillog kaydını gösterir veya hata\n"
-"\t\t\t\tsayacını onarır ve sadece KULLANICI ile belirtilen kullanıcıları\n"
-"\t\t\t\tsınırlar (-r, -m veya -l seçenekleri ile kullanıldıysa)\n"
+"  -a, --all                     tüm kullanıcılar için faillog kayıtlarını\n"
+"                                gösterir\n"
+" -h, --help                     bu yardım dosyasını göster ve çık\n"
+"  -l, --lock-time SANİYE(SEC)   hatalı oturum açılımından sonra, hesabı\n"
+"                                SANİYE kadar saniye kilitler\n"
+"  -m, --maximum AZAMİ(MAX)      en fazla hatalı oturum açılış sayacını "
+"AZAMİ\n"
+"                                değerine ayarlar\n"
+"  -r, --reset                   oturum açılış sayacını sıfırlar\n"
+"  -t, --time GÜN_SAYISI(DAYS)   GÜN_SAYISI kadar günden daha güncel olan\n"
+"                                faillog kayıtlarını gösterir\n"
+"  -u, --user KULLANICI(LOGIN)   faillog kaydını gösterir veya hata\n"
+"                                sayacını onarır ve sadece KULLANICI ile\n"
+"                                belirtilen kullanıcıları sınırlar (-r, -m\n"
+"                                veya -l seçenekleri ile kullanıldıysa)\n"
 "\n"
 
 #, c-format
@@ -757,25 +772,26 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "Kullanım: groupadd [seçenekler] GRUP\n"
 "\n"
 "Seçenekler:\n"
-"  -f, --force\t\tbelirtilen grub mevcutsa bile, çıkışta\n"
-"\t\t\t\tbaşarılı kodu verecek şekilde zorla\n"
-"  -g, --gid GID\t\tyeni grub için bu GID yi kullan\n"
-"  -h, --help\t\tbu yardım dosyasını göster ve çık\n"
-"  -K, --key ANAHTAR=DEĞER(KEY=VALUE)\t\t/etc/login.defs dosyasındaki\n"
-"\t\t\t\töntanımlı değerlerin üzerine yazar\n"
-"  -o, --non-unique\t\taynı GID ile grub oluşturulmasına izin ver\n"
+"  -f, --force                   belirtilen grub mevcutsa bile, çıkışta\n"
+"                                başarılı kodu verecek şekilde zorla\n"
+"  -g, --gid GID                 yeni grub için bu GID yi kullan\n"
+"  -h, --help                    bu yardım dosyasını göster ve çık\n"
+"  -K, --key ANAHTAR=DEĞER(KEY=VALUE)\n"
+"                                /etc/login.defs dosyasındaki\n"
+"                                öntanımlı değerlerin üzerine yazar\n"
+"  -o, --non-unique              aynı GID ile grub oluşturulmasına izin ver\n"
 "\n"
 
 #, c-format
@@ -904,19 +920,20 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "Usage: groupmod [seçenekler] GRUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tbu grubu yeni GID ile kullanıma zorla\n"
-"  -h, --help\t\tbu yardım dosyasını göster ve çık\n"
-"  -n, --new-name YENİ_GRUP\tgrubu YENİ_GRUP ismini kullanmaya zorla\n"
-"  -o, --non-unique\t\tgrubun aynı GID yi kullanmasına izin ver\n"
+"  -g, --gid GID                 bu grubu yeni GID ile kullanıma zorla\n"
+"  -h, --help                    bu yardım dosyasını göster ve çık\n"
+"  -n, --new-name YENİ_GRUP      grubu YENİ_GRUP ismini kullanmaya zorla\n"
+"  -o, --non-unique              grubun aynı GID yi kullanmasına izin ver\n"
 "\n"
 
 #, c-format
@@ -1068,22 +1085,23 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "Kullanım: lastlog [seçenekler]\n"
 "\n"
 "Seçenekler:\n"
-"  -b, --before GÜN_SAYISI(DAYS)\tGÜN_SAYISI kadar günden daha eski olan\n"
-"\t\t\tlastlog kayıtlarını gösterir\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -t, --time GÜN_SAYISI(DAYS)\tGÜN_SAYISI kadar günden daha yeni olan\n"
-"\t\t\tlastlog kayıtlarını gösterir\n"
-"  -u, --user KULLANICI\tKULLANICI ile belirtilen kullanıcının lastlog\n"
-"\t\t\tkayıtlarını gösterir\n"
+"  -b, --before GÜN_SAYISI(DAYS) GÜN_SAYISI kadar günden daha eski olan\n"
+"                                lastlog kayıtlarını gösterir\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time GÜN_SAYISI(DAYS)   GÜN_SAYISI kadar günden daha yeni olan\n"
+"                                lastlog kayıtlarını gösterir\n"
+"  -u, --user KULLANICI          KULLANICI ile belirtilen kullanıcının\n"
+"                                kastlog yıtlarını gösterir\n"
 "\n"
 
 #, c-format
@@ -1235,14 +1253,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: /etc/passwd kilitlenemiyor.\n"
@@ -1296,47 +1310,53 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "Kullanım: passwd [seçenekler] [KULLANICI]\n"
 "\n"
 "Seçenekler:\n"
-"  -a, --all\t\t\ttüm hesaplardaki şifre durumunu bildirir\n"
-"  -d, --delete\t\t\tismi belirtilen hesabın şifresini siler\n"
-"  -e, --expire\t\t\tismi belirtilen hesaba ait şifrenin süresini bitirir\n"
-"  -h, --help\t\t\tbu yardım dosyasını göster ve çık\n"
-"  -k, --keep-tokens\t\tsadece süresi dolduğunda şifreleri değiştirir\n"
-"  -i, --inactive INACTIVE\tşifre süresi dolduktan sonra, şifreyi INACTIVE\n"
-"\t\t\t\t olarak ayarlar\n"
-"  -l, --lock\t\t\tismi belirtilen hesabı kilitler\n"
-"  -n, --mindays ASGARİ_GÜN_SAYISI(MIN_DAYS)\tşifre değiştirilmeden önceki\n"
-"\t\t\t\ten az gün sayısını ASGARİ_GÜN_SAYISI olarak ayarlar\n"
-"  -q, --quiet\t\t\tsessiz kip\n"
-"  -r, --repository DEPO(REPOSITORY)\tDEPO deposundaki şifreyi değiştirir\n"
-"  -S, --status\t\t\tismi belirtilen hesaptaki şifre durumunu bildirir\n"
-"  -u, --unlock\t\t\tismi belirtilen hesabın kilidini açar\n"
-"  -w, --warndays UYARI_GÜN_SAYISI(WARN_DAYS)\tşifre dolum uyarı gününü\n"
-"\t\t\t\tUYARI_GÜN_SAYISI\n"
-"\t\t\t\t olarak ayarlar\n"
-"  -x, --maxdays AZAMİ_GÜN_SAYISI(MAX_DAYS)\tşifre değiştirilmeden önceki\n"
-"\t\t\t\ten fazla gün sayısını AZAMİ_GÜN_SAYISI olarak ayarlar\n"
+"  -a, --all                 tüm hesaplardaki şifre durumunu bildirir\n"
+"  -d, --delete              ismi belirtilen hesabın şifresini siler\n"
+"  -e, --expire              ismi belirtilen hesaba ait şifrenin süresini "
+"bitirir\n"
+"  -h, --help                bu yardım dosyasını göster ve çık\n"
+"  -k, --keep-tokens         sadece süresi dolduğunda şifreleri değiştirir\n"
+"  -i, --inactive INACTIVE   şifre süresi dolduktan sonra, şifreyi INACTIVE\n"
+"                            olarak ayarlar\n"
+"  -l, --lock                ismi belirtilen hesabı kilitler\n"
+"  -n, --mindays ASGARİ_GÜN_SAYISI(MIN_DAYS)\n"
+"                            şifre değiştirilmeden önceki en az gün sayısını\n"
+"                            ASGARİ_GÜN_SAYISI olarak ayarlar\n"
+"  -q, --quiet               sessiz kip\n"
+"  -r, --repository DEPO(REPOSITORY)\n"
+"                            DEPO deposundaki şifreyi değiştirir\n"
+"  -S, --status              ismi belirtilen hesaptaki şifre durumunu "
+"bildirir\n"
+"  -u, --unlock              ismi belirtilen hesabın kilidini açar\n"
+"  -w, --warndays UYARI_GÜN_SAYISI(WARN_DAYS)\n"
+"                            şifre dolum uyarı gününü UYARI_GÜN_SAYISI\n"
+"                            olarak ayarlar\n"
+"  -x, --maxdays AZAMİ_GÜN_SAYISI(MAX_DAYS)\n"
+"                            şifre değiştirilmeden önceki en fazla gün\n"
+"                            sayısını AZAMİ_GÜN_SAYISI olarak ayarlar\n"
 "\n"
 
 msgid "Old password: "
@@ -1520,26 +1540,26 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "Kullanım: su [seçenekler] [KULLANICI]\n"
 "\n"
 "Seçenekler:\n"
-"  -c  --command KOMUT\t\tKOMUT u istenen kabuğa geçir\n"
-"  -h, --help\t\t\tbu yardım dosyasını göster ve çık\n"
-"  -, -l, --login\t\tkabuğu oturum açma kabuğu haline getirir\n"
+"  -c  --command KOMUT           KOMUT u istenen kabuğa geçir\n"
+"  -h, --help                    bu yardım dosyasını göster ve çık\n"
+"  -, -l, --login                kabuğu oturum açma kabuğu haline getirir\n"
 "  -m, -p,\n"
-"  --preserve-environment\tçevre değişkenlerini sıfırlama ve \n"
-"\t\t\t\taynı kabuğu sakla\n"
-"  -s, --shell KABUK(SHELL)\t\tpasswd dosyasındaki öntanımlı kabuk yerine\n"
-"\t\t\tKABUK kabuğunu kullan\n"
+"  --preserve-environment        çevre değişkenlerini sıfırlama ve \n"
+"                                aynı kabuğu sakla\n"
+"  -s, --shell KABUK(SHELL)      passwd dosyasındaki öntanımlı kabuk yerine\n"
+"                                KABUK kabuğunu kullan\n"
 "\n"
 
 #, c-format
@@ -1626,58 +1646,68 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "Kullanım: useradd [seçenekler] KULLANICI\n"
 "\n"
 "Seçenekler:\n"
-"  -b, --base-dir EV_DİZİNİ(BASE_DIR)\tyeni kullanıcı hesabının ev dizini "
-"için\n"
-"\t\t\t\tana dizin\n"
-"  -c, --comment YORUM(COMMENT)\t\tyeni kullanıcı için GECOS alanını ayarlar\n"
-"  -d, --home-dir EV_DİZİNİ(HOME_DIR)\tyeni kullanıcı hesabı için ev dizini\n"
-"  -D, --defaults\t\tön tanımlı kullanıcı ekleme yapılandırmasını\n"
-"\t\t\t\tgörüntüler ve ya kaydeder\n"
-"  -e, --expiredate EXPIRE_DATE\thesap süresi dolumunu EXPIRE_DATE olarak\n"
-"\t\t\t\tayarlar\n"
-"  -f, --inactive INACTIVE\tşifre süresi dolduktan sonra şifreyi\n"
-"\t\t\t\tINACTIVE olarak ayarlar\n"
-"  -g, --gid GRUP\t\tyeni kullanıcı hesabı için GRUP kullanımını zorlar\n"
-"  -G, --groups GRUPLAR\t\tyeni kullanıcı hesabı için\n"
-"\t\t\t\tilave grubları listeler\n"
-"  -h, --help\t\t\tbu yardım dosyasını göster ve çık\n"
-"  -k, --skel TEMEL_DİZİN(SKEL_DIR)\t\tfarklı bir temel dizin belirtir\n"
-"  -K, --key KEY=VALUE\t\t/etc/login.defs dosyasındaki öntanımlı değerlerin\n"
-"\t\t\t\t üzerine yazar\n"
-"  -m, --create-home\t\tyeni kullanıcı hesabı için ev dizini yaratır\n"
-"  -o, --non-unique\t\taynı UID ile kullanıcı yaratılmasına izin verir\n"
-"  -p, --password PAROLA\tyeni kullanıcı hesabı için şifrelenmiş\n"
-"\t\t\t\tparola kullanır\n"
-"  -s, --shell KABUK(SHELL)\t\tyeni kullanıcı hesabı için oturum açma kabuğu\n"
-"  -u, --uid UID\t\t\tyeni kullanıcı hesabı için UID kullanıını zorla\n"
+"  -b, --base-dir EV_DİZİNİ(BASE_DIR)\n"
+"                                yeni kullanıcı hesabının ev dizini için\n"
+"                                ana dizin\n"
+"  -c, --comment YORUM(COMMENT)\n"
+"                                yeni kullanıcı için GECOS alanını ayarlar\n"
+"  -d, --home-dir EV_DİZİNİ(HOME_DIR)\n"
+"                                yeni kullanıcı hesabı için ev dizini\n"
+"  -D, --defaults                ön tanımlı kullanıcı ekleme "
+"yapılandırmasını\n"
+"                                görüntüler ve ya kaydeder\n"
+"  -e, --expiredate EXPIRE_DATE  hesap süresi dolumunu EXPIRE_DATE olarak\n"
+"                                ayarlar\n"
+"  -f, --inactive INACTIVE       şifre süresi dolduktan sonra şifreyi\n"
+"                                INACTIVE olarak ayarlar\n"
+"  -g, --gid GRUP                yeni kullanıcı hesabı için GRUP kullanımını\n"
+"                                zorlar\n"
+"  -G, --groups GRUPLAR          yeni kullanıcı hesabı için\n"
+"                                ilave grubları listeler\n"
+"  -h, --help                    bu yardım dosyasını göster ve çık\n"
+"  -k, --skel TEMEL_DİZİN(SKEL_DIR)\n"
+"                                farklı bir temel dizin belirtir\n"
+"  -K, --key KEY=VALUE           /etc/login.defs dosyasındaki öntanımlı\n"
+"                                değerlerin üzerine yazar\n"
+"  -m, --create-home             yeni kullanıcı hesabı için ev dizini "
+"yaratır\n"
+"  -o, --non-unique              aynı UID ile kullanıcı yaratılmasına izin\n"
+"                                verir\n"
+"  -p, --password PAROLA         yeni kullanıcı hesabı için şifrelenmiş\n"
+"                                parola kullanır\n"
+"  -s, --shell KABUK(SHELL)      yeni kullanıcı hesabı için oturum açma "
+"kabuğu\n"
+"  -u, --uid UID                 yeni kullanıcı hesabı için UID kullanıını\n"
+"                                zorla\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1826,17 +1856,18 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 "Kullanım: userdel [seçenekler] KULLANICI\n"
 "\n"
 "Seçenekler:\n"
-"  -f, --force\t\t\tdosyalar kullanıcıya ait değilse bile sil\n"
-"  -h, --help\t\t\tbu yardım mesajını göster ve çık\n"
-"  -r, --remove\t\t\tev dizinini ve mesaj arşivini sil\n"
+"  -f, --force                   dosyalar kullanıcıya ait değilse bile sil\n"
+"  -h, --help                    bu yardım mesajını göster ve çık\n"
+"  -r, --remove                  ev dizinini ve mesaj arşivini sil\n"
 "\n"
 
 #, c-format
@@ -1901,53 +1932,55 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "Kullanım: usermod [seçenekler] LOGIN\n"
 "\n"
 "Seçenekler:\n"
-"  -a, --append GROUP\t\tkullanıcıyı ilave grupların sonuna ekle\n"
-"\t\t\t\t(sadece -G ile kullanılır)\n"
-"  -c, --comment YORUM (COMMENT)\t\tGECOS alanının yeni değeri\n"
-"  -d, --home EV_DIZINI(HOME_DIR)\t\tyeni kullanıcı için yeni oturum açma\n"
-"\t\t\t\tdizini\n"
-"  -e, --expiredate GEÇERLİLİK_TARİHİ(EXPIRE_DATE)\thesap dolum süresini\n"
-"\t\t\t\tGEÇERLİLİK_TARİHİ(EXPIRE_DATE) olarak ayarlar\n"
-"  -f, --inactive INACTIVE\tşifre süresi dolduktan sonra şifreyi\n"
-"\t\t\t\tINACTIVE olarak ayarlar\n"
-"  -g, --gid GROUP\t\tbaşlangıç oturum açılış grubu olarak GROUP kullanımını\n"
-"\t\t\t\tzorla\n"
-"  -G, --groups GROUPS\t\tilave grupları listeler\n"
-"  -h, --help\t\t\tbu yardım dosyasını gösterir ve çıkar\n"
-"  -l, --login LOGIN\t\toturum açma ismi için yeni değer\n"
-"  -L, --lock\t\t\tkullanıcı hesabını kilitler\n"
-"  -m, --move-home\t\tEv dizininin içeriğini başka bir\n"
-"\t\t\t\tdizine kopyalar(sadece -d ile kullanılır)\n"
-"  -o, --non-unique\t\taynı UID kullanımına izin verir\n"
-"  -p, --password PASSWORD\tyeni şifreler için şifrelenmiş şifre kullanır\n"
-"  -s, --shell SHELL\t\tkullanıcı hesabı için oturum açma kabuğu\n"
-"  -u, --uid UID\t\t\tkullanıcı hesabı için yeni UID\n"
-"  -U, --unlock\t\t\tkullanıcı hesabı kilidini aç\n"
+"  -a, --append GROUP            kullanıcıyı ilave grupların sonuna ekle\n"
+"                                (sadece -G ile kullanılır)\n"
+"  -c, --comment YORUM (COMMENT) GECOS alanının yeni değeri\n"
+"  -d, --home EV_DIZINI(HOME_DIR)\n"
+"                                yeni kullanıcı için yeni oturum açma dizini\n"
+"  -e, --expiredate GEÇERLİLİK_TARİHİ(EXPIRE_DATE)\n"
+"                                hesap dolum süresini GEÇERLİLİK_TARİHİ\n"
+"                                (EXPIRE_DATE) olarak ayarlar\n"
+"  -f, --inactive INACTIVE       şifre süresi dolduktan sonra şifreyi\n"
+"                                INACTIVE olarak ayarlar\n"
+"  -g, --gid GROUP               başlangıç oturum açılış grubu olarak\n"
+"                                GROUP kullanımını zorla\n"
+"  -G, --groups GROUPS           ilave grupları listeler\n"
+"  -h, --help                    bu yardım dosyasını gösterir ve çıkar\n"
+"  -l, --login LOGIN             oturum açma ismi için yeni değer\n"
+"  -L, --lock                    kullanıcı hesabını kilitler\n"
+"  -m, --move-home               Ev dizininin içeriğini başka bir\n"
+"                                dizine kopyalar(sadece -d ile kullanılır)\n"
+"  -o, --non-unique              aynı UID kullanımına izin verir\n"
+"  -p, --password PASSWORD       yeni şifreler için şifrelenmiş şifre "
+"kullanır\n"
+"  -s, --shell SHELL             kullanıcı hesabı için oturum açma kabuğu\n"
+"  -u, --uid UID                 kullanıcı hesabı için yeni UID\n"
+"  -U, --unlock                  kullanıcı hesabı kilidini aç\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2017,21 +2050,21 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "Kullanım: vipw [seçenekler]\n"
 "\n"
 "Seçenekler:\n"
-"  -g, --group\t\t\tgrub veri tabanını düzenler\n"
-"  -h, --help\t\t\tbu yardım dosyasını gösterir ve çıkar\n"
-"  -p, --passwd\t\t\tşifre veri tabanını düzenler\n"
-"  -q, --quiet\t\t\tsessiz kip\n"
-"  -s, --shadow\t\t\tshadow veya gshadow veri tabanını düzenler\n"
+"  -g, --group                   grub veri tabanını düzenler\n"
+"  -h, --help                    bu yardım dosyasını gösterir ve çıkar\n"
+"  -p, --passwd                  şifre veri tabanını düzenler\n"
+"  -q, --quiet                   sessiz kip\n"
+"  -s, --shadow                  shadow veya gshadow veri tabanını düzenler\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/uk.po
===================================================================
--- upstream/trunk/po/uk.po	2007-11-25 22:05:08 UTC (rev 1466)
+++ upstream/trunk/po/uk.po	2007-11-26 22:00:57 UTC (rev 1467)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
-"PO-Revision-Date: 2006-07-24 10:42+0200\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-26 22:52+0100\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen at univ.kiev.ua>\n"
 "Language-Team: Ukrainian\n"
 "MIME-Version: 1.0\n"
@@ -201,35 +201,39 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "Використання: chage [параметри] [LOGIN]\n"
 "\n"
 "Параметри:\n"
-"  -d, --lastday ОСТАННІЙ_ДЕНЬ\tвстановити дату останньої зміни пароля в\n"
-"\t\t\t\tОСТАННІЙ_ДЕНЬ\n"
-"  -E, --expiredate ДАТА_ПРОСТР\tвстановити дату прострочення облікового\n"
-"\t\t\t\tзапису у ДАТА_ПРОСТР\n"
-"  -h, --help\t\t\tвивести це довідкове повідомлення та вийти\n"
-"  -I, --inactive НЕАКТИВНИЙ\tзробити пароль неактивним після прострочення\n"
-"  -l, --list\t\t\tпоказати інформацію про вік облікового запису\n"
-"  -m, --mindays МІН_ДНІВ\tвстановити найменшу кількість днів перед зміною\n"
-"\t\t\t\tпароля у МІН_ДНІВ\n"
-"  -M, --maxdays МАКС_ДНІВ\tвстановити максимальну кількість днів перед\n"
-"\t\t\t\tзміною пароля у МАКС_ДНІВ\n"
-"  -W, --warndays ПОПЕРЕДЖЕНЯЯ\tвстоновити кількість днів перед\n"
-"\t\t\t\tпопередженням про прострочення у ПОПЕРЕДЖЕННЯ\n"
+"  -d, --lastday ОСТАННІЙ_ДЕНЬ   встановити дату останньої зміни пароля в\n"
+"                                ОСТАННІЙ_ДЕНЬ\n"
+"  -E, --expiredate ДАТА_ПРОСТР  встановити дату прострочення облікового\n"
+"                                запису у ДАТА_ПРОСТР\n"
+"  -h, --help                    вивести це довідкове повідомлення та вийти\n"
+"  -I, --inactive НЕАКТИВНИЙ     зробити пароль неактивним після "
+"прострочення\n"
+"  -l, --list                    показати інформацію про вік облікового "
+"запису\n"
+"  -m, --mindays МІН_ДНІВ        встановити найменшу кількість днів перед "
+"зміною\n"
+"                                пароля у МІН_ДНІВ\n"
+"  -M, --maxdays МАКС_ДНІВ       встановити максимальну кількість днів перед\n"
+"                                зміною пароля у МАКС_ДНІВ\n"
+"  -W, --warndays ПОПЕРЕДЖЕНЯЯ   встоновити кількість днів перед\n"
+"                                попередженням про прострочення у "
+"ПОПЕРЕДЖЕННЯ\n"
 "\n"
 
 #, c-format
@@ -469,23 +473,25 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "Використання: chpasswd [опції]\n"
 "\n"
 "Опції:\n"
-"  -e, --encrypted\tвказаний пароль зашифровано\n"
-"  -h, --help\t\tпоказати цю допомогу та вийти\n"
-"  -m, --md5\t\tвикористовувати MD5 шифрування замість DES, якщо вказані\n"
-"\t\t\tпаролі не зашифровано\n"
+"  -e, --encrypted               вказаний пароль зашифровано\n"
+"  -h, --help                    показати цю допомогу та вийти\n"
+"  -m, --md5                     використовувати MD5 шифрування замість DES,\n"
+"                                якщо вказані паролі не зашифровано\n"
 "\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -565,15 +571,15 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "Використання: chsh [параметри] [LOGIN]\n"
 "\n"
 "Параметри:\n"
-"  -h, --help\t\t\t\tвивести це довідкове повідомлення та вийти\n"
-"  -s, --shell ОБОЛОНКА\t\t\tнова вхідна оболонка для облікового запису\n"
+"  -h, --help                    вивести це довідкове повідомлення та вийти\n"
+"  -s, --shell ОБОЛОНКА          нова вхідна оболонка для облікового запису\n"
 "\n"
 
 msgid "Login Shell"
@@ -608,31 +614,34 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "Використання: faillog [опції]\n"
 "\n"
 "Опції:\n"
-"  -a, --all\t\t\tпоказати помилки входу для всіх користувачів\n"
-"  -h, --help\t\t\tпоказати цю допомогу та вийти\n"
-"  -l, --lock-time СЕК\t\tпісля помилки входу блокувати рахунок на СЕК\n"
-"\t\t\t\tсекунд\n"
-" -m, --maximum МАКС\t\tвстановити максимальну кількість помилок входу до\n"
-"\t\t\t\tМАКС\n"
-"  -r, --reset\t\t\tперезавантажити лічільник помилок входу\n"
-"  -t, --time ДНІВ\t\tпоказати помилки входу новіші за ДНІВ\n"
-"  -u, --user ЛОГІН\t\tпоказати помилки входу або вести лічільники помилок\n"
-"\t\t\t\tта ліміти (якщо використовується з -r, -m або -l опціями) лише для\n"
-"\t\t\t\tкористувача з логіном ЛОГІН\n"
+"  -a, --all             показати помилки входу для всіх користувачів\n"
+"  -h, --help            показати цю допомогу та вийти\n"
+"  -l, --lock-time СЕК   після помилки входу блокувати рахунок на СЕК\n"
+"                        секунд\n"
+" -m, --maximum МАКС     встановити максимальну кількість помилок входу до\n"
+"                        МАКС\n"
+"  -r, --reset           перезавантажити лічільник помилок входу\n"
+"  -t, --time ДНІВ       показати помилки входу новіші за ДНІВ\n"
+"  -u, --user ЛОГІН      показати помилки входу або вести лічільники помилок\n"
+"                        та ліміти (якщо використовується з -r, -m або -l\n"
+"                        опціями) лише для користувача з логіном ЛОГІН\n"
 "\n"
 
 #, c-format
@@ -761,25 +770,26 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "Використання: groupadd [параметри] ГРУПА\n"
 "\n"
 "Параметри:\n"
-"  -f, --force\t\tпримусити не повертати помилку якщо вказана група\n"
-"\t\t\t\tвже існує\n"
-"  -g, --gid GID\t\tвикористати GID для нової групи\n"
-"  -h, --help\t\t\tпоказати це довідкове повідомлення та вийти\n"
-"  -K, --key КЛЮЧ=ЗНАЧЕННЯ\t\tзмінити значення за замовченням\n"
-"\t\t\t\t\tз /etc/login.defs\n"
-"  -o, --non-unique\t\tдозволити створювати групи з GID що повторюються\n"
+"  -f, --force               примусити не повертати помилку якщо вказана\n"
+"                            група вже існує\n"
+"  -g, --gid GID             використати GID для нової групи\n"
+"  -h, --help                показати це довідкове повідомлення та вийти\n"
+"  -K, --key КЛЮЧ=ЗНАЧЕННЯ   змінити значення за замовченням\n"
+"                            з /etc/login.defs\n"
+"  -o, --non-unique          дозволити створювати групи з GID що "
+"повторюються\n"
 "\n"
 
 #, c-format
@@ -908,19 +918,21 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "Використання: groupmod [параметри] ГРУПА\n"
 "\n"
 "Параметри:\n"
-"  -g, --gid GID\t\tвстановити GID для групи\n"
-"  -h, --help\t\t\tпоказати це довідкове повідомлення та вийти\n"
-"  -n, --new-name НОВА_ГРУПА\tвикористовувати назву НОВА_ГРУПА для ГРУПИ\n"
-"  -o, --non-unique\t\tдозволити створювати групи з GID що повторюються\n"
+"  -g, --gid GID                 встановити GID для групи\n"
+"  -h, --help                    показати це довідкове повідомлення та вийти\n"
+"  -n, --new-name НОВА_ГРУПА     використовувати назву НОВА_ГРУПА для ГРУПИ\n"
+"  -o, --non-unique              дозволити створювати групи з GID що "
+"повторюються\n"
 "\n"
 
 #, c-format
@@ -1072,20 +1084,21 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "Використання: lastlog [параметри]\n"
 "\n"
 "Параметри:\n"
-"  -b, --before ДНІ\tдрукувати лише записи старіші за ДНІ\n"
-"  -h, --help\t\tвивести допомогу та вийти\n"
-"  -t, --time ДНІВ\tвивести лише записи свіжіші за ДНІВ\n"
-"  -u, --user ЛОГІН\tвивести записи останніх входів для користувача з\n"
-"\t\t\tЛОГІНом\n"
+"  -b, --before ДНІ              друкувати лише записи старіші за ДНІ\n"
+"  -h, --help                    вивести допомогу та вийти\n"
+"  -t, --time ДНІВ               вивести лише записи свіжіші за ДНІВ\n"
+"  -u, --user ЛОГІН              вивести записи останніх входів для\n"
+"                                користувача з ЛОГІНом\n"
 "\n"
 
 #, c-format
@@ -1236,14 +1249,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: не можу блокувати /etc/passwd.\n"
@@ -1297,45 +1306,47 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "Використання: 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зробити пароль неактивним після прострочення\n"
-"  -l, --lock\t\t\tзаблокувати вказаний запис\n"
-"  -n, --mindays МІН_ДНІВ\tвстановити найменшу кількість днів перед зміною\n"
-"\t\t\t\tпароля у МІН_ДНІВ\n"
-"  -q, --quiet\t\t\tтихий режим\n"
-"  -r, --repository СХОВИЩЕ\tзмінити пароль у вказаному СХОВИЩІ\n"
-"  -S, --status\t\t\tзвітувати про стан пароля вказаного запису\n"
-"  -u, --unlock\t\t\tрозблокувати вказаний запис\n"
-"  -w, --warndays ПОП_ДНІВ\tвстановити кількість днів перед повідомленням\n"
-"\t\t\t\tпро прострочення у ПОП_ДНІВ\n"
-"  -x, --maxdays МАКС_ДНІВ\tвстановити максимальну кількість днів перед\n"
-"\t\t\t\tзміною пароля у МАКС_ДНІВ\n"
+"  -a, --all                     звітувати про стан паролів усіх записів\n"
+"  -d, --delete                  видалити пароль для вказаного запису\n"
+"  -e, --expire                  прострочити пароль для вказаного запису\n"
+"  -h, --help                    вивести це довідкове повідомлення та вийти\n"
+"  -k, --keep-tokens             змінити пароль лише якщо його прострочено\n"
+"  -i, --inactive INACTIVE       зробити пароль неактивним після "
+"прострочення\n"
+"  -l, --lock                    заблокувати вказаний запис\n"
+"  -n, --mindays МІН_ДНІВ        встановити найменшу кількість днів перед\n"
+"                                зміною пароля у МІН_ДНІВ\n"
+"  -q, --quiet                   тихий режим\n"
+"  -r, --repository СХОВИЩЕ      змінити пароль у вказаному СХОВИЩІ\n"
+"  -S, --status                  звітувати про стан пароля вказаного запису\n"
+"  -u, --unlock                  розблокувати вказаний запис\n"
+"  -w, --warndays ПОП_ДНІВ       встановити кількість днів перед\n"
+"                                повідомленням про прострочення у ПОП_ДНІВ\n"
+"  -x, --maxdays МАКС_ДНІВ       встановити максимальну кількість днів перед\n"
+"                                зміною пароля у МАКС_ДНІВ\n"
 "\n"
 
 msgid "Old password: "
@@ -1520,25 +1531,25 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "Використання: su [параметри] [ЛОГІН]\n"
 "\n"
 "Параметри:\n"
-"  -c, --command КОМАНДА\t\tпередати КОМАНДУ запущеній оболонці\n"
-"  -h, --help\t\t\tвивести це довідкове повідомлення та вийти\n"
-"  -, -l, --login\t\tзробити оболонку вхідною\n"
+"  -c, --command КОМАНДА     передати КОМАНДУ запущеній оболонці\n"
+"  -h, --help                вивести це довідкове повідомлення та вийти\n"
+"  -, -l, --login            зробити оболонку вхідною\n"
 "  -m, -p,\n"
-"  --preserve-environment\tне скидувати змінні оточення і залишити\n"
-"\t\t\t\tтаку саму оболонку\n"
-"  -s, --shell ОБОЛОНКА\t\tвикористати ОБОЛОНКУ замість вказаної в passwd\n"
+"  --preserve-environment    не скидувати змінні оточення і залишити\n"
+"                            таку саму оболонку\n"
+"  -s, --shell ОБОЛОНКА      використати ОБОЛОНКУ замість вказаної в passwd\n"
 "\n"
 
 #, c-format
@@ -1625,55 +1636,63 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "Використання: useradd [параметри] ЛОГІН\n"
 "\n"
 "Параметри:\n"
-"  -b, --base-dir БАЗОВА_ТЕКА\tбазова тека для домашніх тек нових\n"
-"\t\t\t\tкористувацьких облікових записів\n"
-"  -c, --comment КОМЕНТАР\t\tвстановити поле GECOS для нового запису\n"
-"\t\t\t\tкористувача\n"
-"  -d, --home-dir ДОМ_ТЕКА\tдомашня тека для нового запису користувача\n"
-"  -D, --defaults\t\tдрукувати або зберегти змінені налаштування useradd\n"
-"  -e, --expiredate ДАТА_ПРОСТР\tвстановити дату прострочення запису\n"
-"  -f, --inactive НЕАКТИВНИЙ\tзробити пароль неактивним після прострочення\n"
-"  -g, --gid ГРУПА\t\tвикористовувати ГРУПУ для нового запису користувача\n"
-"  -G, --groups ГРУПИ\t\tсписок додаткових груп для нового запису\n"
-"\t\t\t\tкористувача\n"
-"  -h, --help\t\t\tпоказати це довідкове повідомлення і вийти\n"
-"  -k, --skel ТЕКА_КІСТЯКА\t\tвказати альтернативну теку для кістяка\n"
-"  -K, --key КЛЮЧ=ЗНАЧЕННЯ\t\tпереписати значення з /etc/login.defs\n"
-"  -m, --create-home\t\tстворити домашню теку для запису нового користувача\n"
-"  -o, --non-unique\t\tдозволювати створювати користувачів з UID що\n"
-"\t\t\t\tповторюються\n"
-"  -p, --password ПАРОЛЬ\tвикористовувати зашифрований пароль для нового\n"
-"\t\t\t\tзапису користувача\n"
-"  -s, --shell ОБОЛОНКА\t\tвхідна оболонка для нового запису користувача\n"
-"  -u, --uid UID\t\t\tвикористовувати UID для нового запису користувача\n"
+"  -b, --base-dir БАЗОВА_ТЕКА    базова тека для домашніх тек нових\n"
+"                                користувацьких облікових записів\n"
+"  -c, --comment КОМЕНТАР        встановити поле GECOS для нового запису\n"
+"                                користувача\n"
+"  -d, --home-dir ДОМ_ТЕКА       домашня тека для нового запису користувача\n"
+"  -D, --defaults                друкувати або зберегти змінені налаштування\n"
+"                                useradd\n"
+"  -e, --expiredate ДАТА_ПРОСТР  встановити дату прострочення запису\n"
+"  -f, --inactive НЕАКТИВНИЙ     зробити пароль неактивним після "
+"прострочення\n"
+"  -g, --gid ГРУПА               використовувати ГРУПУ для нового запису\n"
+"                                користувача\n"
+"  -G, --groups ГРУПИ            список додаткових груп для нового запису\n"
+"                                користувача\n"
+"  -h, --help                    показати це довідкове повідомлення і вийти\n"
+"  -k, --skel ТЕКА_КІСТЯКА       вказати альтернативну теку для кістяка\n"
+"  -K, --key КЛЮЧ=ЗНАЧЕННЯ       переписати значення з /etc/login.defs\n"
+"  -m, --create-home             створити домашню теку для запису нового\n"
+"                                користувача\n"
+"  -o, --non-unique              дозволювати створювати користувачів з UID "
+"що\n"
+"                                повторюються\n"
+"  -p, --password ПАРОЛЬ         використовувати зашифрований пароль для\n"
+"                                нового запису користувача\n"
+"  -s, --shell ОБОЛОНКА          вхідна оболонка для нового запису\n"
+"                                користувача\n"
+"  -u, --uid UID                 використовувати UID для нового запису\n"
+"                                користувача\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1821,18 +1840,19 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 "Використання: userdel [параметри] ЛОГІН\n"
 "\n"
 "Параметри:\n"
-"  -f, --force\t\t\tвидаляти файли навіть якщо вказаний користувач не є їх\n"
-"\t\t\t\tволодарем\n"
-"  -h, --help\t\t\tвивести це довідкове повідомлення та вийти\n"
-"  -r, --remove\t\t\tвидалити домашню теку і поштову скриньку\n"
+"  -f, --force                   видаляти файли навіть якщо вказаний\n"
+"                                користувач не є їх володарем\n"
+"  -h, --help                    вивести це довідкове повідомлення та вийти\n"
+"  -r, --remove                  видалити домашню теку і поштову скриньку\n"
 "\n"
 
 #, c-format
@@ -1897,53 +1917,58 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "Використання: useradd [параметри] ЛОГІН\n"
 "\n"
 "Параметри:\n"
-"  -a, --append\t\t\tдодати користувача до додаткових ГРУП\n"
-"\t\t\t\t(використовувати тільки з -G)\n"
-"  -c, --comment КОМЕНТАР\t\tвстановити поле GECOS для нового запису\n"
-"\t\t\t\tкористувача\n"
-"  -d, --home ДОМ_ТЕКА\t\tдомашня тека для нового запису користувача\n"
-"  -e, --expiredate ДАТА_ПРОСТР\tвстановити дату прострочення запису\n"
-"  -f, --inactive НЕАКТИВНИЙ\tзробити пароль неактивним після прострочення\n"
-"  -g, --gid ГРУПА\t\tвикористовувати ГРУПУ для нового запису користувача\n"
-"  -G, --groups ГРУПИ\t\tсписок додаткових груп для нового запису\n"
-"\t\t\t\tкористувача\n"
-"  -h, --help\t\t\tпоказати це довідкове повідомлення і вийти\n"
-"  -l, --login НОВИЙ_ЛОГІН\tнове значення реєстраційного імені\n"
-"  -L, --lock\t\t\tзаблокувати обліковий запис користувача\n"
-"  -m, --move-home\t\tперенести вміст домашньої теки в нове місце\n"
-"\t\t\t\t(використовувати тільки з -d)\n"
-"  -o, --non-unique\t\tдозволювати створювати користувачів з UID що\n"
-"\t\t\t\tповторюються\n"
-"  -p, --password ПАРОЛЬ\tвикористовувати зашифрований пароль для нового\n"
-"\t\t\t\tзапису користувача\n"
-"  -s, --shell ОБОЛОНКА\t\tвхідна оболонка для нового запису користувача\n"
-"  -u, --uid UID\t\t\tвикористовувати UID для нового запису користувача\n"
-"  -U, --unlock\t\t\tрозблокувати обліковий запис користувача\n"
+"  -a, --append                  додати користувача до додаткових ГРУП\n"
+"                                (використовувати тільки з -G)\n"
+"  -c, --comment КОМЕНТАР        встановити поле GECOS для нового запису\n"
+"                                користувача\n"
+"  -d, --home ДОМ_ТЕКА           домашня тека для нового запису користувача\n"
+"  -e, --expiredate ДАТА_ПРОСТР  встановити дату прострочення запису\n"
+"  -f, --inactive НЕАКТИВНИЙ     зробити пароль неактивним після "
+"прострочення\n"
+"  -g, --gid ГРУПА               використовувати ГРУПУ для нового запису\n"
+"                                користувача\n"
+"  -G, --groups ГРУПИ            список додаткових груп для нового запису\n"
+"                                користувача\n"
+"  -h, --help                    показати це довідкове повідомлення і вийти\n"
+"  -l, --login НОВИЙ_ЛОГІН       нове значення реєстраційного імені\n"
+"  -L, --lock                    заблокувати обліковий запис користувача\n"
+"  -m, --move-home               перенести вміст домашньої теки в нове місце\n"
+"                                (використовувати тільки з -d)\n"
+"  -o, --non-unique              дозволювати створювати користувачів з UID "
+"що\n"
+"                                повторюються\n"
+"  -p, --password ПАРОЛЬ         використовувати зашифрований пароль для\n"
+"                                нового запису користувача\n"
+"  -s, --shell ОБОЛОНКА          вхідна оболонка для нового запису "
+"користувача\n"
+"  -u, --uid UID                 використовувати UID для нового запису\n"
+"                                користувача\n"
+"  -U, --unlock                  розблокувати обліковий запис користувача\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2013,21 +2038,21 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "Використання: vipw [параметри]\n"
 "\n"
 "Параметри:\n"
-"  -g, --group\t\t\tредагувати базу даних груп\n"
-"  -h, --help\t\t\tвивести це довідкове повідомлення та вийти\n"
-"  -p, --passwd\t\t\tредагувати базу даних паролів\n"
-"  -q, --quiet\t\t\tтихий режим\n"
-"  -s, --shadow\t\t\tредагувати базу даних shadow або gshadow\n"
+"  -g, --group                   редагувати базу даних груп\n"
+"  -h, --help                    вивести це довідкове повідомлення та вийти\n"
+"  -p, --passwd                  редагувати базу даних паролів\n"
+"  -q, --quiet                   тихий режим\n"
+"  -s, --shadow                  редагувати базу даних shadow або gshadow\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/vi.po
===================================================================
--- upstream/trunk/po/vi.po	2007-11-25 22:05:08 UTC (rev 1466)
+++ upstream/trunk/po/vi.po	2007-11-26 22:00:57 UTC (rev 1467)
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
-"PO-Revision-Date: 2006-07-19 22:14+0930\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-26 22:32+0100\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -196,34 +196,35 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "Cách sử dụng: chage [tùy_chọn...] người_dùng\n"
 "\n"
 "Tùy chọn:\n"
-"  -d, --lastday NGÀY\tlập lần thay đổi mật khẩu cuối cùng thành ngày này\n"
-"\t\t\t\t(_ngày cuối cùng_)\n"
-"  -E, --expiredate NGÀY\tlập ngày hết hạn dùng tài khoản thành ngày này\n"
-"\t\t\t\t(_ngày hết hạn_)\n"
-"  -h, --help\t\t\thiển thị _trợ giúp_ này rồi thoát\n"
-"  -I, --inactive CHUỖI\t\tSau khi hết hạn dùng, lập mật khẩu thành chuỗi "
-"này\n"
-"\t\t\t\tvà trạng thái _không hoạt động_\n"
-"  -l, --list\t\t\thiển thị thông tin về tài khoản cũ nào (_danh sách_)\n"
-"  -m, --mindays SỐ\tLập số _ngày tối thiểu_ trước khi mật khẩu thay đổi\n"
-"  -M, --maxdays SỐ\tLập số _ngày tối đa_ trước khi mật khẩu thay đổi\n"
-"  -W, --warndays SỐ\tLập số _ngày_ trước khi _cảnh báo_ bạn về sự mãn hạn\n"
+"  -d, --lastday NGÀY    lập lần thay đổi mật khẩu cuối cùng thành ngày này\n"
+"                        (_ngày cuối cùng_)\n"
+"  -E, --expiredate NGÀY lập ngày hết hạn dùng tài khoản thành ngày này\n"
+"                        (_ngày hết hạn_)\n"
+"  -h, --help            hiển thị _trợ giúp_ này rồi thoát\n"
+"  -I, --inactive CHUỖI  Sau khi hết hạn dùng, lập mật khẩu thành chuỗi này\n"
+"                        và trạng thái _không hoạt động_\n"
+"  -l, --list            hiển thị thông tin về tài khoản cũ nào (_danh "
+"sách_)\n"
+"  -m, --mindays SỐ      Lập số _ngày tối thiểu_ trước khi mật khẩu thay đổi\n"
+"  -M, --maxdays SỐ      Lập số _ngày tối đa_ trước khi mật khẩu thay đổi\n"
+"  -W, --warndays SỐ     Lập số _ngày_ trước khi _cảnh báo_ bạn về sự mãn "
+"hạn\n"
 "\n"
 
 #, c-format
@@ -463,10 +464,11 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "Cách sử dụng: chpasswd [tùy_chọn...]\n"
@@ -474,14 +476,16 @@
 "[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"
+"  -e, --encrypted               mọi mật khẩu đã cung cấp cũng đã _được mật "
+"mã_\n"
+"  -h, --help                    hiển thị _trợ giúp_ này rồi thoát\n"
+"  -m, --md5                     sử dụng mật mã MD5 thay vào DES khi các\n"
+"                                mật khẩu đã cung cấp chưa được mật mã\n"
 "\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -561,16 +565,16 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "Cách sử dụng: chsh [tùy_chọn...] [tên_người_dùng]\n"
 "\n"
 "Tùy chọn:\n"
-"  -h, --help\t\t\t\thiện _trợ giúp_ này rồi thoát\n"
-"  -s, --shell TRÌNH_BAO\t\t\trình bao đăng nhập mới cho tài khoản người\n"
-"\t\t\t\tdùng\n"
+"  -h, --help                    hiện _trợ giúp_ này rồi thoát\n"
+"  -s, --shell TRÌNH_BAO         rình bao đăng nhập mới cho tài khoản người\n"
+"                                dùng\n"
 "\n"
 
 msgid "Login Shell"
@@ -607,15 +611,18 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "Cách sử dụng: faillog [tùy_chọn...]\n"
@@ -623,17 +630,19 @@
 "[faillog: bản ghi việc bị lỗi]\n"
 "\n"
 "Tùy chọn:\n"
-"  -a, --all\t\t\thiển thị các mục ghi faillog cho _mọi_ người dùng\n"
-"  -h, --help\t\t\thiển thị _trợ giúp_ này rồi thoát\n"
-"  -l, --lock-time SỐ\t\tsau việc đăng nhập bị lỗi\n"
-" \t\t\t\tthì khóa tài khoản tại số giây này (_thời gian khóa_)\n"
-"  -m, --maximum SỐ\t\tlập số việc đăng nhập bị lỗi _tối đa_ thành số này\n"
-"  -r, --reset\t\t\t_lập lại_ số việc đăng nhập bị lỗi\n"
-"  -t, --time SỐ\t\thiển thị các mục ghi faillog mới hơn số ngày này\n"
-"\t\t\t\t(_thời gian_)\n"
-"  -u, --user TÊN_DÙNG\t\thiển thị mục ghi faillog\n"
-"\t\t\t\thoặc bảo quản số đếm việc bị lỗi và sự hạn chế\n"
-"\t\t\t\t(nếu dùng với tùy chọn -r, -m hay -l) chỉ cho người dùng này\n"
+"  -a, --all             hiển thị các mục ghi faillog cho _mọi_ người dùng\n"
+"  -h, --help            hiển thị _trợ giúp_ này rồi thoát\n"
+"  -l, --lock-time SỐ    sau việc đăng nhập bị lỗi\n"
+"                        hì khóa tài khoản tại số giây này (_thời gian "
+"khóa_)\n"
+"  -m, --maximum SỐ      lập số việc đăng nhập bị lỗi _tối đa_ thành số này\n"
+"  -r, --reset           _lập lại_ số việc đăng nhập bị lỗi\n"
+"  -t, --time SỐ         hiển thị các mục ghi faillog mới hơn số ngày này\n"
+"                        (_thời gian_)\n"
+"  -u, --user TÊN_DÙNG   hiển thị mục ghi faillog\n"
+"                        hoặc bảo quản số đếm việc bị lỗi và sự hạn chế\n"
+"                        (nếu dùng với tùy chọn -r, -m hay -l) chỉ cho người\n"
+"                        dùng này\n"
 "\n"
 
 #, c-format
@@ -762,13 +771,13 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "Cách sử dụng: groupadd [tùy_chọn...] nhóm\n"
@@ -776,13 +785,13 @@
 "[groupadd: thêm nhóm]\n"
 "\n"
 "Tùy chọn:\n"
-"  -f, --force\t\t_buộc_ thoát với trạng thái thành công\n"
-"\t\t\t\tnếu nhóm đã gõ có phải tồn tại\n"
-"  -g, --gid GID\t\tgán GID (mã nhóm) này cho nhóm mới\n"
-"  -h, --help\t\t\thiển thị _trợ giúp_ này rồi thoát\n"
-"  -K, --key KHÓA=GIÁ_TRỊ\t\tđè các mặc định của </etc/login.defs>\n"
-"  -o, --non-unique\t\tcho phép tạo nhóm có GID trùng\n"
-"\t\t\t\t(_không phải độc nhất_)\n"
+"  -f, --force                   _buộc_ thoát với trạng thái thành công\n"
+"                                nếu nhóm đã gõ có phải tồn tại\n"
+"  -g, --gid GID                 gán GID (mã nhóm) này cho nhóm mới\n"
+"  -h, --help                    thiển thị _trợ giúp_ này rồi thoát\n"
+"  -K, --key KHÓA=GIÁ_TRỊ        đè các mặc định của </etc/login.defs>\n"
+"  -o, --non-unique              cho phép tạo nhóm có GID trùng\n"
+"                                (_không phải độc nhất_)\n"
 "\n"
 
 #, c-format
@@ -914,10 +923,11 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "Cách sử dụng: groupmod [tùy_chọn...] NHÓM\n"
@@ -925,11 +935,11 @@
 "[groupmod: sửa đổi nhóm]\n"
 "\n"
 "Tùy chọn:\n"
-"  -g, --gid GID\t\tép buộc NHÓM dùng GID (mã hiệu nhóm) mới\n"
-"  -h, --help\t\t\thiển thị _trợ giúp_ này rồi thoát\n"
-"  -n, --new-name NHÓM_MỚI\tép buộc NHÓM dùng tên NHÓM_MỚI\n"
-"  -o, --non-unique\t\tcho phép NHÓM dùng GID trùng\n"
-"\t\t\t(_không phải độc nhất_)\n"
+"  -g, --gid GID                 ép buộc NHÓM dùng GID (mã hiệu nhóm) mới\n"
+"  -h, --help                    hiển thị _trợ giúp_ này rồi thoát\n"
+"  -n, --new-name NHÓM_MỚI       ép buộc NHÓM dùng tên NHÓM_MỚI\n"
+"  -o, --non-unique              cho phép NHÓM dùng GID trùng\n"
+"                                (_không phải độc nhất_)\n"
 "\n"
 
 #, c-format
@@ -1081,10 +1091,11 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "Cách sử dụng: lastlog [tùy_chọn...]\n"
@@ -1092,12 +1103,12 @@
 "[lastlog: bản ghi cuối cùng]\n"
 "\n"
 "Tùy chọn:\n"
-"  -b, --before SỐ\t\thiển thị chỉ những bản ghi lastlog\n"
-"\t\t\tcũ hơn số ngày này (_trước_)\n"
-"  -h, --help\t\thiển thị _trợ giúp_ này rồi thoát\n"
-"  -t, --time SỐ\t\thiển thị chỉ những mục ghi lastlog\n"
-"\t\t\tmới hơn số ngày này (_thời gian_)\n"
-"  -u, --user TÊN_DÙNG\thiển thị mục ghi lastlog cho _người dùng_ tên này\n"
+"  -b, --before SỐ       hiển thị chỉ những bản ghi lastlog\n"
+"                        cũ hơn số ngày này (_trước_)\n"
+"  -h, --help            hiển thị _trợ giúp_ này rồi thoát\n"
+"  -t, --time SỐ         hiển thị chỉ những mục ghi lastlog\n"
+"                        mới hơn số ngày này (_thời gian_)\n"
+"  -u, --user TÊN_DÙNG   hiển thị mục ghi lastlog cho _người dùng_ tên này\n"
 "\n"
 
 #, c-format
@@ -1252,14 +1263,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: không thể khóa </etc/passwd>.\n"
@@ -1313,23 +1320,24 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "Cách sử dụng: passwd [tùy_chọn...] [tên_người_dùng]\n"
@@ -1337,21 +1345,22 @@
 "[passwd: mật khẩu]\n"
 "\n"
 "Tùy chọn:\n"
-"  -a, --all\t\t\tthông báo trạng thái mật khẩu về _mọi_ tài khoản\n"
-"  -d, --delete\t\t\t_xóa bỏ_ mật khẩu cho tài khoản tên này\n"
-"  -e, --expire\t\t\tbuộc _hết hạn dùng_ tài khoản tên này\n"
-"  -h, --help\t\t\thiển thị _trợ giúp_ này rồi thoát\n"
-"  -k, --keep-tokens\t\tthay đổi mật khẩu chỉ nếu bị hết hạn thôi\n"
-"\t\t\t\t(_giữ hiệu bài_)\n"
-"  -i, --inactive CHUỖI\tlập mật khẩu mới _không hoạt động_ thành chuỗi này\n"
-"  -l, --lock\t\t\t_khóa_ tài khoản tên này\n"
-"  -n, --mindays SỐ\tlập số _ngày tối thiểu_ trước khi thay đổi mật khẩu\n"
-"  -q, --quiet\t\t\tchế độ _im_ (không hiển thị chi tiết)\n"
-"  -r, --repository KHO\tthay đổi mật khẩu của kho này\n"
-"  -S, --status\t\t\tthông báo _trạng thái_ mật khẩu của tài khoản tên này\n"
-"  -u, --unlock\t\t\t_bỏ khóa_ tài khoản tên này\n"
-"  -w, --warndays SỐ\tlập số _ngày_ trước khi _cảnh báo_ về sự mãn hạn\n"
-"  -x, --maxdays SỐ\tlập số _ngày tối đa_ trước khi thay đổi mật khẩu\n"
+"  -a, --all             thông báo trạng thái mật khẩu về _mọi_ tài khoản\n"
+"  -d, --delete          _xóa bỏ_ mật khẩu cho tài khoản tên này\n"
+"  -e, --expire          buộc _hết hạn dùng_ tài khoản tên này\n"
+"  -h, --help            hiển thị _trợ giúp_ này rồi thoát\n"
+"  -k, --keep-tokens     thay đổi mật khẩu chỉ nếu bị hết hạn thôi\n"
+"                        (_giữ hiệu bài_)\n"
+"  -i, --inactive CHUỖI  lập mật khẩu mới _không hoạt động_ thành chuỗi này\n"
+"  -l, --lock            _khóa_ tài khoản tên này\n"
+"  -n, --mindays SỐ      lập số _ngày tối thiểu_ trước khi thay đổi mật khẩu\n"
+"  -q, --quiet           chế độ _im_ (không hiển thị chi tiết)\n"
+"  -r, --repository KHO  thay đổi mật khẩu của kho này\n"
+"  -S, --status          thông báo _trạng thái_ mật khẩu của tài khoản tên "
+"này\n"
+"  -u, --unlock          _bỏ khóa_ tài khoản tên này\n"
+"  -w, --warndays SỐ     lập số _ngày_ trước khi _cảnh báo_ về sự mãn hạn\n"
+"  -x, --maxdays SỐ      lập số _ngày tối đa_ trước khi thay đổi mật khẩu\n"
 "\n"
 
 msgid "Old password: "
@@ -1538,13 +1547,13 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "Cách sử dụng: su [tùy_chọn...] [tên_dùng]\n"
@@ -1552,13 +1561,14 @@
 "[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"
+"  -c, --command LỆNH        gởi lệnh này qua cho hệ vỏ đã gọi\n"
+"  -h, --help                hiển thị _trợ giúp_ này rồi thoát\n"
+"  -, -l, --login            lập hệ vỏ là hệ vỏ _đăng nhập_\n"
 "  -m, -p,\n"
-"  --preserve-environment\tđừng lập lại các biến _môi trường_, và _giữ_\n"
-"\t\t\t\thệ vỏ hiện có\n"
-"  -s, --shell HỆ_VỎ\t\tsử dụng hệ vỏ này thay vào mặc định trong passwd\n"
+"  --preserve-environment    đừng lập lại các biến _môi trường_, và _giữ_\n"
+"                            hệ vỏ hiện có\n"
+"  -s, --shell HỆ_VỎ         sử dụng hệ vỏ này thay vào mặc định trong "
+"passwd\n"
 "\n"
 
 #, c-format
@@ -1645,29 +1655,30 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "Cách sử dụng: useradd [tùy_chon] TÊN_DÙNG\n"
@@ -1675,29 +1686,33 @@
 "[useradd: thêm người dùng]\n"
 "\n"
 "Tùy chọn:\n"
-"  -b, --base-dir THƯ_MỤC\t\t_thư mục cơ bản_ cho thư mục chính\n"
-"\t\t\t\tcủa tài khoản người dùng mới\n"
-"  -c, --comment CHUỖI\t\tlập trường GECOS cho tài khoản người dùng mới\n"
-"\t\t\t\t(_chú thích_)\n"
-"  -d, --home-dir THƯ_MỤC\t_thư mục chính_ cho tài khoản người dùng mới\n"
-"  -D, --defaults\t\thiển thị hoặc lưu cấu hình useradd _mặc định_ đã sửa\n"
-"\t\t\t\tđổi\n"
-"  -e, --expiredate NGÀY\tlập ngày hết hạn dùng tài khoản\n"
-"  -f, --inactive CHUỖI\tlập mật khẩu mới _không hoạt động_ thành chuỗi này\n"
-"  -g, --gid NHÓM\t\tbuộc gán nhóm này cho tài khoản người dùng mới\n"
-"\t\t\t\t(_mã nhóm_)\n"
-"  -G, --groups NHÓM\t\tdanh sách _các nhóm_ phụ cho tài khoản người dùng\n"
-"\t\t\t\tmới\n"
-"  -h, --help\t\t\thiển thị _trợ giúp_ này rồi thoát\n"
-"  -k, --skel THƯ_MỤC\t\tghi rõ thư mục « skel » thay thế\n"
-"  -K, --key KHÓA=GIÁ_TRỊ\t\tđè các mặc định của </etc/login.defs> (_khóa_)\n"
-"  -m, --create-home\t\t_tạo thư mục chính_ cho tài khoản người dùng mới\n"
-"  -o, --non-unique\t\tcho phép tạo người dùng có UID trùng (_không độc\n"
-"\t\t\t\tnhất_)\n"
-"  -p, --password MẬT_KHẨU\t\tsử dụng _mật khẩu_ mật mã\n"
-"\t\t\t\tcho tài khoản người dùng mới\n"
-"  -s, --shell HỆ_VỎ\t\t_hệ vỏ_ đăng nhập cho tài khoản người dùng mới\n"
-"  -u, --uid UID\t\t\tbuộc sử dụng UID này cho tài khoản người dùng mới\n"
+"  -b, --base-dir THƯ_MỤC    _thư mục cơ bản_ cho thư mục chính\n"
+"                            của tài khoản người dùng mới\n"
+"  -c, --comment CHUỖI       lập trường GECOS cho tài khoản người dùng mới\n"
+"                            (_chú thích_)\n"
+"  -d, --home-dir THƯ_MỤC    _thư mục chính_ cho tài khoản người dùng mới\n"
+"  -D, --defaults            hiển thị hoặc lưu cấu hình useradd _mặc định_\n"
+"                            đã sửa đổi\n"
+"  -e, --expiredate NGÀY     lập ngày hết hạn dùng tài khoản\n"
+"  -f, --inactive CHUỖI      lập mật khẩu mới _không hoạt động_ thành chuỗi "
+"này\n"
+"  -g, --gid NHÓM            buộc gán nhóm này cho tài khoản người dùng mới\n"
+"                            (_mã nhóm_)\n"
+"  -G, --groups NHÓM         danh sách _các nhóm_ phụ cho tài khoản người\n"
+"                            dùng mới\n"
+"  -h, --help                hiển thị _trợ giúp_ này rồi thoát\n"
+"  -k, --skel THƯ_MỤC        ghi rõ thư mục « skel » thay thế\n"
+"  -K, --key KHÓA=GIÁ_TRỊ    đè các mặc định của </etc/login.defs> (_khóa_)\n"
+"  -m, --create-home         _tạo thư mục chính_ cho tài khoản người dùng "
+"mới\n"
+"  -o, --non-unique          cho phép tạo người dùng có UID trùng (_không "
+"độc\n"
+"                            nhất_)\n"
+"  -p, --password MẬT_KHẨU   sử dụng _mật khẩu_ mật mã\n"
+"                            cho tài khoản người dùng mới\n"
+"  -s, --shell HỆ_VỎ         _hệ vỏ_ đăng nhập cho tài khoản người dùng mới\n"
+"  -u, --uid UID             tbuộc sử dụng UID này cho tài khoản người dùng "
+"mới\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1847,18 +1862,19 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 "Cách sử dụng: userdel [tùy_chọn...] ĐĂNG_NHẬP\n"
 "\n"
 "Tùy chọn:\n"
-"  -f, --force\t\t\t_ép buộc_ gỡ bỏ tập tin, thậm chí nếu không\n"
-"\t\t\t\t\tđược sở hữu bởi người dùng\n"
-"  -h, --help\t\t\thiển thị _trợ giúp_ này rồi thoát\n"
-"  -r, --remove\t\t\t_gỡ bỏ_ thư mục chính và ống chỉ thư tín\n"
+"  -f, --force                   _ép buộc_ gỡ bỏ tập tin, thậm chí nếu không\n"
+"                                được sở hữu bởi người dùng\n"
+"  -h, --help                    hiển thị _trợ giúp_ này rồi thoát\n"
+"  -r, --remove                  _gỡ bỏ_ thư mục chính và ống chỉ thư tín\n"
 "\n"
 
 #, c-format
@@ -1924,26 +1940,26 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "Cách sử dụng: usermod [tùy_chọn...] tên_dùng\n"
@@ -1951,28 +1967,32 @@
 "[usermod: sửa đổi người dùng]\n"
 "\n"
 "Tùy chọn:\n"
-"  -a, --append\t\t_phụ thêm_ người dùng vào những nhóm phụ\n"
-"\t\t\t\t(dùng chỉ với « -G »)\n"
-"  -c, --comment CHUỖI\t\tgiá trị mới trong trường GECOS (_ghi chú_)\n"
+"  -a, --append              _phụ thêm_ người dùng vào những nhóm phụ\n"
+"                            (dùng chỉ với « -G »)\n"
+"  -c, --comment CHUỖI       giá trị mới trong trường GECOS (_ghi chú_)\n"
 "  -d, --home THƯ_MỤC_CHÍNH\n"
-"\t\t\t\tthư mục chính mới cho tài khoản người dùng\n"
-"  -e, --expiredate NGÀY\tđặt ngày hết hạn dùng tài khoản thành ngày này\n"
-"  -f, --inactive CHUỖI\tđặt mật khẩu là _không hoạt động_ sau khi hết hạn\n"
-"\t\t\t\tdùng thành chuỗi này\n"
-"  -g, --gid NHÓM\t\tbuộc gán nhóm này là nhóm chính mới\n"
-"  -G, --groups NHÓM\t\tdanh sách mới _các nhóm_ phụ\n"
-"  -h, --help\t\t\thiển thị _trợ giúp_ này rồi thoát\n"
-"  -l, --login TÊN_ĐĂNG_NHẬP\t\ttên _đăng nhập_ mới\n"
-"  -L, --lock\t\t\tl_khóa_ tài khoản người dùng\n"
-"  -m, --move-home\t\t_di chuyển_ nội dụng của _thư mục chính_\n"
-"\t\t\t\tsang địa điểm mới (chỉ dùng với tùy chọn « -d »)\n"
-"  -o, --non-unique\t\tcho phép sử dụng UID trùng (_không độc nhất_)\n"
-"  -p, --password MẬT_KHẨU\tsử dụng _mật khẩu_ đã mật mã cho mật\n"
-"\t\t\t\tkhẩu mới\n"
-"  -s, --shell TRÌNH_BAO\t\t_trình bao_ đăng nhập mới cho tài khoản\n"
-"\t\t\t\tngười dùng\n"
-"  -u, --uid UID\t\t\t_mã hiệu người dùng_ mới cho tài khoản người dùng\n"
-"  -U, --unlock\t\t\t_mở khóa_ tài khoản người dùng\n"
+"                            thư mục chính mới cho tài khoản người dùng\n"
+"  -e, --expiredate NGÀY     đặt ngày hết hạn dùng tài khoản thành ngày này\n"
+"  -f, --inactive CHUỖI      đặt mật khẩu là _không hoạt động_ sau khi hết "
+"hạn\n"
+"                            dùng thành chuỗi này\n"
+"  -g, --gid NHÓM            buộc gán nhóm này là nhóm chính mới\n"
+"  -G, --groups NHÓM         danh sách mới _các nhóm_ phụ\n"
+"  -h, --help                hiển thị _trợ giúp_ này rồi thoát\n"
+"  -l, --login TÊN_ĐĂNG_NHẬP\n"
+"                            tên _đăng nhập_ mới\n"
+"  -L, --lock                l_khóa_ tài khoản người dùng\n"
+"  -m, --move-home           _di chuyển_ nội dụng của _thư mục chính_\n"
+"                            sang địa điểm mới (chỉ dùng với tùy chọn « -d "
+"»)\n"
+"  -o, --non-unique          cho phép sử dụng UID trùng (_không độc nhất_)\n"
+"  -p, --password MẬT_KHẨU   sử dụng _mật khẩu_ đã mật mã cho mật\n"
+"                            khẩu mới\n"
+"  -s, --shell TRÌNH_BAO     _trình bao_ đăng nhập mới cho tài khoản\n"
+"                            người dùng\n"
+"  -u, --uid UID             _mã hiệu người dùng_ mới cho tài khoản người "
+"dùng\n"
+"  -U, --unlock              _mở khóa_ tài khoản người dùng\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2042,21 +2062,21 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "Cách sử dụng: vipw [tùy_chọn...]\n"
 "\n"
 "Tùy chọn:\n"
-"  -g, --group\t\t\tsửa đổi cơ sở dữ liệu _nhóm_\n"
-"  -h, --help\t\t\thiển thị _trợ giúp_ này rồi thoát\n"
-"  -p, --passwd\t\t\tsửa đổi cơ sở dữ liệu passwd\n"
-"  -q, --quiet\t\t\tchế độ _im_ (không hiển thị chi tiết)\n"
-"  -s, --shadow\t\t\tsửa đổi cơ sở dữ liệu shadow hay gshadow\n"
+"  -g, --group                   sửa đổi cơ sở dữ liệu _nhóm_\n"
+"  -h, --help                    hiển thị _trợ giúp_ này rồi thoát\n"
+"  -p, --passwd                  sửa đổi cơ sở dữ liệu passwd\n"
+"  -q, --quiet                   chế độ _im_ (không hiển thị chi tiết)\n"
+"  -s, --shadow                  sửa đổi cơ sở dữ liệu shadow hay gshadow\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/zh_CN.po
===================================================================
--- upstream/trunk/po/zh_CN.po	2007-11-25 22:05:08 UTC (rev 1466)
+++ upstream/trunk/po/zh_CN.po	2007-11-26 22:00:57 UTC (rev 1467)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.15\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
 "PO-Revision-Date: 2007-07-01 06:36-0500\n"
 "Last-Translator: Ming Hua <minghua at ubuntu.com>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb at lists.debian.org>\n"
@@ -195,17 +195,17 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "用法:chage [选项] 用户名\n"
@@ -457,10 +457,11 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "用法:chpasswd [选项]\n"
@@ -472,7 +473,8 @@
 "\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -547,13 +549,13 @@
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s:第 %d 行:未知用户 %s\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "用法:chsh [选项] [LOGIN]\n"
@@ -589,20 +591,23 @@
 msgid "%s: unknown user\n"
 msgstr "%s:未知用户\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "用法:faillog [选项]\n"
@@ -745,13 +750,13 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "用法:groupadd [选项] 组\n"
@@ -889,10 +894,11 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "用法:groupadd [选项] 组\n"
@@ -1049,15 +1055,16 @@
 msgid " groups="
 msgstr " 组="
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "用法:lastlog [选项]\n"
@@ -1217,14 +1224,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s:无法锁定 /etc/passwd。\n"
@@ -1278,23 +1281,24 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "用法:passwd [选项] [用户名]\n"
@@ -1499,13 +1503,13 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "用法:su [选项] [用户名]\n"
@@ -1598,34 +1602,35 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s:指定了过多组(最多 %d)。\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "用法:useradd [选项] 用户名\n"
@@ -1790,9 +1795,10 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 
@@ -1857,26 +1863,26 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "用法:usermod [选项] 用户名\n"
@@ -1962,16 +1968,16 @@
 msgid "failed to rename mailbox"
 msgstr "无法为信箱改名"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "用法:vipw [选项]\n"

Modified: upstream/trunk/po/zh_TW.po
===================================================================
--- upstream/trunk/po/zh_TW.po	2007-11-25 22:05:08 UTC (rev 1466)
+++ upstream/trunk/po/zh_TW.po	2007-11-26 22:00:57 UTC (rev 1467)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.9\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
 "PO-Revision-Date: 2005-06-02 22:20+0800\n"
 "Last-Translator: Asho Yeh <asho at debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@ -199,17 +199,17 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "用法:chage [選項] 使用者\n"
@@ -459,10 +459,11 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "用法:chpasswd [選項]\n"
@@ -474,7 +475,8 @@
 "\t\t\t來替代 DES。\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -554,8 +556,8 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 
@@ -586,20 +588,23 @@
 msgid "%s: unknown user\n"
 msgstr "%s:未知使用者\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "用法:faillog [選項]\n"
@@ -741,13 +746,13 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 
@@ -876,10 +881,11 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 
@@ -1032,10 +1038,11 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "用法:lastlog [選項]\n"
@@ -1196,14 +1203,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s:無法鎖定 /etc/passwd。\n"
@@ -1257,23 +1260,24 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "用法:chage [選項] 使用者\n"
@@ -1470,13 +1474,13 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 
@@ -1564,29 +1568,30 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 
@@ -1730,9 +1735,10 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 
@@ -1797,26 +1803,26 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 
@@ -1887,11 +1893,11 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 




More information about the Pkg-shadow-commits mailing list