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

Nicolas FRANÇOIS nekral-guest at alioth.debian.org
Fri Dec 9 21:35:47 UTC 2011


Author: nekral-guest
Date: 2011-12-09 21:35:47 +0000 (Fri, 09 Dec 2011)
New Revision: 3653

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/po/ca.po
   upstream/trunk/po/cs.po
   upstream/trunk/po/da.po
   upstream/trunk/po/de.po
   upstream/trunk/po/es.po
   upstream/trunk/po/eu.po
   upstream/trunk/po/fr.po
   upstream/trunk/po/ja.po
   upstream/trunk/po/kk.po
   upstream/trunk/po/pt.po
   upstream/trunk/po/pt_BR.po
   upstream/trunk/po/ru.po
   upstream/trunk/po/sk.po
   upstream/trunk/po/sv.po
   upstream/trunk/po/vi.po
   upstream/trunk/po/zh_CN.po
Log:
	* po/ca.po, po/cs.po, po/da.po, po/de.po, po/es.po, po/eu.po,
	po/fr.po, po/ja.po, po/kk.po, po/pt.po, po/pt_BR.po, po/ru.po,
	po/sk.po, po/sv.po, po/vi.po, po/zh_CN.po: Quick unfuzzy.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-12-09 21:31:39 UTC (rev 3652)
+++ upstream/trunk/ChangeLog	2011-12-09 21:35:47 UTC (rev 3653)
@@ -1,5 +1,11 @@
 2011-12-09  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* po/ca.po, po/cs.po, po/da.po, po/de.po, po/es.po, po/eu.po,
+	po/fr.po, po/ja.po, po/kk.po, po/pt.po, po/pt_BR.po, po/ru.po,
+	po/sk.po, po/sv.po, po/vi.po, po/zh_CN.po: Quick unfuzzy.
+
+2011-12-09  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/newusers.c, src/chpasswd.c, src/chgpasswd.c: Harmonize
 	usage messages.
 

Modified: upstream/trunk/po/ca.po
===================================================================
--- upstream/trunk/po/ca.po	2011-12-09 21:31:39 UTC (rev 3652)
+++ upstream/trunk/po/ca.po	2011-12-09 21:35:47 UTC (rev 3653)
@@ -7,7 +7,7 @@
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2011-11-13 18:42+0100\n"
-"PO-Revision-Date: 2011-04-30 18:35+0100\n"
+"PO-Revision-Date: 2011-11-22 23:58+0100\n"
 "Last-Translator: Innocent De Marchi <tangram.peces at gmail.com>\n"
 "Language-Team: Catalan <debian-l10n-catalan at lists.debian.org>\n"
 "Language: ca\n"
@@ -225,10 +225,9 @@
 "%s: Configuració incorrecte: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
 "(%lu)\n"
 
-#, fuzzy, c-format
-#| msgid "failed to allocate memory"
+#, c-format
 msgid "%s: failed to allocate memory: %s\n"
-msgstr "no es pot assignar memòria"
+msgstr "%s: no es pot assignar memòria: %s\n"
 
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
@@ -389,68 +388,52 @@
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
 msgstr ""
+"  -d, --lastday ÚLTIM_DIA       estableix l'últim canvi de contrasenya\n"
+"                                a ÚLTIM_DIA\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-msgstr "  -e, --expiredate EXPIRE_DATE  data de venciment del nou compte\n"
+msgstr ""
+"  -E, --expiredate DATA_EXPIRACIÓ\n"
+"                                estableix la data d'expiració del\n"
+"                                compte a DATA_EXPIRACIÓ\n"
 
 msgid "  -h, --help                    display this help message and exit\n"
-msgstr ""
-"  -h, --help                    mostra aquest missatge d'ajuda i surt\n"
+msgstr "  -h, --help                    mostra aquesta ajuda i acaba\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password PASSWORD       canvia la contrasenya d'aquest (xifrat)\n"
-"                                PASSWORD\n"
+"  -I, --inactive INACTIVA       estableix la contrasenya inactiva\n"
+"                                després d'expiració a INACTIVA\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -l, --list                    show account aging information\n"
 msgstr ""
-"  -r, --reset                   restablir els comptadors d'errors "
-"d'identificació\n"
+"  -l, --list                    mostra informació d'envelliment del compte\n"
 
-# traducció dubtosa
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-" -s, --sha-rounds              nombre de SHA arrodonit per el SHA*\n"
-"                                algorisme d'encriptació\n"
+"  -m, --mindays DIES_MÍN        estableix el número mínim de dies abans\n"
+"                                de canvi de contrasenya a DIES_MÍN\n"
 
-# traducció dubtosa
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-" -s, --sha-rounds              nombre de SHA arrodonit per el SHA*\n"
-"                                algorisme d'encriptació\n"
+"  -M, --maxdays DIES_MÀX        estableix el número màxim de dies abans\n"
+"                                de canvi de contrasenya a DIES_MÀX\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir HOME_DIR       directori arrel del nou compte\n"
+msgstr ""
 
 msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -W, --warndays DIES_AVÍS      estableix els dies d'avís d'expiració\n"
+"                                a DIES_AVÍS\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Introduïu el nou valor, o premeu ENTER per al predeterminat"
@@ -560,17 +543,13 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: s'ha produït un error en canviar els camps\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [LOGIN]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Forma d'ús: %s [opcions] LOGIN\n"
+"Forma d'ús: %s [opcions] [LOGIN]\n"
 "\n"
 "Opcions:\n"
 
@@ -586,11 +565,9 @@
 msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -u, --help                    display this help message and exit\n"
 msgstr ""
-"  -h, --help                    mostra aquest missatge d'ajuda i surt\n"
+"  -u, --help                    mostra aquest missatge d'ajuda i surt\n"
 
 msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
 msgstr ""
@@ -744,10 +721,9 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: línia %d: l'usuari «%s» no existeix\n"
 
-#, fuzzy
-#| msgid "  -s, --shell SHELL             login shell of the new account\n"
 msgid "  -s, --shell SHELL             new login shell for the user account\n"
-msgstr "  -s, --shell SHELL             «shell» d'entrada del nou compte\n"
+msgstr ""
+"  -s, --shell INTÈRPRET         nou intèrpret d'accés per al compte d'usuari\n"
 
 msgid "Login Shell"
 msgstr "Intèrpret d'accés"
@@ -776,34 +752,22 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: Advertència: %s no és executable\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -u, --user                    which user's tcb shadow file to edit\n"
 msgid "  -c, --check                   check the user's password expiration\n"
 msgstr ""
-"  -u, --user                    usuaris «tcb» que poden editar l'arxiu "
-"«shadow»\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -f, --force                   force password change if the user's "
 "password\n"
 "                                is expired\n"
 msgstr ""
-"  -m, --md5                     encriptar la contrasenya en text clar amb\n"
-"                                l'algorisme MD5\n"
 
 #, c-format
 msgid "%s: options %s and %s conflict\n"
 msgstr "%s: opcions %s i %s conflictes\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: unexpected argument: %s\n"
+#, c-format
 msgid "%s: unexpected argument: %s\n"
-msgstr "lastlog: argument inesperat: %s\n"
+msgstr "%s: argument inesperat: %s\n"
 
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
@@ -847,10 +811,9 @@
 "                                o -i) només per l'identificador/s LOGIN "
 "especificats\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+#, c-format
 msgid "%s: Failed to get the entry for UID %lu\n"
-msgstr "darrer registre: No s'ha pogut obtenir l'entrada de la UID %lu\n"
+msgstr "%s: No s'ha pogut obtenir l'entrada de la UID %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Usuari      Fallades Màxim   Últim                    A\n"
@@ -863,31 +826,26 @@
 msgid " [%lds lock]"
 msgstr " [blocat %lds]"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, c-format
 msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr ""
-"faillog: Errada en el restabliment del recompte de fallades per UID %lu\n"
+"%s: Errada en el restabliment del recompte de fallades per UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set max for UID %lu\n"
-msgstr "faillog: Errada en establir el màxim per UID %lu\n"
+msgstr "%s: Errada en establir el màxim per UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set locktime for UID %lu\n"
-msgstr "faillog: Errada en establir «locktime» de UID  %lu\n"
+msgstr "%s: Errada en establir «locktime» de UID  %lu\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Unknown user or range: %s\n"
+#, c-format
 msgid "%s: Unknown user or range: %s\n"
-msgstr "darrer informe: Usuari o rang desconegut: %s\n"
+msgstr "%s: Usuari o rang desconegut: %s\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
+#, c-format
 msgid "%s: Cannot get the size of %s: %s\n"
-msgstr "darrer registre: No s'ha pogut obtenir la mida de %s: %s\n"
+msgstr "%s: No s'ha pogut obtenir la mida de %s: %s\n"
 
 #, c-format
 msgid ""
@@ -905,10 +863,8 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete USER             eliminar USER del GROUP\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir HOME_DIR       directori arrel del nou compte\n"
+msgstr ""
 
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
@@ -1161,50 +1117,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: usuari %s desconegut\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Forma d'ús: %s [opcions] [acció]\n"
+"Forma d'ús: %s [opcions] [grup [grup_ombra]]\n"
 "\n"
 "Opcions:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Forma d'ús: %s [opcions] [acció]\n"
+"Forma d'ús: %s [opcions] [grup]\n"
 "\n"
 "Opcions:\n"
 
-# traducció dubtosa
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -r, --read-only               display errors and warnings\n"
 "                                but do not change files\n"
 msgstr ""
-" -s, --sha-rounds              nombre de SHA arrodonit per el SHA*\n"
-"                                algorisme d'encriptació\n"
 
-#, fuzzy
-#| msgid "  -l, --list                    list the members of the group\n"
 msgid "  -s, --sort                    sort entries by UID\n"
-msgstr "  -l, --list                    llista els membres del grup\n"
+msgstr ""
 
 #, c-format
 msgid "%s: -s and -r are incompatible\n"
@@ -1290,30 +1229,24 @@
 msgid " groups="
 msgstr " grups="
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
-"  -t, --time DAYS               mostra els registres «faillog» de menys de "
-"DAYS dies\n"
+"  -b, --before DIES             mostra només els registres de lastlog més\n"
+"                                antics que DIES\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
 msgstr ""
-"  -t, --time DAYS               mostra els registres «faillog» de menys de "
-"DAYS dies\n"
+"  -t, --time DIES               mostra només els registres de lastlog més\n"
+"                                recents que DIES\n"
 
 msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
+"  -u, --user USUARI             mostra el registre de lastlog per a\n"
+"                                l'usuari amb USUARI especific\n"
 
 msgid "Username         Port     From             Latest"
 msgstr "Usuari           Port     Des de           Últim"
@@ -1394,10 +1327,9 @@
 msgid "Login incorrect"
 msgstr "Accés incorrecte"
 
-#, fuzzy, c-format
-#| msgid "%s: line %d: cannot find user %s\n"
+#, c-format
 msgid "Cannot find user (%s)\n"
-msgstr "%s: línia %d: no es pot trobar l'usuari %s\n"
+msgstr "No es pot trobar l'usuari (%s)\n"
 
 #, c-format
 msgid ""
@@ -1519,63 +1451,47 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: línia %d: no es pot actualitzar l'entrada\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
 "  -a, --all                     report password status on all accounts\n"
 msgstr ""
-"  -a, --all                     mostrar els registres «faillog» per a tots "
-"els usuaris\n"
+"  -a, --all                     informa de l'estat de la contrasenya\n"
+"                                per a tots els comptes\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -d, --delete                  delete the password for the named account\n"
-msgstr "  -r, --system                  genera un compte del sistema\n"
+msgstr ""
+"  -d, --delete                  esborra la contrasenya per al compte\n"
+"                                anomenat\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -e, --expire                  force expire the password for the named "
 "account\n"
-msgstr "  -r, --system                  genera un compte del sistema\n"
+msgstr ""
+"  -e, --expire                  força la caducitat de la contrasenya per\n"
+"                                al compte anomenat\n"
 
-#, fuzzy
-#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
 msgid "  -k, --keep-tokens             change password only if expired\n"
 msgstr ""
-"  -e, --encrypted               les contrasenyes subministrades són "
-"encriptades\n"
+"  -k, --keep-tokens             canvia la contrasenya només si ha caducat\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password PASSWORD       canvia la contrasenya d'aquest (xifrat)\n"
-"                                PASSWORD\n"
+"  -i, --inactive INACTIU        estableix la contrasenya a inactiva després\n"
+"                                d'INACTIU dies de caducitat\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -l, --lock                    lock the password of the named account\n"
-msgstr "  -u, --uid UID                 ID d'usuari del nou compte\n"
+msgstr ""
+"  -l, --lock                    bloca el compte anomenat\n"
 
-# traducció dubtosa
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-" -s, --sha-rounds              nombre de SHA arrodonit per el SHA*\n"
-"                                algorisme d'encriptació\n"
+"  -n, --mindays DIES_MÍN        estableix els dies mínims abans del canvi\n"
+"                                de contrasenya a DIES_MÍN\n"
 
 msgid "  -q, --quiet                   quiet mode\n"
 msgstr "  -q, --quiet                   mode silenciós\n"
@@ -1583,34 +1499,31 @@
 msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 msgstr ""
+"  -r, --repository REPOSITORI   canvia la contrasenya en el REPOSITORI\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -S, --status                  report password status on the named account\n"
-msgstr "  -r, --system                  genera un compte del sistema\n"
+msgstr ""
+"  -S, --status                  informa de l'estat de la contrasenya per\n"
+"                                al compte anomenat\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
-msgstr "  -u, --uid UID                 ID d'usuari del nou compte\n"
+msgstr ""
+"  -u, --unlock                  desbloca el compte anomenat\n"
 
 msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -w, --warndays DIES_AVÍS      estableix els dies d'avís de caducitat\n"
+"                                a DIES_AVÍS\n"
 
-# traducció dubtosa
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-" -s, --sha-rounds              nombre de SHA arrodonit per el SHA*\n"
-"                                algorisme d'encriptació\n"
+"  -x, --maxdays DIES_MÀX        estableix els dies màxims abans del canvi\n"
+"                                de contrasenya a DIES_MÀX\n"
 
 msgid "Old password: "
 msgstr "Contrasenya antiga: "
@@ -1695,6 +1608,7 @@
 msgstr "%s: la informació de caducitat de la contrasenya ha canviat.\n"
 
 #, fuzzy, c-format
+# NOTE: passwd is a file (/etc/passwd)
 #| msgid ""
 #| "Usage: %s [options] [action]\n"
 #| "\n"
@@ -1917,10 +1831,9 @@
 msgid "%s: Cannot drop the controlling terminal\n"
 msgstr "%s: no és possible eliminar el contingut de %s: %s\n"
 
-#, fuzzy, c-format
-#| msgid "Cannot execute %s"
+#, c-format
 msgid "Cannot execute %s\n"
-msgstr "No es pot executar %s"
+msgstr "No es pot executar %s\n"
 
 msgid "No password file"
 msgstr "No hi ha fitxer de contrasenyes"
@@ -1963,10 +1876,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: línia massa llarga a %s: %s..."
 
-#, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
+#, c-format
 msgid "%s: rename: %s: %s\n"
-msgstr "%s: reanomena %s: %s"
+msgstr "%s: reanomena %s: %s\n"
 
 #, c-format
 msgid "%s: group '%s' is a NIS group.\n"
@@ -1976,11 +1888,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: s'han especificat massa grups (màx de %d).\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "       %s -D\n"
@@ -1989,6 +1897,8 @@
 "Options:\n"
 msgstr ""
 "Forma d'ús: %s [opcions] LOGIN\n"
+"            %s -D\n"
+"            %s -D [opcions]\n"
 "\n"
 "Opcions:\n"
 
@@ -2193,25 +2103,17 @@
 "%s: avís: el directori personal ja existeix.\n"
 "No s'hi copiarà cap fitxer del directori skel.\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -f, --force                   exit successfully if the group already "
-#| "exists,\n"
-#| "                                and cancel -g if the GID is already used\n"
 msgid ""
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
 msgstr ""
-"  -f, --force                   sortir correctament si el grup ja existeix,\n"
-"                                i calcel·lar «-g» si ja es fa servir el GID\n"
+"  -f, --force                   força l'eliminació de fitxers, encara que\n"
+"                                no siguin propietat de l'usuari\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -r, --remove                  remove home directory and mail spool\n"
 msgstr ""
-"  -r, --reset                   restablir els comptadors d'errors "
-"d'identificació\n"
+"  -r, --remove                  elimina el directori personal i la cua\n"
+"                                de correu\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot remove the primary group of user '%s'\n"
@@ -2277,100 +2179,79 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: s'ha produït un error en eliminar el directori %s\n"
 
-#, fuzzy
-#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
 msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
-msgstr "  -c, --comment COMMENT         camp GECOS del nou compte\n"
+msgstr ""
+"  -c, --comment COMENTARI       nou valor per al camp GECOS\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
 "  -d, --home HOME_DIR           new home directory for the user account\n"
-msgstr "  -d, --home-dir HOME_DIR       directori arrel del nou compte\n"
+msgstr ""
+"  -d, --home DIR_PERSONAL       nou directori personal per al nou compte\n"
+"                                d'usuari\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-msgstr "  -e, --expiredate EXPIRE_DATE  data de venciment del nou compte\n"
+msgstr ""
+"  -e, --expiredate DATA_CADUCIT estableix la data de caducitat del compte\n"
+"                                a DATA_CADUCITAT\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password PASSWORD       canvia la contrasenya d'aquest (xifrat)\n"
-"                                PASSWORD\n"
+"  -f, --inactive INACTIU        estableix la contrasenya a inactiva després\n"
+"                                d'INACTIU dies de caducitat\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
-msgstr "  -g, --gid GID                 fer servir GID pel nou grup\n"
+msgstr ""
+"  -g, --gid GRUP                força l'ús de GRUP com a nou grup inicial\n"
+"                                d'accés\n"
 
-#, fuzzy
-#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
 msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
 msgstr ""
-"  -M, --members USER,...        establir el llistat de membres del grup "
-"GROUP\n"
+"  -G, --groups GRUPS            llista de GRUPS addicionals\n"
 
 msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
 msgstr ""
+"  -a, --append                  afegeix l'usuari als GRUPS addicionals\n"
+"                                llistats amb la opció -G sense eliminar-los\n"
+"                                d'altres grups\n"
 
 msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -L, --lock                    lock the user account\n"
-msgstr "  -u, --uid UID                 ID d'usuari del nou compte\n"
+msgstr ""
+"  -l, --login USUARI            nou valor per al nom d'usuari\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
-#| "the\n"
-#| "                                new account\n"
 msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
 msgstr ""
-"  -b, --base-dir BASE_DIR       directori base pel directori arrel del\n"
-"                                compte nou\n"
+"  -m, --move-home               mou els continguts del directori personal\n"
+"                                a la nova ubicació (usar només amb -d)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
-#| "GID\n"
 msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
 msgstr ""
-"  -o, --non-unique              permet utilitzar un duplicat (no únics) GID\n"
+"  -o, --non-unique              permet usar UID duplicats (no únics)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       use this encrypted password for the new "
-#| "group\n"
 msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
 msgstr ""
-"  -p, --password PASSWORD       utilitzar aquesta contrasenya xifrada pel "
-"nou grup\n"
+"  -p, --password CONTRASENYA    usa contrasenya xifrada per a la nova\n"
+"                                contrasenya\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -u, --uid UID                 new UID for the user account\n"
-msgstr "  -u, --uid UID                 ID d'usuari del nou compte\n"
+msgstr ""
+"  -u, --uid UID                 nou UID per al compte d'usuari\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -U, --unlock                  unlock the user account\n"
-msgstr "  -u, --uid UID                 ID d'usuari del nou compte\n"
+msgstr ""
+"  -U, --unlock                  desbloca el compte d'usuari\n"
 
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "

Modified: upstream/trunk/po/cs.po
===================================================================
--- upstream/trunk/po/cs.po	2011-12-09 21:31:39 UTC (rev 3652)
+++ upstream/trunk/po/cs.po	2011-12-09 21:35:47 UTC (rev 3653)
@@ -7,7 +7,7 @@
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2011-11-13 18:42+0100\n"
-"PO-Revision-Date: 2009-10-04 15:44+0200\n"
+"PO-Revision-Date: 2011-11-26 18:41+0100\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
 "Language: cs\n"
@@ -195,13 +195,12 @@
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: nepodařilo se odemknout %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: %s\n"
+#, c-format
 msgid "%s: "
-msgstr "%s: %s\n"
+msgstr "%s: "
 
 msgid ": "
-msgstr ""
+msgstr ": "
 
 msgid "Environment overflow\n"
 msgstr "Přetečení prostředí\n"
@@ -397,58 +396,48 @@
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
 msgstr ""
+"  -d, --lastday POSL_DEN        nastaví datum poslední změny hesla na POSL_DEN\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-msgstr "  -e, --expiredate EXP_DATUM    datum vypršení platnosti nového účtu\n"
+msgstr ""
+"  -E, --expiredate EXP_DATUM    nastaví datum vypršení účtu na EXP_DATUM\n"
 
 msgid "  -h, --help                    display this help message and exit\n"
 msgstr "  -h, --help                    zobrazí tuto nápovědu a skončí\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-msgstr "  -p, --password HESLO          změní heslo na (šifrované) HESLO\n"
+msgstr ""
+"  -I, --inactive NEAKTIV        zablokuje účet po NEAKTIV dnech od vypršení\n"
+"                                platnosti hesla\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -l, --list                    show account aging information\n"
 msgstr ""
-"  -r, --reset                   vynuluje počitadla chybných přihlášení\n"
+"  -l, --list                    zobrazí informace o účtu\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-msgstr "  -s, --sha-rounds              počet SHA iterací algoritmu SHA*\n"
+msgstr ""
+"  -m, --mindays MIN_DNŮ         nastaví minimální počet dnů před změnou\n"
+"                                hesla na MIN_DNŮ\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
-msgstr "  -s, --sha-rounds              počet SHA iterací algoritmu SHA*\n"
+msgstr ""
+"  -M, --maxdays MAX_DNŮ         nastaví maximální počet dnů před změnou\n"
+"                                hesla na MAX_DNŮ\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir DOMOV_ADR      domovský adresář nového účtu\n"
+msgstr ""
 
 msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -W, --warndays VAR_DNŮ        nastaví varování o expiraci na VAR_DNŮ\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr ""
@@ -522,10 +511,9 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s: vaše uživatelské jméno nelze zjistit.\n"
 
-#, fuzzy, c-format
-#| msgid "%s: %s\n"
+#, c-format
 msgid "%s: PAM: %s\n"
-msgstr "%s: %s\n"
+msgstr "%s: PAM: %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -559,17 +547,13 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: chyba při změně položek\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [LOGIN]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Použití: %s [volby] ÚČET\n"
+"Použití: %s [volby] [ÚČET]\n"
 "\n"
 "Volby:\n"
 
@@ -585,10 +569,8 @@
 msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -u, --help                    display this help message and exit\n"
-msgstr "  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+msgstr "  -u, --help                    zobrazí tuto nápovědu a skončí\n"
 
 msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
 msgstr ""
@@ -737,10 +719,9 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: řádek %d: uživatel „%s“ neexistuje\n"
 
-#, fuzzy
-#| msgid "  -s, --shell SHELL             login shell of the new account\n"
 msgid "  -s, --shell SHELL             new login shell for the user account\n"
-msgstr "  -s, --shell SHELL             přihlašovací shell nového účtu\n"
+msgstr ""
+"  -s, --shell SHELL             nový přihlašovací shell uživatele\n"
 
 msgid "Login Shell"
 msgstr "Přihlašovací shell"
@@ -757,10 +738,9 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: chybná položka %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: %s is an invalid shell.\n"
+#, c-format
 msgid "%s: %s is an invalid shell\n"
-msgstr "%s: %s není platný shell.\n"
+msgstr "%s: %s není platný shell\n"
 
 #, fuzzy, c-format
 #| msgid "%s: user %s does not exist\n"
@@ -772,46 +752,33 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: varování: vlastníkem %s není %s\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -c, --check                   check the user's password expiration\n"
-msgstr "  -u, --uid UID                 uživatelské ID nového účtu\n"
+msgstr ""
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -f, --force                   force password change if the user's "
 "password\n"
 "                                is expired\n"
 msgstr ""
-"  -m, --md5                     zašifruje nešifrované heslo\n"
-"                                algoritmem MD5\n"
 
 #, c-format
 msgid "%s: options %s and %s conflict\n"
 msgstr "%s: volby %s a %s kolidují\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: unexpected argument: %s\n"
+#, c-format
 msgid "%s: unexpected argument: %s\n"
-msgstr "lastlog: neočekávaný argument: %s\n"
+msgstr "%s: neočekávaný argument: %s\n"
 
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 "  -a, --all                     zobrazí záznamy faillogu o všech "
 "uživatelích\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -l, --lock-time SEC           after failed login lock account for SEC "
-#| "seconds\n"
 msgid ""
 "  -l, --lock-secs SEC           after failed login lock account for SEC "
 "seconds\n"
 msgstr ""
-"  -l, --lock-time SEK           po neúspěšném přihlášení zamkne účet na SEC\n"
+"  -l, --lock-secs SEK           po neúspěšném přihlášení zamkne účet na SEC\n"
 "                                sekund\n"
 
 msgid ""
@@ -840,10 +807,9 @@
 "m\n"
 "                                nebo -l)\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+#, c-format
 msgid "%s: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: nepodařilo se získat záznam pro UID %lu\n"
+msgstr "%s: nepodařilo se získat záznam pro UID %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Uživatel    Chyb     Maximum Poslední                 Odkud\n"
@@ -856,31 +822,26 @@
 msgid " [%lds lock]"
 msgstr " [%lds zámek]"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, c-format
 msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr ""
-"faillog: nepodařilo se vynulovat počet chybných přihlášení pro UID %lu\n"
+"%s: nepodařilo se vynulovat počet chybných přihlášení pro UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set max for UID %lu\n"
-msgstr "faillog: nepodařilo se nastavit maximum pro UID %lu\n"
+msgstr "%s: nepodařilo se nastavit maximum pro UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set locktime for UID %lu\n"
-msgstr "faillog: nepodařilo se nastavit délku zamknutí pro UID %lu\n"
+msgstr "%s: nepodařilo se nastavit délku zamknutí pro UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Unknown user or range: %s\n"
+#, c-format
 msgid "%s: Unknown user or range: %s\n"
-msgstr "lastlog: Neznámý uživatel nebo rozsah: %s\n"
+msgstr "%s: Neznámý uživatel nebo rozsah: %s\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
+#, c-format
 msgid "%s: Cannot get the size of %s: %s\n"
-msgstr "lastlog: nelze zjistit velikost %s: %s\n"
+msgstr "%s: nelze zjistit velikost %s: %s\n"
 
 #, c-format
 msgid ""
@@ -898,10 +859,8 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete UŽIVATEL         odstraní UŽIVATELE ze SKUPINY\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir DOMOV_ADR      domovský adresář nového účtu\n"
+msgstr ""
 
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         odstraní heslo SKUPINY\n"
@@ -913,18 +872,12 @@
 msgid "  -M, --members USER,...        set the list of members of GROUP\n"
 msgstr "  -M, --members UŽIVATEL,...    nastaví seznam členů SKUPINY\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -A, --administrators ADMIN,...\n"
-#| "                                set the list of administrators for GROUP\n"
-#| "Except for the -A and -M options, the options cannot be combined.\n"
 msgid ""
 "  -A, --administrators ADMIN,...\n"
 "                                set the list of administrators for GROUP\n"
 msgstr ""
 "  -A, --administrators SPRÁVCE,...\n"
 "                                nastaví seznam správců SKUPINY\n"
-"Kromě voleb -A a -M není možné volby kombinovat.\n"
 
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Kromě voleb -A a -M není možné volby kombinovat.\n"
@@ -1149,47 +1102,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: neznámý uživatel %s\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Použití: %s [volby] [akce]\n"
+"Použití: %s [volby] [soubor se skupinami [soubor se stínovými skupinami]]\n"
 "\n"
 "Volby:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Použití: %s [volby] [akce]\n"
+"Použití: %s [volby] [soubor se skupinami]\n"
 "\n"
 "Volby:\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -r, --read-only               display errors and warnings\n"
 "                                but do not change files\n"
-msgstr "  -s, --sha-rounds              počet SHA iterací algoritmu SHA*\n"
+msgstr ""
 
-#, fuzzy
-#| msgid "  -l, --list                    list the members of the group\n"
 msgid "  -s, --sort                    sort entries by UID\n"
-msgstr "  -l, --list                    vypíše členy skupiny\n"
+msgstr ""
 
 #, c-format
 msgid "%s: -s and -r are incompatible\n"
@@ -1275,28 +1214,21 @@
 msgid " groups="
 msgstr " skupiny="
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
-"  -t, --time DNŮ                zobrazí záznamy faillogu novější než DNŮ\n"
+"  -b, --before DNŮ              zobrazí záznamy lastlogu starší než DNŮ\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
 msgstr ""
-"  -t, --time DNŮ                zobrazí záznamy faillogu novější než DNŮ\n"
+"  -t, --time DNŮ                zobrazí záznamy lastlogu novější než DNŮ\n"
 
 msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
+"  -u, --user ÚČET               zobrazí záznamy lastlogu pro uživatele ÚČET\n"
 
 msgid "Username         Port     From             Latest"
 msgstr "Uživatel         Port     Z                Naposledy"
@@ -1498,90 +1430,76 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: řádek %d: položku nelze aktualizovat\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
 "  -a, --all                     report password status on all accounts\n"
 msgstr ""
-"  -a, --all                     zobrazí záznamy faillogu o všech "
-"uživatelích\n"
+"  -a, --all                     vypíše stav hesel na všech účtech\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -d, --delete                  delete the password for the named account\n"
-msgstr "  -r, --system                  vytvoří systémový účet\n"
+msgstr ""
+"  -d, --delete                  pro zadaný účet smaže heslo\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -e, --expire                  force expire the password for the named "
 "account\n"
-msgstr "  -r, --system                  vytvoří systémový účet\n"
+msgstr ""
+"  -e, --expire                  pro zadaný účet vynutí expiraci hesla\n"
 
-#, fuzzy
-#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
 msgid "  -k, --keep-tokens             change password only if expired\n"
-msgstr "  -e, --encrypted               zadaná hesla jsou zašifrovaná\n"
+msgstr ""
+"  -k, --keep-tokens             změní heslo pouze pokud mu vypršela\n"
+"                                platnost\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-msgstr "  -p, --password HESLO          změní heslo na (šifrované) HESLO\n"
+msgstr ""
+"  -i, --inactive NEAKTIV        zablokuje účet po NEAKTIV dnech od\n"
+"                                vypršení platnosti hesla\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -l, --lock                    lock the password of the named account\n"
-msgstr "  -u, --uid UID                 uživatelské ID nového účtu\n"
+msgstr ""
+"  -l, --lock                    zamkne heslo zadaného účtu\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-msgstr "  -s, --sha-rounds              počet SHA iterací algoritmu SHA*\n"
+msgstr ""
+"  -n, --mindays MIN_DNŮ         nastaví minimální počet dnů před změnou\n"
+"                                hesla na MIN_DNŮ\n"
 
-#, fuzzy
-#| msgid "  -l, --list                    list the members of the group\n"
 msgid "  -q, --quiet                   quiet mode\n"
-msgstr "  -l, --list                    vypíše členy skupiny\n"
+msgstr ""
+"  -q, --quiet                   tichý režim\n"
 
 msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 msgstr ""
+"  -r, --repository REPOSITÁŘ    změní heslo v repositáři REPOSITÁŘ\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -S, --status                  report password status on the named account\n"
-msgstr "  -r, --system                  vytvoří systémový účet\n"
+msgstr ""
+"  -S, --status                  pro zadaný účet vypíše stav hesla\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
-msgstr "  -u, --uid UID                 uživatelské ID nového účtu\n"
+msgstr ""
+"  -u, --unlock                  odemkne heslo zadaného účtu\n"
 
 msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -w, --warndays VAR_DNŮ        nastaví varování o expiraci na VAR_DNŮ\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-msgstr "  -s, --sha-rounds              počet SHA iterací algoritmu SHA*\n"
+msgstr ""
+"  -x, --maxdays MAX_DNŮ         nastaví maximální počet dnů před změnou\n"
+"                                hesla na MAX_DNŮ\n"
 
 msgid "Old password: "
 msgstr "Staré heslo: "
@@ -1664,31 +1582,23 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s: informace o vypršení platnosti hesla byly změněny.\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Použití: %s [volby] [akce]\n"
+"Použití: %s [volby] [soubor s hesly]\n"
 "\n"
 "Volby:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd [shadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Použití: %s [volby] [akce]\n"
+"Použití: %s [volby] [soubor s hesly [soubor se stínovými hesly]]\n"
 "\n"
 "Volby:\n"
 
@@ -1889,10 +1799,9 @@
 msgid "%s: Cannot drop the controlling terminal\n"
 msgstr "lastlog: nelze zjistit velikost %s: %s\n"
 
-#, fuzzy, c-format
-#| msgid "Cannot execute %s"
+#, c-format
 msgid "Cannot execute %s\n"
-msgstr "%s nelze spustit"
+msgstr "%s nelze spustit\n"
 
 msgid "No password file"
 msgstr "Soubor s hesly neexistuje"
@@ -1935,10 +1844,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: příliš dlouhý řádek v %s: %s..."
 
-#, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
+#, c-format
 msgid "%s: rename: %s: %s\n"
-msgstr "%s: přejmenovat: %s: %s"
+msgstr "%s: přejmenovat: %s: %s\n"
 
 #, c-format
 msgid "%s: group '%s' is a NIS group.\n"
@@ -1948,11 +1856,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: zadáno příliš mnoho skupin (max %d).\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "       %s -D\n"
@@ -1961,6 +1865,8 @@
 "Options:\n"
 msgstr ""
 "Použití: %s [volby] ÚČET\n"
+"         %s -D\n"
+"         %s -D [volby]\n"
 "\n"
 "Volby:\n"
 
@@ -2161,24 +2067,17 @@
 "%s: varování: domovský adresář již existuje.\n"
 "Nekopíruji do něj žádné soubory z adresáře skel.\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -f, --force                   exit successfully if the group already "
-#| "exists,\n"
-#| "                                and cancel -g if the GID is already used\n"
 msgid ""
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
 msgstr ""
-"  -f, --force                   skončí úspěchem pokud již skupina existuje,\n"
-"                                zruší -g pokud je již GID použito\n"
+"  -f, --force                   vynutí odstranění souborů,\n"
+"                                i když je uživatel nevlastní\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -r, --remove                  remove home directory and mail spool\n"
 msgstr ""
-"  -r, --reset                   vynuluje počitadla chybných přihlášení\n"
+"  -r, --remove                  odstraní domovský adresář a poštovní\n"
+"                                schránku\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot remove the primary group of user '%s'\n"
@@ -2243,97 +2142,76 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: chyba při mazání adresáře %s\n"
 
-#, fuzzy
-#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
 msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
-msgstr "  -c, --comment KOMENTÁŘ        pole GECOS nového účtu\n"
+msgstr ""
+"  -c, --comment KOMENTÁŘ        nová hodnota pole GECOS\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
 "  -d, --home HOME_DIR           new home directory for the user account\n"
-msgstr "  -d, --home-dir DOMOV_ADR      domovský adresář nového účtu\n"
+msgstr ""
+"  -d, --home-dir DOMOV_ADR      nový domovský adresář uživatele\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-msgstr "  -e, --expiredate EXP_DATUM    datum vypršení platnosti nového účtu\n"
+msgstr ""
+"  -e, --expiredate EXP_DATUM    nastaví vypršení platnosti účtu na EXP_DATUM\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-msgstr "  -p, --password HESLO          změní heslo na (šifrované) HESLO\n"
+msgstr ""
+"  -f, --inactive NEAKTIV        zablokuje účet po NEAKTIV dnech od vypršení\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
-msgstr "  -g, --gid GID                 pro novou skupinu použije GID\n"
+msgstr ""
+"  -g, --gid SKUPINA             nastaví novou primární SKUPINU\n"
 
-#, fuzzy
-#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
 msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-msgstr "  -M, --members UŽIVATEL,...    nastaví seznam členů SKUPINY\n"
+msgstr ""
+"  -G, --groups SKUPINY          nový seznam dodatečných skupin, do kterých\n"
+"                                má účet patřit\n"
 
 msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
 msgstr ""
+"  -a, --append                  přidá uživatele do dalších SKUPIN zadaných\n"
+"                                volbou -G; neruší členství v ostatních sk.\n"
 
 msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
 msgstr ""
+"  -l, --login NOVÝ_ÚČET         nová hodnota přihlašovacího jména\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -L, --lock                    lock the user account\n"
-msgstr "  -u, --uid UID                 uživatelské ID nového účtu\n"
+msgstr ""
+"  -L, --lock                    zamkne uživatelský účet\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
-#| "the\n"
-#| "                                new account\n"
 msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
 msgstr ""
-"  -b, --base-dir ZÁKL_ADR       základní adresář pro domovský adresář "
-"nového\n"
-"                                uživatelského účtu\n"
+"  -m, --move-home               přesune obsah původního domovského adresáře\n"
+"                                do nového umístění (používejte pouze s -d)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
-#| "GID\n"
 msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
 msgstr ""
-"  -o, --non-unique              povolí použití duplicitního\n"
-"                                (nejedinečného) GID\n"
+"  -o, --non-unique              povolí vytvoření uživatele s duplicitním\n"
+"                                (nejedinečným) UID\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       use this encrypted password for the new "
-#| "group\n"
 msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
 msgstr ""
-"  -p, --password HESLO          pro novou skupinu použije šifrované heslo\n"
+"  -p, --password HESLO          použije nové zašifrované heslo\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -u, --uid UID                 new UID for the user account\n"
-msgstr "  -u, --uid UID                 uživatelské ID nového účtu\n"
+msgstr ""
+"  -u, --uid UID                 nové UID pro uživatelský účet\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -U, --unlock                  unlock the user account\n"
-msgstr "  -u, --uid UID                 uživatelské ID nového účtu\n"
+msgstr ""
+"  -U, --unlock                  odemkne uživatelský účet\n"
 
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
@@ -2427,42 +2305,29 @@
 "Z důvodu konzistence byste měli změnit i %s.\n"
 "Můžete to provést příkazem „%s“.\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Použití: %s [volby]\n"
+"Použití: vipw [volby]\n"
 "\n"
 "Volby:\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 change the group ID to GID\n"
 msgid "  -g, --group                   edit group database\n"
-msgstr "  -g, --gid GID                 změní ID skupiny na GID\n"
+msgstr ""
+"  -g, --group                   upraví databázi skupin\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -p, --passwd                  edit passwd database\n"
-msgstr "  -r, --system                  vytvoří systémový účet\n"
+msgstr ""
+"  -p, --passwd                  upraví databázi hesel\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
-"  -a, --all                     zobrazí záznamy faillogu o všech "
-"uživatelích\n"
+"  -s, --shadow                  upraví databázi shadow nebo gshadow\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -u, --user                    which user's tcb shadow file to edit\n"
-msgstr "  -u, --uid UID                 uživatelské ID nového účtu\n"
+msgstr ""
 
 #, c-format
 msgid "%s: failed to remove %s\n"

Modified: upstream/trunk/po/da.po
===================================================================
--- upstream/trunk/po/da.po	2011-12-09 21:31:39 UTC (rev 3652)
+++ upstream/trunk/po/da.po	2011-12-09 21:35:47 UTC (rev 3653)
@@ -20,7 +20,7 @@
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2011-11-13 18:42+0100\n"
-"PO-Revision-Date: 2011-04-06 18:50+0100\n"
+"PO-Revision-Date: 2011-11-23 23:57+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
 "Language: \n"
@@ -231,10 +231,9 @@
 msgstr ""
 "%s: Ugyldig opsætning: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%lu)\n"
 
-#, fuzzy, c-format
-#| msgid "failed to allocate memory"
+#, c-format
 msgid "%s: failed to allocate memory: %s\n"
-msgstr "kunne ikke tildele hukommelse"
+msgstr "%s: kunne ikke tildele hukommelse: %s\n"
 
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
@@ -394,64 +393,49 @@
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
 msgstr ""
+"  -d, --lastday SIDSTE_DAG      sæt seneste adgangskodeændring til SIDSTE_DAG\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-msgstr "  -e, --expiredate UDLØBSDATO   udløbsdato på den nye konto\n"
+msgstr ""
+"  -E, --expiredate UDLØBSDATO   sæt kontoens udløbsdato til UDLØBSDATO\n"
 
 msgid "  -h, --help                    display this help message and exit\n"
 msgstr "  -h, --help                    vis denne hjælpetekst og afslut\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password ADGANGSKODE    ændr adgangskoden til denne (krypteret)\n"
-"                                ADGANGSKODE\n"
+"  -I, --inactive INAKTIVT       sæt inaktiv adgangskode efter udløb til\n"
+"                                INAKTIVT\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -l, --list                    show account aging information\n"
 msgstr ""
-"  -r, --reset                   nulstil tælleren for mislykkede logind\n"
+"  -l, --list                    vis forældelsesoplysninger for konto\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              antal SHA-runder for SHA*\n"
-"                                crypt-algoritmerne\n"
+"  -m, --mindays MIN_DAGE        sæt minimalt antal dage inden\n"
+"                                adgangskodeændring til MIN_DAGE\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              antal SHA-runder for SHA*\n"
-"                                crypt-algoritmerne\n"
+"  -M, --maxdays MAKS_DAGE       sæt maksimalt antal dage inden\n"
+"                                adgangskodeændring til MAKS_DAGE\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir HJEMMEMAPPE    hjemmemappe på den nye konto\n"
+msgstr ""
 
 msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -W, --warndays VARSELSDAGE    sæt antallet af udløbsvarselsdage til\n"
+"                                VARSELSDAGE\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Angiv ny værdi eller tryk RETUR for standardværdien"
@@ -561,17 +545,13 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: Fejl ved ændring af felter\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [LOGIN]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Brug: %s [tilvalg] LOGIND\n"
+"Brug: %s [tilvalg] [LOGIND]\n"
 "\n"
 "Tilvalg:\n"
 
@@ -587,10 +567,8 @@
 msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -u, --help                    display this help message and exit\n"
-msgstr "  -h, --help                    vis denne hjælpetekst og afslut\n"
+msgstr "  -u, --help                    vis denne hjælpetekst og afslut\n"
 
 msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
 msgstr ""
@@ -741,10 +719,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: Linje %d: Bruger »%s« findes ikke\n"
 
-#, fuzzy
-#| msgid "  -s, --shell SHELL             login shell of the new account\n"
 msgid "  -s, --shell SHELL             new login shell for the user account\n"
-msgstr "  -s, --shell SKAL              logindskal for den nye konto\n"
+msgstr "  -s, --shell SKAL              ny logindskal for brugerkontoen\n"
 
 msgid "Login Shell"
 msgstr "Logindskal"
@@ -773,34 +749,22 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: Advarsel: %s er ikke kørbar\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -u, --user                    which user's tcb shadow file to edit\n"
 msgid "  -c, --check                   check the user's password expiration\n"
 msgstr ""
-"  -u, --user                    hvilken brugers tcb-skyggefil at redigere\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -f, --force                   force password change if the user's "
 "password\n"
 "                                is expired\n"
 msgstr ""
-"  -m, --md5                     krypter adgangskoden med klartekst med brug "
-"af\n"
-"                                MD5-algoritmen\n"
 
 #, c-format
 msgid "%s: options %s and %s conflict\n"
 msgstr "%s: Tilvalg %s og %s er i konflikt\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: unexpected argument: %s\n"
+#, c-format
 msgid "%s: unexpected argument: %s\n"
-msgstr "lastlog: Uventet argument: %s\n"
+msgstr "%s: Uventet argument: %s\n"
 
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr "  -a, --all                     vis faillog-poster for alle brugere\n"
@@ -838,10 +802,9 @@
 "-r,\n"
 "                                 -m, eller -l) for de angivne LOGIND'ER\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+#, c-format
 msgid "%s: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: Kunne ikke indhente punktet for UID %lu\n"
+msgstr "%s: Kunne ikke indhente punktet for UID %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Logind      Fejl     Maksimum Seneste                 Tid\n"
@@ -854,30 +817,25 @@
 msgid " [%lds lock]"
 msgstr " [%lds lås]"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, c-format
 msgid "%s: Failed to reset fail count for UID %lu\n"
-msgstr "faillog: Kunne ikke nulstille fejlantal for UID %lu\n"
+msgstr "%s: Kunne ikke nulstille fejlantal for UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set max for UID %lu\n"
-msgstr "faillog: Kunne ikke angive maks for UID %lu\n"
+msgstr "%s: Kunne ikke angive maks for UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set locktime for UID %lu\n"
-msgstr "faillog: Kunne ikke angive låsetid for UID %lu\n"
+msgstr "%s: Kunne ikke angive låsetid for UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Unknown user or range: %s\n"
+#, c-format
 msgid "%s: Unknown user or range: %s\n"
-msgstr "lastlog: Ukendt bruger eller interval: %s\n"
+msgstr "%s: Ukendt bruger eller interval: %s\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
+#, c-format
 msgid "%s: Cannot get the size of %s: %s\n"
-msgstr "lastlog: Kan ikke indhente størrelsen for %s: %s\n"
+msgstr "%s: Kan ikke indhente størrelsen for %s: %s\n"
 
 #, c-format
 msgid ""
@@ -895,10 +853,8 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete BRUGER           fjern BRUGER fra GRUPPE\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir HJEMMEMAPPE    hjemmemappe på den nye konto\n"
+msgstr ""
 
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         fjern GRUPPENS adgangskode\n"
@@ -1147,49 +1103,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: Ukendt bruger %s\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Brug: %s [tilvalg] [handling]\n"
+"Brug: %s [tilvalg] [gruppe [gskygge]]\n"
 "\n"
 "Tilvalg:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Brug: %s [tilvalg] [handling]\n"
+"Brug: %s [tilvalg] [gruppe]\n"
 "\n"
 "Tilvalg:\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -r, --read-only               display errors and warnings\n"
 "                                but do not change files\n"
 msgstr ""
-"  -s, --sha-rounds              antal SHA-runder for SHA*\n"
-"                                crypt-algoritmerne\n"
 
-#, fuzzy
-#| msgid "  -l, --list                    list the members of the group\n"
 msgid "  -s, --sort                    sort entries by UID\n"
-msgstr "  -l, --list                    vis medlemmer af gruppen\n"
+msgstr ""
 
 #, c-format
 msgid "%s: -s and -r are incompatible\n"
@@ -1275,26 +1215,24 @@
 msgid " groups="
 msgstr " grupper="
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-msgstr "  -t, --time DAGE               vis faillog-poster nyere end DAGE\n"
+msgstr ""
+"  -b, --before DAGE             vis kun lastlog-poster, der er ældre\n"
+"                                end DAGE\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
-msgstr "  -t, --time DAGE               vis faillog-poster nyere end DAGE\n"
+msgstr ""
+"  -t, --time DAGE               vis kun lastlog-poster, der er nyere\n"
+"                                end DAGE\n"
 
 msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
+"  -u, --user LOGIND             vis lastlog-poster for brugeren med\n"
+"                                det angivne LOGIND\n"
 
 msgid "Username         Port     From             Latest"
 msgstr "Brugernavn       Port     Fra              Seneste"
@@ -1496,58 +1434,44 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: Linje %d: Kan ikke opdatere punktet\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
 "  -a, --all                     report password status on all accounts\n"
-msgstr "  -a, --all                     vis faillog-poster for alle brugere\n"
+msgstr ""
+"  -a, --all                     rapporter alle kontis adgangskodestatus\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -d, --delete                  delete the password for the named account\n"
-msgstr "  -r, --system                  opret en systemkonto\n"
+msgstr ""
+"  -d, --delete                  slet den navngivne kontos adgangskode\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -e, --expire                  force expire the password for the named "
 "account\n"
-msgstr "  -r, --system                  opret en systemkonto\n"
+msgstr ""
+"  -e, --expire                  gennemtving udløb af den navngivne kontos\n"
+"                                adgangskode\n"
 
-#, fuzzy
-#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
 msgid "  -k, --keep-tokens             change password only if expired\n"
-msgstr "  -e, --encrypted               angivne adgangskoder er krypterede\n"
+msgstr ""
+"  -k, --keep-tokens             skift kun adgangskode, hvis den er udløbet\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password ADGANGSKODE    ændr adgangskoden til denne (krypteret)\n"
-"                                ADGANGSKODE\n"
+"  -i, --inactive INAKTIVE       set udløbne adgangskoder til INAKTIVE\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -l, --lock                    lock the password of the named account\n"
-msgstr "  -u, --uid UID                 bruger-id for den nye konto\n"
+msgstr ""
+"  -l, --lock                    læs den navngivne konto\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              antal SHA-runder for SHA*\n"
-"                                crypt-algoritmerne\n"
+"  -n, --mindays MIN_DAGE        angiv minimale antal dage inden skift af\n"
+"                                adgangskode til MIN_DAGE\n"
 
 msgid "  -q, --quiet                   quiet mode\n"
 msgstr "  -q, --quiet                   tavs tilstand\n"
@@ -1555,33 +1479,30 @@
 msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 msgstr ""
+"  -r, --repository SAMLING      skift adgangskode i samlingen SAMLING\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -S, --status                  report password status on the named account\n"
-msgstr "  -r, --system                  opret en systemkonto\n"
+msgstr ""
+"  -S, --status                  raporter den navngivne kontos\n"
+"                                adgangskodestatus\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
-msgstr "  -u, --uid UID                 bruger-id for den nye konto\n"
+msgstr ""
+"  -u, --unlock                  åbn adgangskoden på den navngivne konto\n"
 
 msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -w, --warndays ADVAR_DAGE     advar om udløb i ADVAR_DAGE dage\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              antal SHA-runder for SHA*\n"
-"                                crypt-algoritmerne\n"
+"  -x, --maxdays MAKS_DAGE       sæt det maksimale antal dage inden skift af\n"
+"                                adgangskode til MAKS_DAGE\n"
 
 msgid "Old password: "
 msgstr "Gammel adgangskode: "
@@ -1664,31 +1585,23 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s: Information om udløb af adgangskode blev ændret.\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Brug: %s [tilvalg] [handling]\n"
+"Brug: %s [tilvalg] [adgangskode]\n"
 "\n"
 "Tilvalg:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd [shadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Brug: %s [tilvalg] [handling]\n"
+"Brug: %s [tilvalg] [adgangskode [skygge]]\n"
 "\n"
 "Tilvalg:\n"
 
@@ -1884,10 +1797,9 @@
 msgid "%s: Cannot drop the controlling terminal\n"
 msgstr "%s: Kan ikke fjerne indholdet af %s: %s\n"
 
-#, fuzzy, c-format
-#| msgid "Cannot execute %s"
+#, c-format
 msgid "Cannot execute %s\n"
-msgstr "Kan ikke udføre %s"
+msgstr "Kan ikke udføre %s\n"
 
 msgid "No password file"
 msgstr "Ingen adgangskodefil"
@@ -1930,10 +1842,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: Linje for lang i %s: %s..."
 
-#, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
+#, c-format
 msgid "%s: rename: %s: %s\n"
-msgstr "%s: Omdøb: %s: %s"
+msgstr "%s: Omdøb: %s: %s\n"
 
 #, c-format
 msgid "%s: group '%s' is a NIS group.\n"
@@ -1943,11 +1854,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: Der er angivet for mange grupper (højst %d).\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "       %s -D\n"
@@ -1956,6 +1863,8 @@
 "Options:\n"
 msgstr ""
 "Brug: %s [tilvalg] LOGIND\n"
+"      %s -D\n"
+"      %s -D [tilvalg]\n"
 "\n"
 "Tilvalg:\n"
 
@@ -2157,24 +2066,16 @@
 "%s: Advarsel: Hjemmemappen findes allerede.\n"
 "Kopierer ikke nogen filer til den fra skelet-mappen.\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -f, --force                   exit successfully if the group already "
-#| "exists,\n"
-#| "                                and cancel -g if the GID is already used\n"
 msgid ""
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
 msgstr ""
-"  -f, --force                   afslut hvis gruppen allerede findes,\n"
-"                                 og afbryd -g hvis GID'en allerede bruges\n"
+"  -f, --force                   gennemtving fjernelse af filer,\n"
+"                                selvom de ikke ejers af brugeren\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -r, --remove                  remove home directory and mail spool\n"
 msgstr ""
-"  -r, --reset                   nulstil tælleren for mislykkede logind\n"
+"  -r, --remove                  fjern home-mappen og postkøen\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot remove the primary group of user '%s'\n"
@@ -2238,43 +2139,34 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: Fejl under fjernelse af mappen %s\n"
 
-#, fuzzy
-#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
 msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
-msgstr "  -c, --comment KOMMENTAR       GECOS-felt på den nye konto\n"
+msgstr "  -c, --comment KOMMENTAR       ny værdi til GECOS-feltet\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
 "  -d, --home HOME_DIR           new home directory for the user account\n"
-msgstr "  -d, --home-dir HJEMMEMAPPE    hjemmemappe på den nye konto\n"
+msgstr ""
+"  -d, --home-dir HJEMMEMAPPE    den nye brugerkontos hjemmemappe\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-msgstr "  -e, --expiredate UDLØBSDATO   udløbsdato på den nye konto\n"
+msgstr ""
+"  -e, --expiredate UDLØBSDATO   sæt kontoens udløbsdato til UDLØBSDATO\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password ADGANGSKODE    ændr adgangskoden til denne (krypteret)\n"
-"                                ADGANGSKODE\n"
+"  -f, --inactive INAKTIV        sæt inaktiv adgangskode til INAKTIV efter\n"
+"                                udløb\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
-msgstr "  -g, --gid GID                 anvend GID for den nye gruppe\n"
+msgstr ""
+"  -g, --gid GRUPPE              gennemtving brugen af GRUPPE til den nye\n"
+"                                primære gruppe\n"
 
-#, fuzzy
-#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
 msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-msgstr "  -M, --members BRUGER,...      angiv medlemslisten for GRUPPE\n"
+msgstr ""
+"  -G, --groups GRUPPER          ny liste med supplerende grupper\n"
 
 msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
@@ -2284,53 +2176,37 @@
 
 msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
 msgstr ""
+"  -l, --login NYT_LOGIND        ny værdi til logindnavnet\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -L, --lock                    lock the user account\n"
-msgstr "  -u, --uid UID                 bruger-id for den nye konto\n"
+msgstr ""
+"  -L, --lock                    lås brugerkontoen\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
-#| "the\n"
-#| "                                new account\n"
 msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
 msgstr ""
-"  -b, --base-dir BASIS_MAP      basismappe for hjemmemappen på den nye\n"
-"                                konto\n"
+"  -m, --move-home               flyt indholdet af hjemmemappen til den nye\n"
+"                                placering (brug kun sammen med -d)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
-#| "GID\n"
 msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
 msgstr ""
-"  -o, --non-unique              tillad at bruge en tilsvarende (der ikke er "
-"unik) GID\n"
+"  -o, --non-unique              tillad oprettelse af ens (der ikke er unik) UID\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       use this encrypted password for the new "
-#| "group\n"
 msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
 msgstr ""
-"  -p, --password ADGANGSKODE     brug denne krypterede adgangskode for den "
-"nye gruppe\n"
+"  -p, --password ADGANGSKODE    brug krypteret adgangskode til den nye\n"
+"                                adgangskode\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -u, --uid UID                 new UID for the user account\n"
-msgstr "  -u, --uid UID                 bruger-id for den nye konto\n"
+msgstr ""
+"  -u, --uid UID                 ny UID til brugerkontoen\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -U, --unlock                  unlock the user account\n"
-msgstr "  -u, --uid UID                 bruger-id for den nye konto\n"
+msgstr ""
+"  -U, --unlock                  åbn brugerkontoen\n"
 
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "

Modified: upstream/trunk/po/de.po
===================================================================
--- upstream/trunk/po/de.po	2011-12-09 21:31:39 UTC (rev 3652)
+++ upstream/trunk/po/de.po	2011-12-09 21:35:47 UTC (rev 3653)
@@ -9,7 +9,7 @@
 "Project-Id-Version: shadow 4.1.4.2\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2011-11-13 18:42+0100\n"
-"PO-Revision-Date: 2011-04-15 21:22+0100\n"
+"PO-Revision-Date: 2011-11-22 18:39+0100\n"
 "Last-Translator: Holger Wansing <linux at wansing-online.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
 "Language: de\n"
@@ -225,10 +225,9 @@
 "%s: Ungültige Konfiguration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
 "(%lu)\n"
 
-#, fuzzy, c-format
-#| msgid "failed to allocate memory"
+#, c-format
 msgid "%s: failed to allocate memory: %s\n"
-msgstr "Speicherreservierung fehlgeschlagen"
+msgstr "%s: Speicherreservierung fehlgeschlagen: %s\n"
 
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
@@ -387,66 +386,51 @@
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
 msgstr ""
+"  -d, --lastday LETZTER_TAG     Tag der letzten Passwortänderung auf\n"
+"                                LETZTER_TAG setzen\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
 msgstr ""
-"  -e, --expiredate ABL_DATUM    Das Ablaufdatum des neuen Benutzerzugangs\n"
+"  -E, --expiredate ABL_DATUM    Ablaufdatum des Benutzerzugangs auf\n"
+"                                ABL_DATUM setzen\n"
 
 msgid "  -h, --help                    display this help message and exit\n"
 msgstr "  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password PASSWORT       Das Passwort auf dieses (verschlüsselte)\n"
-"                                PASSWORT ändern\n"
+ "  -I, --inactive INAKTIV        Passwort nach Ablauf von INAKTIV\n"
+ "                                deaktivieren\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -l, --list                    show account aging information\n"
 msgstr ""
-"  -r, --reset                   Zähler fehlgeschlagener Anmeldungen\n"
-"                                zurücksetzen\n"
+"  -l, --list                    Informationen zu Ablaufdaten usw. anzeigen\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              Anzahl der SHA-Runden für den SHA*-\n"
-"                                Verschlüsselungs-Algorithmus\n"
+"  -m, --mindays MIN_TAGE        Minimale Anzahl der Tage vor\n"
+"                                Passwortänderung auf MIN_TAGE setzen\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              Anzahl der SHA-Runden für den SHA*-\n"
-"                                Verschlüsselungs-Algorithmus\n"
+"  -M, --maxdays MAX_TAGE        Maximale Anzahl der Tage vor\n"
+"                                Passwortänderung auf MAX_TAGE setzen\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir HOME_VERZ      Home-Verzeichnis des neuen Benutzers\n"
+msgstr ""
 
 msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -W, --warndays WARN_TAGE      Anzahl der Tage für Ablaufwarnung auf\n"
+"                                WARN_TAGE setzen\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr ""
@@ -558,17 +542,13 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: Fehler beim Ändern der Felder\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [LOGIN]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Aufruf: %s [Optionen] BENUTZERZUGANG\n"
+"Aufruf: %s [Optionen] [BENUTZERZUGANG]\n"
 "\n"
 "Optionen:\n"
 
@@ -584,10 +564,8 @@
 msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -u, --help                    display this help message and exit\n"
-msgstr "  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+msgstr "  -u, --help                    Diese Hilfe anzeigen, sonst nichts\n"
 
 msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
 msgstr ""
@@ -741,11 +719,9 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: Zeile %d: Benutzer »%s« ist nicht vorhanden.\n"
 
-#, fuzzy
-#| msgid "  -s, --shell SHELL             login shell of the new account\n"
 msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"  -s, --shell SHELL             Die Login-Shell des neuen Benutzerzugangs\n"
+"  -s, --shell SHELL             Neue Login-Shell für den Benutzerzugang\n"
 
 msgid "Login Shell"
 msgstr "Login-Shell"
@@ -774,34 +750,22 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: Warnung: %s nicht ausführbar.\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -u, --user                    which user's tcb shadow file to edit\n"
 msgid "  -c, --check                   check the user's password expiration\n"
 msgstr ""
-"  -u, --user                    Die tcb-shadow-Datei welches Benutzers\n"
-"                                editiert werden soll\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -f, --force                   force password change if the user's "
 "password\n"
 "                                is expired\n"
 msgstr ""
-"  -m, --md5                     Die Klartext-Passwörter mittels MD5-\n"
-"                                Algorithmus verschlüsseln\n"
 
 #, c-format
 msgid "%s: options %s and %s conflict\n"
 msgstr "%s: Optionen %s und %s stehen im Konflikt zueinander.\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: unexpected argument: %s\n"
+#, c-format
 msgid "%s: unexpected argument: %s\n"
-msgstr "lastlog: Unerwartetes Argument: %s\n"
+msgstr "%s: Unerwartetes Argument: %s\n"
 
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
@@ -844,10 +808,9 @@
 "oder\n"
 "                                -l aufgerufen) nur für BENUTZERZUGANG\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+#, c-format
 msgid "%s: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: Auslesen des Eintrags für UID %lu fehlgeschlagen\n"
+msgstr "%s: Auslesen des Eintrags für UID %lu fehlgeschlagen\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Fehlver. Maximum Letzter                  Auf\n"
@@ -860,32 +823,27 @@
 msgid " [%lds lock]"
 msgstr " [%lds Sperre]"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, c-format
 msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr ""
-"faillog: Zurücksetzen des Zählers fehlgeschlagener Anmeldungen für UID %lu "
+"%s: Zurücksetzen des Zählers fehlgeschlagener Anmeldungen für UID %lu "
 "fehlgeschlagen\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set max for UID %lu\n"
-msgstr "faillog: Setzen des Max-Werts für UID %lu fehlgeschlagen\n"
+msgstr "%s: Setzen des Max-Werts für UID %lu fehlgeschlagen\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set locktime for UID %lu\n"
-msgstr "faillog: Setzen der Sperrzeit für UID %lu fehlgeschlagen\n"
+msgstr "%s: Setzen der Sperrzeit für UID %lu fehlgeschlagen\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Unknown user or range: %s\n"
+#, c-format
 msgid "%s: Unknown user or range: %s\n"
-msgstr "lastlog: Unbekannter Benutzer oder Bereich: %s\n"
+msgstr "%s: Unbekannter Benutzer oder Bereich: %s\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
+#, c-format
 msgid "%s: Cannot get the size of %s: %s\n"
-msgstr "lastlog: Auslesen der Größe von %s fehlgeschlagen: %s\n"
+msgstr "%s: Auslesen der Größe von %s fehlgeschlagen: %s\n"
 
 #, c-format
 msgid ""
@@ -903,10 +861,8 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete BENUTZER         BENUTZER aus GRUPPE entfernen\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir HOME_VERZ      Home-Verzeichnis des neuen Benutzers\n"
+msgstr ""
 
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         Passwort der GRUPPE entfernen\n"
@@ -1044,8 +1000,7 @@
 msgid "%s: GID '%lu' already exists\n"
 msgstr "%s: GID »%lu« existiert bereits.\n"
 
-#, fuzzy, c-format
-#| msgid "%s: Cannot determine your user name.\n"
+#, c-format
 msgid "%s: Cannot setup cleanup service.\n"
 msgstr "%s: Ihr Benutzername konnte nicht bestimmt werden.\n"
 
@@ -1163,20 +1118,16 @@
 msgstr "%s: Unbekannter Benutzer %s\n"
 
 #, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+# NOTE: group is a file (/etc/group)
+#| msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
 "\n"
 "Options:\n"
-msgstr ""
-"Aufruf: %s [Optionen [aktion]\n"
-"\n"
-"Optionen:\n"
+msgstr "Aufruf: %s [-r] [-s] [Gruppe [gshadow]]\n"
 
 #, fuzzy, c-format
+# NOTE: group is a file (/etc/group)
 #| msgid ""
 #| "Usage: %s [options] [action]\n"
 #| "\n"
@@ -1290,30 +1241,23 @@
 msgid " groups="
 msgstr " Gruppen="
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
-"  -t, --time TAGE               Aufzeichnungen fehlgeschlagener Anmeldungen\n"
-"                                anzeigen, die jünger als TAGE sind\n"
+"  -b, --before TAGE             Nur lastlog-Aufzeichnungen zeigen, die älter\n"
+"                                als TAGE sind\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
 msgstr ""
-"  -t, --time TAGE               Aufzeichnungen fehlgeschlagener Anmeldungen\n"
-"                                anzeigen, die jünger als TAGE sind\n"
+"  -t, --time TAGE               Nur lastlog-Aufzeichnungen zeigen, die jünger\n"
+"                                als TAGE sind\n"
 
 msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
+"  -u, --user BENUTZERZUGANG     lastlog-Eintrag für BENUTZERZUGANG anzeigen\n"
 
 msgid "Username         Port     From             Latest"
 msgstr "Benutzername     Port     Von              Letzter"
@@ -1522,62 +1466,46 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: Zeile %d: Eintrag kann nicht aktualisiert werden.\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
 "  -a, --all                     report password status on all accounts\n"
 msgstr ""
-"  -a, --all                     Aufzeichnungen fehlgeschlagener Anmeldungen\n"
-"                                für alle Benutzer anzeigen\n"
+"  -a, --all                     Passwort-Status für alle Benutzerzugänge\n"
+"                                anzeigen\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -d, --delete                  delete the password for the named account\n"
-msgstr "  -r, --system                  Eine Systemgruppe erstellen\n"
+msgstr ""
+"  -d, --delete                  Passwort für den Benutzerzugang löschen\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -e, --expire                  force expire the password for the named "
 "account\n"
-msgstr "  -r, --system                  Eine Systemgruppe erstellen\n"
+msgstr ""
+"  -e, --expire                  Ablauf des Passworts für den Benutzerzugang\n"
+"                                erzwingen\n"
 
-#, fuzzy
-#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
 msgid "  -k, --keep-tokens             change password only if expired\n"
 msgstr ""
-"  -e, --encrypted               Angegebene Passwörter sind verschlüsselt\n"
+"  -k, --keep-tokens             Passwort nur ändern falls abgelaufen\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password PASSWORT       Das Passwort auf dieses (verschlüsselte)\n"
-"                                PASSWORT ändern\n"
+"  -i, --inactive INAKTIV        Passwort nach Ablauf von INAKTIV\n"
+"                                deaktivieren\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -l, --lock                    lock the password of the named account\n"
 msgstr ""
-"  -u, --uid UID                 Benutzer-ID (UID) des neuen Benutzerzugangs\n"
+"  -l, --lock                    Benutzerzugang sperren\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              Anzahl der SHA-Runden für den SHA*-\n"
-"                                Verschlüsselungs-Algorithmus\n"
+"  -n, --mindays MIN_TAGE        Minimale Anzahl der Tage vor\n"
+"                                Passwortänderung auf MIN_TAGE setzen\n"
 
 msgid "  -q, --quiet                   quiet mode\n"
 msgstr "  -q, --quiet                   Nicht so geschwätzig verhalten\n"
@@ -1585,34 +1513,30 @@
 msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 msgstr ""
+"  -r, --repository REPOSITORY   Passwort ändern in REPOSITORY\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -S, --status                  report password status on the named account\n"
-msgstr "  -r, --system                  Eine Systemgruppe erstellen\n"
+msgstr ""
+"  -S, --status                  Passwort-Status des Benutzerzugangs anzeigen\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
 msgstr ""
-"  -u, --uid UID                 Benutzer-ID (UID) des neuen Benutzerzugangs\n"
+"  -u, --unlock                  Benutzerzugang entsperren\n"
 
 msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -w, --warndays WARN_TAGE      Anzahl der Tage für Ablaufwarnung auf\n"
+"                                WARN_TAGE setzen\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              Anzahl der SHA-Runden für den SHA*-\n"
-"                                Verschlüsselungs-Algorithmus\n"
+"  -x, --maxdays MAX_TAGE        Maximale Anzahl der Tage vor\n"
+"                                Passwortänderung auf MAX_TAGE setzen\n"
 
 msgid "Old password: "
 msgstr "Altes Passwort: "
@@ -1920,10 +1844,9 @@
 msgid "%s: Cannot drop the controlling terminal\n"
 msgstr "%s: Inhalt von %s kann nicht gelöscht werden: %s\n"
 
-#, fuzzy, c-format
-#| msgid "Cannot execute %s"
+#, c-format
 msgid "Cannot execute %s\n"
-msgstr "%s konnte nicht ausgeführt werden"
+msgstr "%s konnte nicht ausgeführt werden\n"
 
 msgid "No password file"
 msgstr "Keine Passwortdatei"
@@ -1966,10 +1889,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: Zeile zu lang in %s: %s..."
 
-#, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
+#, c-format
 msgid "%s: rename: %s: %s\n"
-msgstr "%s: Umbenennen: %s: %s"
+msgstr "%s: Umbenennen: %s: %s\n"
 
 #, c-format
 msgid "%s: group '%s' is a NIS group.\n"
@@ -1979,11 +1901,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: Zu viele Gruppen angegeben (max. %d).\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "       %s -D\n"
@@ -1992,6 +1910,8 @@
 "Options:\n"
 msgstr ""
 "Aufruf: %s [Optionen] BENUTZERZUGANG\n"
+"        %s -D\n"
+"        %s -D [Optionen]\n"
 "\n"
 "Optionen:\n"
 
@@ -2206,27 +2126,17 @@
 "%s: Warnung: Das Home-Verzeichnis existiert bereits.\n"
 "Es werden keine Dateien vom skel-Verzeichnis dorthin kopiert.\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -f, --force                   exit successfully if the group already "
-#| "exists,\n"
-#| "                                and cancel -g if the GID is already used\n"
 msgid ""
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
 msgstr ""
-"  -f, --force                   Ohne Fehler beenden, falls die Gruppe\n"
-"                                bereits existiert\n"
-"                                und Operation für -g abbrechen, falls die\n"
-"                                GID bereits verwendet wird\n"
+"  -f, --force                   Entfernen von Dateien erzwingen, auch wenn\n"
+"                                sie nicht Eigentum des zu löschenden\n"
+"                                Benutzers sind\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -r, --remove                  remove home directory and mail spool\n"
 msgstr ""
-"  -r, --reset                   Zähler fehlgeschlagener Anmeldungen\n"
-"                                zurücksetzen\n"
+"  -r, --remove                  Entferne Home-Verzeichnis und Mail-Spool\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot remove the primary group of user '%s'\n"
@@ -2293,107 +2203,79 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: Fehler beim Löschen des Verzeichnisses %s\n"
 
-#, fuzzy
-#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
 msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
 msgstr ""
-"  -c, --comment KOMMENTAR       KOMMENTAR für das GECOS-Feld des neuen\n"
-"                                Benutzers\n"
+"  -c, --comment KOMMENTAR       Neuer KOMMENTAR im GECOS-Feld\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
 "  -d, --home HOME_DIR           new home directory for the user account\n"
-msgstr "  -d, --home-dir HOME_VERZ      Home-Verzeichnis des neuen Benutzers\n"
+msgstr ""
+"  -d, --home HOME_DIR           Neues Home-Verzeichnis für den Benutzer-\n"
+"                                zugang\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
 msgstr ""
-"  -e, --expiredate ABL_DATUM    Das Ablaufdatum des neuen Benutzerzugangs\n"
+"  -e, --expiredate ABL_DATUM    Ablaufdatum auf ABL_DATUM setzen\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password PASSWORT       Das Passwort auf dieses (verschlüsselte)\n"
-"                                PASSWORT ändern\n"
+"  -f, --inactive INAKTIV        Passwort nach Ablauf von INAKTIV\n"
+"                                deaktivieren\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
-msgstr "  -g, --gid GID                 GID für die neue Gruppe benutzen\n"
+msgstr ""
+"  -g, --gid GRUPPE              Erzwinge GRUPPE als neue primäre Gruppe\n"
 
-#, fuzzy
-#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
 msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
 msgstr ""
-"  -M, --members BENUTZER,...    Liste der Mitglieder von GRUPPE setzen\n"
+"  -G, --groups GRUPPEN          Neue Liste zusätzlicher GRUPPEN\n"
 
 msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
 msgstr ""
+"  -a, --append                  Benutzer zu zusätzlichen Gruppen hinzufügen,\n"
+"                                die mit der Option -G angegeben werden, ohne\n"
+"                                ihn dabei aus anderen Gruppen zu entfernen\n"
 
 msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
 msgstr ""
+"  -l, --login NEUER_NAME        Neuer Wert für den Namen des Benutzerzugangs\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -L, --lock                    lock the user account\n"
 msgstr ""
-"  -u, --uid UID                 Benutzer-ID (UID) des neuen Benutzerzugangs\n"
+"  -L, --lock                    Den Benutzerzugang sperren\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
-#| "the\n"
-#| "                                new account\n"
 msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
 msgstr ""
-"  -b, --base-dir BASIS_VERZ     Basisverzeichnis für das\n"
-"                                Home-Verzeichnis des neuen Benutzers\n"
+"  -m, --move-home               Den Inhalt des Home-Verzeichnisses an den\n"
+"                                neuen Ort verschieben (nur mit -d benutzen)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
-#| "GID\n"
 msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
 msgstr ""
-"  -o, --non-unique              Verwenden einer nicht einmaligen "
-"(doppelten)\n"
-"                                GID erlauben\n"
+"  -o, --non-unique              Benutzung von doppelter (nicht einmaliger)\n"
+"                                UID erlauben\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       use this encrypted password for the new "
-#| "group\n"
 msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
 msgstr ""
-"  -p, --password PASSWORT       Dieses verschlüsselte PASSWORT für die\n"
-"                                neue Gruppe verwenden\n"
+"  -p, --password PASSWORD       Ein verschlüsseltes Passwort als neues\n"
+"                                Passwort verwenden\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -u, --uid UID                 new UID for the user account\n"
 msgstr ""
-"  -u, --uid UID                 Benutzer-ID (UID) des neuen Benutzerzugangs\n"
+"  -u, --uid UID                 Neue UID des Benutzerzugangs\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -U, --unlock                  unlock the user account\n"
 msgstr ""
-"  -u, --uid UID                 Benutzer-ID (UID) des neuen Benutzerzugangs\n"
+"  -U, --unlock                  Den Benutzerzugang entsperren\n"
 
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "

Modified: upstream/trunk/po/es.po
===================================================================
--- upstream/trunk/po/es.po	2011-12-09 21:31:39 UTC (rev 3652)
+++ upstream/trunk/po/es.po	2011-12-09 21:35:47 UTC (rev 3653)
@@ -33,7 +33,7 @@
 "Project-Id-Version: shadow 4.1.4.2\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2011-11-13 18:42+0100\n"
-"PO-Revision-Date: 2011-06-09 20:22+0100\n"
+"PO-Revision-Date: 2011-11-23 23:56+0100\n"
 "Last-Translator: Francisco Javier Cuadrado <fcocuadrado at gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
 "Language: es\n"
@@ -249,10 +249,9 @@
 "%s: configuración incorrecta: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
 "(%lu)\n"
 
-#, fuzzy, c-format
-#| msgid "failed to allocate memory"
+#, c-format
 msgid "%s: failed to allocate memory: %s\n"
-msgstr "se produjo un fallo al reservar memoria"
+msgstr "%s: se produjo un fallo al reservar memoria: %s\n"
 
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
@@ -415,66 +414,51 @@
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
 msgstr ""
+"  -d, --lastday ÚLTIMO_DÍA      establece el día del último cambio de la\n"
+"                                contraseña a ÚLTIMO_DÍA\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
 msgstr ""
-"  -e, --expiredate FECHA_CADUCIDAD  fecha de caducidad de la nueva cuenta\n"
+"  -E, --expiredate FECHA_CAD    establece la fecha de caducidad a FECHA_CAD\n"
 
 msgid "  -h, --help                    display this help message and exit\n"
 msgstr ""
 "  -h, --help                    muestra este mensaje de ayuda y termina\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password CONTRASEÑA     cambia la contraseña a CONTRASEÑA (cifrada)\n"
+"  -I, --inactive INACTIVA       deshabilita la cuenta después de INACTIVA\n"
+"                                días de la fecha de caducidad\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -l, --list                    show account aging information\n"
 msgstr ""
-"  -r, --reset                   reinicia el contador de accesos fallidos\n"
+"  -l, --list                    muestra la información de la edad de la cuenta\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              número de rondas SHA para los algoritmos\n"
-"                                de cifrado SHA*\n"
+"  -m, --mindays DÍAS_MIN        establece el número mínimo de días antes de\n"
+"                                cambiar la contraseña a DÍAS_MIN\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              número de rondas SHA para los algoritmos\n"
-"                                de cifrado SHA*\n"
+"  -M, --maxdays DÍAS_MAX        establece el número máximo de días antes de\n"
+"                                cambiar la contraseña a DÍAS_MAX\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
 msgstr ""
-"  -d, --home-dir DIR_PERSONAL   directorio personal de la nueva cuenta\n"
 
 msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -W, --warndays DÍAS_AVISO     establece los días de aviso de expiración a\n"
+"                                DÍAS_AVISO\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr ""
@@ -585,17 +569,13 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: error cambiando los campos\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [LOGIN]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Modo de uso: %s [opciones] USUARIO\n"
+"Modo de uso: %s [opciones] [USUARIO]\n"
 "\n"
 "Opciones:\n"
 
@@ -611,11 +591,9 @@
 msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -u, --help                    display this help message and exit\n"
 msgstr ""
-"  -h, --help                    muestra este mensaje de ayuda y termina\n"
+"  -u, --help                    muestra este mensaje de ayuda y termina\n"
 
 msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
 msgstr ""
@@ -768,10 +746,10 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: línea %d: el usuario «%s» no existe\n"
 
-#, fuzzy
-#| msgid "  -s, --shell SHELL             login shell of the new account\n"
 msgid "  -s, --shell SHELL             new login shell for the user account\n"
-msgstr "  -s, --shell CONSOLA           consola de acceso de la nueva cuenta\n"
+msgstr ""
+"  -s, --shell CONSOLA           nueva consola de acceso para la cuenta del\n"
+"                                usuario\n"
 
 msgid "Login Shell"
 msgstr "Consola de acceso"
@@ -800,35 +778,22 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: aviso: %s no es un ejecutable\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -u, --user                    which user's tcb shadow file to edit\n"
 msgid "  -c, --check                   check the user's password expiration\n"
 msgstr ""
-"  -u, --user                    indica que fichero tcb de shadow del "
-"usuario\n"
-"                                editar\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -f, --force                   force password change if the user's "
 "password\n"
 "                                is expired\n"
 msgstr ""
-"  -m, --md5                     cifra la contraseña en claro utilizando\n"
-"                                el algoritmo MD5\n"
 
 #, c-format
 msgid "%s: options %s and %s conflict\n"
 msgstr "%s: las opciones %s y %s están en conflicto\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: unexpected argument: %s\n"
+#, c-format
 msgid "%s: unexpected argument: %s\n"
-msgstr "lastlog: argumento inesperado: %s\n"
+msgstr "%s: argumento inesperado: %s\n"
 
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
@@ -872,10 +837,9 @@
 "USUARIO\n"
 "                                indicado\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+#, c-format
 msgid "%s: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: Se produjo un fallo al conseguir la entrada para el UID %lu\n"
+msgstr "%s: Se produjo un fallo al conseguir la entrada para el UID %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Usuario     Fallos Máximo Último                   Activo\n"
@@ -888,34 +852,29 @@
 msgid " [%lds lock]"
 msgstr "[bloqueados %lds]"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, c-format
 msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr ""
-"faillog: se produjo un fallo al reiniciar el contador de fallos para el UID "
+"%s: se produjo un fallo al reiniciar el contador de fallos para el UID "
 "%lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set max for UID %lu\n"
-msgstr "faillog: se produjo un fallo al establecer max para el UID %lu\n"
+msgstr "%s: se produjo un fallo al establecer max para el UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr ""
-"faillog: se produjo un fallo al establecer el tiempo de bloqueo para el UID "
+"%s: se produjo un fallo al establecer el tiempo de bloqueo para el UID "
 "%lu\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Unknown user or range: %s\n"
+#, c-format
 msgid "%s: Unknown user or range: %s\n"
-msgstr "lastlog: usuario o rango desconocido: %s\n"
+msgstr "%s: usuario o rango desconocido: %s\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
+#, c-format
 msgid "%s: Cannot get the size of %s: %s\n"
-msgstr "lastlog: no se pudo conseguir el tamaño de %s: %s\n"
+msgstr "%s: no se pudo conseguir el tamaño de %s: %s\n"
 
 #, c-format
 msgid ""
@@ -933,11 +892,8 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete USUARIO          elimina USUARIO del GRUPO\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
 msgstr ""
-"  -d, --home-dir DIR_PERSONAL   directorio personal de la nueva cuenta\n"
 
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         elimina la contraseña de GRUPO\n"
@@ -1190,49 +1146,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: usuario desconocido %s\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Modo de uso: %s [opciones] [acción]\n"
+"Modo de uso: %s [opciones] [grupo [gshadow]]\n"
 "\n"
 "Opciones:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Modo de uso: %s [opciones] [acción]\n"
+"Modo de uso: %s [opciones] [group]\n"
 "\n"
 "Opciones:\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -r, --read-only               display errors and warnings\n"
 "                                but do not change files\n"
 msgstr ""
-"  -s, --sha-rounds              número de rondas SHA para los algoritmos\n"
-"                                de cifrado SHA*\n"
 
-#, fuzzy
-#| msgid "  -l, --list                    list the members of the group\n"
 msgid "  -s, --sort                    sort entries by UID\n"
-msgstr "  -l, --list                    lista los miembros del grupo\n"
+msgstr ""
 
 #, c-format
 msgid "%s: -s and -r are incompatible\n"
@@ -1318,32 +1258,23 @@
 msgid " groups="
 msgstr "grupos="
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
-"  -t, --time DÍAS               muestra los registros de faillog más "
-"recientes\n"
-"                                que DÍAS\n"
+"  -b, --before DÍAS             muestra los registros de «lastlog» anteriores\n"
+"                                a DÍAS\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
 msgstr ""
-"  -t, --time DÍAS               muestra los registros de faillog más "
-"recientes\n"
-"                                que DÍAS\n"
+"  -t, --time DÍAS               muestra sólo los registros de «lastlog» más\n"
+"                                recientes que DÍAS\n"
 
 msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
+"  -u, --user USUARIO            muestra el registro de «lastlog» del USUARIO\n"
 
 msgid "Username         Port     From             Latest"
 msgstr "Nombre           Puerto   De               Último"
@@ -1546,62 +1477,46 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: línea %d: no se puede actualizar la entrada\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
 "  -a, --all                     report password status on all accounts\n"
 msgstr ""
-"  -a, --all                     muestra los registros de faillog para\n"
-"                                todos los usuarios\n"
+"  -a, --all                     informa del estado de las contraseñas de\n"
+"                                todas las cuentas\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -d, --delete                  delete the password for the named account\n"
-msgstr "  -r, --system                  crea una cuenta del sistema\n"
+msgstr ""
+"  -d, --delete                  borra la contraseña para la cuenta indicada\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -e, --expire                  force expire the password for the named "
 "account\n"
-msgstr "  -r, --system                  crea una cuenta del sistema\n"
+msgstr ""
+"  -e, --expire                  fuerza a que la contraseña de la cuenta\n"
+"                                caduque\n"
 
-#, fuzzy
-#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
 msgid "  -k, --keep-tokens             change password only if expired\n"
 msgstr ""
-"  -e, --encrypted               se cifran las contraseñas proporcionadas\n"
+"  -k, --keep-tokens             cambia la contraseña sólo si ha caducado\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password CONTRASEÑA     cambia la contraseña a CONTRASEÑA (cifrada)\n"
+"  -i, --inactive INACTIVO       establece la contraseña inactiva después de\n"
+"                                caducar a INACTIVO\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -l, --lock                    lock the password of the named account\n"
 msgstr ""
-"  -u, --uid UID                 identificador del usuario de la nueva "
-"cuenta\n"
+"  -l, --lock                    bloquea la contraseña de la cuenta indicada\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              número de rondas SHA para los algoritmos\n"
-"                                de cifrado SHA*\n"
+"  -n, --mindays DÍAS_MIN        establece el número mínimo de días antes\n"
+"                                de que se cambie la contraseña a DÍAS_MIN\n"
 
 msgid "  -q, --quiet                   quiet mode\n"
 msgstr "  -q, --quiet                   modo silencioso\n"
@@ -1609,35 +1524,30 @@
 msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 msgstr ""
+"  -r, --repository REP          cambia la contraseña en el repositorio REP\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -S, --status                  report password status on the named account\n"
-msgstr "  -r, --system                  crea una cuenta del sistema\n"
+msgstr ""
+"  -S, --status                  informa del estado de la contraseña la cuenta\n"
+"                                indicada\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
 msgstr ""
-"  -u, --uid UID                 identificador del usuario de la nueva "
-"cuenta\n"
+"  -u, --unlock                  desbloquea la contraseña de la cuenta indicada\n"
 
 msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -w, --warndays DÍAS_AVISO     establece el aviso de caducidad a DÍAS_AVISO\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              número de rondas SHA para los algoritmos\n"
-"                                de cifrado SHA*\n"
+"  -x, --maxdays DÍAS_MAX        establece el número máximo de días antes de\n"
+"                                cambiar la contraseña a DÍAS_MAX\n"
 
 msgid "Old password: "
 msgstr "Contraseña antigua: "
@@ -1735,17 +1645,13 @@
 "\n"
 "Opciones:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd [shadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Modo de uso: %s [opciones] [acción]\n"
+"Modo de uso: %s [opciones] [passwd [shadow]]\n"
 "\n"
 "Opciones:\n"
 
@@ -1945,10 +1851,9 @@
 msgid "%s: Cannot drop the controlling terminal\n"
 msgstr "%s: no se pudo eliminar el contenido de %s: %s\n"
 
-#, fuzzy, c-format
-#| msgid "Cannot execute %s"
+#, c-format
 msgid "Cannot execute %s\n"
-msgstr "No se puede ejecutar %s"
+msgstr "No se puede ejecutar %s\n"
 
 msgid "No password file"
 msgstr "Sin fichero de contraseñas"
@@ -1994,10 +1899,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: línea demasiado larga en %s: %s..."
 
-#, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
+#, c-format
 msgid "%s: rename: %s: %s\n"
-msgstr "%s: renombrar: %s: %s"
+msgstr "%s: renombrar: %s: %s\n"
 
 #, c-format
 msgid "%s: group '%s' is a NIS group.\n"
@@ -2007,11 +1911,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: demasiados grupos especificados (el máximo es %d).\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "       %s -D\n"
@@ -2020,6 +1920,8 @@
 "Options:\n"
 msgstr ""
 "Modo de uso: %s [opciones] USUARIO\n"
+"             %s -D\n"
+"             %s -D [opciones]\n"
 "\n"
 "Opciones:\n"
 
@@ -2232,24 +2134,17 @@
 "%s: aviso: el directorio personal ya existe.\n"
 "No se va a copiar ningún fichero del directorio «skel» en él.\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -f, --force                   exit successfully if the group already "
-#| "exists,\n"
-#| "                                and cancel -g if the GID is already used\n"
 msgid ""
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
 msgstr ""
-"  -f, --force                   termina si el grupo ya existe, y cancela -g\n"
-"                                si el GID ya se está en uso\n"
+"  -f, --force                   forzar la eliminación de los ficheros,\n"
+"                                incluso si no pertenecen al usuario\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -r, --remove                  remove home directory and mail spool\n"
 msgstr ""
-"  -r, --reset                   reinicia el contador de accesos fallidos\n"
+"  -r, --remove                  elimina el directorio personal y el buzón de\n"
+"                                correo\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot remove the primary group of user '%s'\n"
@@ -2312,45 +2207,36 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: error eliminando el directorio %s\n"
 
-#, fuzzy
-#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
 msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
-msgstr "  -c, --comment COMENTARIO      campo GECOS de la nueva cuenta\n"
+msgstr ""
+"  -c, --comment COMENTARIO      nuevo valor del campo GECOS\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
 "  -d, --home HOME_DIR           new home directory for the user account\n"
 msgstr ""
-"  -d, --home-dir DIR_PERSONAL   directorio personal de la nueva cuenta\n"
+"  -d, --home DIR_PERSONAL       nuevo directorio personal del nuevo usuario\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
 msgstr ""
-"  -e, --expiredate FECHA_CADUCIDAD  fecha de caducidad de la nueva cuenta\n"
+"  -e, --expiredate FECHA_EXPIR  establece la fecha de caducidad de la\n"
+"                                cuenta a FECHA_EXPIR\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password CONTRASEÑA     cambia la contraseña a CONTRASEÑA (cifrada)\n"
+"  -f, --inactive INACTIVO       establece el tiempo de inactividad después\n"
+"                                de que caduque la cuenta a INACTIVO\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
-msgstr "  -g, --gid GID                 utiliza GID para el nuevo grupo\n"
+msgstr ""
+"  -g, --gid GRUPO               fuerza el uso de GRUPO para la nueva cuenta\n"
+"                                de usuario\n"
 
-#, fuzzy
-#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
 msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
 msgstr ""
-"  -M, --members USUARIO,...     establece la lista de miembros de GRUPO\n"
+"  -G, --groups GRUPOS           lista de grupos suplementarios\n"
 
 msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
@@ -2360,60 +2246,38 @@
 
 msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
 msgstr ""
+"  -l, --login NOMBRE            nuevo nombre para el usuario\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -L, --lock                    lock the user account\n"
 msgstr ""
-"  -u, --uid UID                 identificador del usuario de la nueva "
-"cuenta\n"
+"  -L, --lock                    bloquea la cuenta de usuario\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
-#| "the\n"
-#| "                                new account\n"
 msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
 msgstr ""
-"  -b, --base-dir DIR_BASE       directorio base para el directorio personal\n"
-"                                de la nueva cuenta\n"
+"  -m, --move-home               mueve los contenidos del directorio\n"
+"                                personal al directorio nuevo (usar sólo\n"
+"                                junto con -d)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
-#| "GID\n"
 msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
 msgstr ""
-"  -o, --non-unique              permite utilizar un GID duplicado (no "
-"único)\n"
+"  -o, --non-unique              permite usar UID duplicados (no únicos)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       use this encrypted password for the new "
-#| "group\n"
 msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
 msgstr ""
-"  -p, --password CONTRASEÑA     utiliza esta contraseña cifrada para el "
-"nuevo\n"
-"                                grupo\n"
+"  -p, --password CONTRASEÑA     usar la contraseña cifrada para la nueva cuenta\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -u, --uid UID                 new UID for the user account\n"
 msgstr ""
-"  -u, --uid UID                 identificador del usuario de la nueva "
-"cuenta\n"
+"  -u, --uid UID                 fuerza el uso del UID para la nueva cuenta\n"
+"                                de usuario\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -U, --unlock                  unlock the user account\n"
 msgstr ""
-"  -u, --uid UID                 identificador del usuario de la nueva "
-"cuenta\n"
+"  -U, --unlock                  desbloquea la cuenta de usuario\n"
 
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "

Modified: upstream/trunk/po/eu.po
===================================================================
--- upstream/trunk/po/eu.po	2011-12-09 21:31:39 UTC (rev 3652)
+++ upstream/trunk/po/eu.po	2011-12-09 21:35:47 UTC (rev 3653)
@@ -8,7 +8,7 @@
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2011-11-13 18:42+0100\n"
-"PO-Revision-Date: 2009-07-03 11:06+0200\n"
+"PO-Revision-Date: 2011-11-26 19:42+0100\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-eu at lists.debian.org>\n"
 "Language: eu\n"
@@ -197,13 +197,12 @@
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: huts %s desblokeatzean\n"
 
-#, fuzzy, c-format
-#| msgid "%s: %s\n"
+#, c-format
 msgid "%s: "
-msgstr "%s: %s\n"
+msgstr "%s: "
 
 msgid ": "
-msgstr ""
+msgstr ": "
 
 msgid "Environment overflow\n"
 msgstr "Inguruneak gainezka egin du\n"
@@ -385,17 +384,13 @@
 msgid "No"
 msgstr "Ez"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Erabilera: %s [aukerak]\n"
+"Erabilera: %s [aukerak] IZENA\n"
 "\n"
 "Aukerak:\n"
 
@@ -403,52 +398,43 @@
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
 msgstr ""
+"  -d, --lastday AZKEN_EGUNA     ezarri pasahitz aldaketa AZKEN_EGUNA\n"
 
 msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
 msgstr ""
+"  -E, --expiredate IRAUNGITZE_DATA\n"
+"                                ezarri kontu iraungitze data\n"
+"                                IRAUNGITZE_DATA-ra\n"
 
 msgid "  -h, --help                    display this help message and exit\n"
 msgstr ""
 "  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -m, --md5                     zifratu testu laueko pasahitza MD5\n"
-"                                algoritmoa erabiliaz\n"
+"  -I, --inactive INACTIVE       ezarri pasahitza ezgaitua bezala\n"
+"                                -INACTIVE iraungitzean\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -l, --list                    show account aging information\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -l, --list                    kontu denbora informazioa bistarazi\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
-"                                SHA erronda kopurua\n"
+"  -m, --mindays GUTXI_EGUN      pasahitz aldaketa gutxieneko data\n"
+"                                GUTXI_EGUN-era aldatu\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
-"                                SHA erronda kopurua\n"
+"  -M, --maxdays GEHI_EGUN       pasashitz aldaketa gehienezko data\n"
+"                                GEHI_EGUN-era aldatu\n"
 
 msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
 msgstr ""
@@ -456,6 +442,7 @@
 msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -W, --warndays ABISU_EGUN     iraungitze abisua ABISU_EGUN-era ezarri\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Idatzi balio berria, edo sakatu 'Sartu' tekla lehenetsirako"
@@ -528,10 +515,9 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s: Ezin da Erabiltzaile izena zehaztu.\n"
 
-#, fuzzy, c-format
-#| msgid "%s: %s\n"
+#, c-format
 msgid "%s: PAM: %s\n"
-msgstr "%s: %s\n"
+msgstr "%s: PAM: %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -565,17 +551,13 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: errorea eremuak aldatzean\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [LOGIN]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Erabilera: %s [aukerak]\n"
+"Erabilera: %s [aukerak] [IZENA]\n"
 "\n"
 "Aukerak:\n"
 
@@ -591,11 +573,9 @@
 msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -u, --help                    display this help message and exit\n"
 msgstr ""
-"  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
+"  -u, --help                    laguntza mezu hau bistarazi eta irten\n"
 
 msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
 msgstr ""
@@ -746,10 +726,9 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: %d lerroa: '%s' erabiltzailea ez da existitzen\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -s, --shell SHELL             new login shell for the user account\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -s, --shell SHELL             erabiltzaile kontuaren saio shell berria\n"
 
 msgid "Login Shell"
 msgstr "Saio-hasierako shell-a"
@@ -766,10 +745,9 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: baliogabeko sarrera: %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: %s is an invalid shell.\n"
+#, c-format
 msgid "%s: %s is an invalid shell\n"
-msgstr "%s: %s shell baliogabea da.\n"
+msgstr "%s: %s shell baliogabea da\n"
 
 #, fuzzy, c-format
 #| msgid "%s: user '%s' does not exist\n"
@@ -781,70 +759,66 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: abisua: %s ez dago %s(r)en jabegoan\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -c, --check                   check the user's password expiration\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -f, --force                   force password change if the user's "
 "password\n"
 "                                is expired\n"
 msgstr ""
-"  -m, --md5                     zifratu testu laueko pasahitza MD5\n"
-"                                algoritmoa erabiliaz\n"
 
 #, c-format
 msgid "%s: options %s and %s conflict\n"
 msgstr "%s: %s eta %s aukerak elkar-jotzen dute\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: unexpected argument: %s\n"
+#, c-format
 msgid "%s: unexpected argument: %s\n"
-msgstr "lastlog: argumentu esperogabea: %s\n"
+msgstr "%s: argumentu esperogabea: %s\n"
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
-"  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
+"  -a, --all                     erabiltzaile guztien faillog-en\n"
+"                                erregistroak bistaratzen ditu\n"
 
 msgid ""
 "  -l, --lock-secs SEC           after failed login lock account for SEC "
 "seconds\n"
 msgstr ""
+"  -l, --lock-secs SEG           saio-hasieran hutsegin ondoren kontua zenbat\n"
+"                                segundutan blokeatuta egongo den\n"
 
 msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 msgstr ""
+"  -m, --maximum GEH             saio-hasierako GEHiengo hutsegite kopurua\n"
+"                                ezartzeko\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -r, --reset                   reset the counters of login failures\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -r, --reset                   saio-hasierako hutsegiteen kontatzailea\n"
+"                                berrezartzeko\n"
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
 msgstr ""
-"  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
+"  -t, --time EGUNAK             EGUNAK baino berriagoak diren faillog-en\n"
+"                                erregistroak bistaratzeko\n"
 
 msgid ""
 "  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
 "                                counters and limits (if used with -r, -m,\n"
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
+"  -u, --user SAIOA              faillog-en erregistroak bistaratzeko edo\n"
+"                                hutsegiteen kontatzailea eta ERABILTZAILEA\n"
+"                                izeneko erabiltzailearen(-r, -m edo -l\n"
+"                                aukerekin erabiltzen bada) mantentzeko\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+#, c-format
 msgid "%s: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: Huts %lu UIDaren sarrera eskuratzean\n"
+msgstr "%s: Huts %lu UIDaren sarrera eskuratzean\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Saio-hasiera    Hutsegiteak Gehienezkoa Azkena     Aktiboa\n"
@@ -857,85 +831,70 @@
 msgid " [%lds lock]"
 msgstr " [%lds blokeatuta]"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, c-format
 msgid "%s: Failed to reset fail count for UID %lu\n"
-msgstr "huts-erregistroa: Errorea %lu UIDaren huts kontua berrabiaraztean\n"
+msgstr "%s: Errorea %lu UIDaren huts kontua berrabiaraztean\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set max for UID %lu\n"
-msgstr "huts-erregistroa: Huts %lu UIDarentzat max ezartzean\n"
+msgstr "%s: Huts %lu UIDarentzat max ezartzean\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set locktime for UID %lu\n"
-msgstr "huts-erregistroa: Huts %lu UIDarentzat blokeo-ordua ezartzean\n"
+msgstr "%s: Huts %lu UIDarentzat blokeo-ordua ezartzean\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Unknown user or range: %s\n"
+#, c-format
 msgid "%s: Unknown user or range: %s\n"
-msgstr "azken-erregistroa: Eremu edo erabiltzaile ezezaguna: %s\n"
+msgstr "%s: Eremu edo erabiltzaile ezezaguna: %s\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
+#, c-format
 msgid "%s: Cannot get the size of %s: %s\n"
-msgstr "lastlog: Ezinda %s-ren tamaina eskuratu: %s\n"
+msgstr "%s: Ezinda %s-ren tamaina eskuratu: %s\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Erabilera: %s [aukerak]\n"
+"Erabilera: %s [aukera] TALDEA\n"
 "\n"
 "Aukerak:\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -a, --add USER                add USER to GROUP\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -a, --add ERAB                Gehitu ERABiltzailea TALDEra\n"
 
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
+"  -d, --delete ERAB             kendu ERABiltzailea TALDEtik\n"
 
 msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
 msgstr ""
+"  -r, --remove-password         TALDEaren pasahitaz kendu\n"
 
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid ""
 "  -R, --restrict                restrict access to GROUP to its members\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -R, --restrict                mugatu sarrera TALDEra bere partaideetara\n"
 
 msgid "  -M, --members USER,...        set the list of members of GROUP\n"
 msgstr ""
+"  -M, --members ERAB,...        ezarri TALDEaren partaideen zerrenda\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -A, --administrators ADMIN,...\n"
-#| "                                set the list of administrators for GROUP\n"
-#| "Except for the -A and -M options, the options cannot be combined.\n"
 msgid ""
 "  -A, --administrators ADMIN,...\n"
 "                                set the list of administrators for GROUP\n"
 msgstr ""
 "  -A, --administrators ADMIN,...\n"
 "                                ezarri TALDEaren kudeatzaile zerrenda\n"
-"-A eta -M auekrekin kenduta, aukerak ezin dira nahastu.\n"
 
-#, fuzzy
-#| msgid "The options cannot be combined.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
-msgstr "Aukera hauek ezin dira nahastu.\n"
+msgstr ""
+"-A eta -M auekrekin kenduta, aukerak ezin dira nahastu.\n"
 
 msgid "The options cannot be combined.\n"
 msgstr "Aukera hauek ezin dira nahastu.\n"
@@ -995,50 +954,42 @@
 "\n"
 "Options:\n"
 msgstr ""
-"Erabilera: %s [aukerak]\n"
+"Erabilera: %s [aukerak] TALDEA\n"
 "\n"
 "Aukerak:\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -f, --force                   exit successfully if the group already "
 "exists,\n"
 "                                and cancel -g if the GID is already used\n"
 msgstr ""
-"  -m, --md5                     zifratu testu laueko pasahitza MD5\n"
-"                                algoritmoa erabiliaz\n"
+"  -f, --force                   Indartu arrakastatsuki amaitzea nahiz\n"
+"                                ezarritako taldea aurretik egon\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -g, --gid GID                 use GID for the new group\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -g, --gid GID                 GID erabili talde berrirako\n"
 
 msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
 msgstr ""
+"  -K, --key KEY=BALIO           /etc/login.defs lehenespenak gainidatzi\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
-"                                SHA erronda kopurua\n"
+"  -o, --non-unique              onartu bikoizutiko (ez bakarra) GID-a duen\n"
+"                                taldea sortzea\n"
 
 msgid ""
 "  -p, --password PASSWORD       use this encrypted password for the new "
 "group\n"
 msgstr ""
+"  -p, --password PASSWORD       enkriptatutako pasahitza erabili talde berrirako\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -r, --system                  create a system account\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -r, --system                  sistema kontu bat sortu\n"
 
 #, c-format
 msgid "%s: '%s' is not a valid group name\n"
@@ -1093,58 +1044,48 @@
 msgid "%s: Out of memory. Cannot update %s.\n"
 msgstr "%s: memoriarik ez. Ezin da %s eguneratu.\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Erabilera: %s [aukerak]\n"
+"Erabilera: %s [aukerak] [ekintza]\n"
 "\n"
 "Aukerak:\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -g, --group groupname         change groupname instead of the user's "
 "group\n"
 "                                (root only)\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
-"                                SHA erronda kopurua\n"
+"  -g, --group groupname         aldatu talde-izena erabiltzailearen taldea ordez\n"
+"                                (root bakarrik)\n"
 
 msgid "\n"
-msgstr ""
+msgstr "\n"
 
 msgid "Actions:\n"
-msgstr ""
+msgstr "Ekintzak:\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid ""
 "  -a, --add username            add username to the members of the group\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -a, --add erabiltzailea       gehitu erabiltzaile-izena taldearen partaideetara\n"
 
 msgid ""
 "  -d, --delete username         remove username from the members of the "
 "group\n"
 msgstr ""
+"  -d, --delete erabiltzailea    kendu erabiltzaile-izena taldearen partaideetatik\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -p, --purge                   purge all members from the group\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -p, --purge                   garbitu talde baten partaide guztiak\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -l, --list                    list the members of the group\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -l, --list                    taldearen partaideak zerrendatu\n"
 
 #, c-format
 msgid "%s: your groupname does not match your username\n"
@@ -1183,52 +1124,35 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: %s erabiltzaile ezezaguna\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Erabilera: %s [aukerak]\n"
+"Erabilera: %s [aukerak] [taldea [gshadow]]\n"
 "\n"
 "Aukerak:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Erabilera: %s [aukerak]\n"
+"Erabilera: %s [aukerak] [taldea]\n"
 "\n"
 "Aukerak:\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -r, --read-only               display errors and warnings\n"
 "                                but do not change files\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
-"                                SHA erronda kopurua\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -s, --sort                    sort entries by UID\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
 
-#, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
+#, c-format
 msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s eta -r ezin dira batera erabili\n"
 
@@ -1312,24 +1236,24 @@
 msgid " groups="
 msgstr " taldeak="
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
-"  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
+"  -b, --before EGUN             EGUN kopurua baino zaharragoak diren\n"
+"                                erregistroak\n"
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
 msgstr ""
-"  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
+"  -t, --time EGUNAK             EGUNAK baino berriagoak diren erregistroak\n"
+"                                bakarrik bistaratzen ditu\n"
 
 msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
+"  -u, --user IZENA              IZENA duen erabiltzailearen lastlog\n"
+"                                erregistroa bistaratzen du\n"
 
 msgid "Username         Port     From             Latest"
 msgstr "Erabiltzaile-izena        Ataka      Nondik           Azkena"
@@ -1535,94 +1459,79 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: %d lerroa: ezin da sarrera eguneratu\n"
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid ""
 "  -a, --all                     report password status on all accounts\n"
 msgstr ""
-"  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
+"  -a, --all                     kontu guztien pasahitzen egoera erreportea\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid ""
 "  -d, --delete                  delete the password for the named account\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -d, --delete                  emandako kontuaren pasahitza ezabatu\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid ""
 "  -e, --expire                  force expire the password for the named "
 "account\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -e, --expire                  emandako kontuaren pasahitzaren\n"
+"                                iraungitzea behartu\n"
 
-#, fuzzy
-#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
 msgid "  -k, --keep-tokens             change password only if expired\n"
-msgstr "  -e, --encrypted               emandako pasahitzak zifraturik daude\n"
+msgstr ""
+"  -k, --keep-tokens             pasahitza iraungirik bakarrik badago\n"
+"                                aldatu\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -m, --md5                     zifratu testu laueko pasahitza MD5\n"
-"                                algoritmoa erabiliaz\n"
+"  -i, --inactive INAKTIBO       ezarri iraungiriko pasahitz ezgaitzea\n"
+"                                INAKTIBO-ra\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid ""
 "  -l, --lock                    lock the password of the named account\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -l, --lock                    emandako kontua blokeatu\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
-"                                SHA erronda kopurua\n"
+"  -n, --mindays GUTXI_EGUN      ezarri pasahitz aldaketa gutxieneko data\n"
+"                                GUTXI_EGUN-ra\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -q, --quiet                   quiet mode\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr "  -q, --quiet                   ixilik modua\n"
 
 msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 msgstr ""
+"  -r, --repository ERREPOSITORIOA\n"
+"                                ERREPOSITORIOA errepositorioko pashitza\n"
+"                                aldatu\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid ""
 "  -S, --status                  report password status on the named account\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -S, --status                  emandako kontuaren pasahitz egoera\n"
+"                                erreportea egin\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -u, --unlock                  emandako kontuaren blokeoa kendu\n"
 
 msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -w, --warndays ABISU_EGUN     ezarri iraungitze abisu data ABISU_EGUN-era\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
-"                                SHA erronda kopurua\n"
+"  -x, --maxdays GEHI_EGUN       ezarri pasahitz aldatu aurretik gehienezko\n"
+"                                egun kopurua GEHI_EGUN-era\n"
 
 msgid "Old password: "
 msgstr "Pasahitz zaharra: "
@@ -1715,21 +1624,17 @@
 "\n"
 "Options:\n"
 msgstr ""
-"Erabilera: %s [aukerak]\n"
+"Erabilera: %s [aukerak] [pasahitza]\n"
 "\n"
 "Aukerak:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd [shadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Erabilera: %s [aukerak]\n"
+"Erabilera: %s [aukerak] [pasahitza [itzalpekoa]]\n"
 "\n"
 "Aukerak:\n"
 
@@ -1930,10 +1835,9 @@
 msgid "%s: Cannot drop the controlling terminal\n"
 msgstr "lastlog: Ezinda %s-ren tamaina eskuratu: %s\n"
 
-#, fuzzy, c-format
-#| msgid "Cannot execute %s"
+#, c-format
 msgid "Cannot execute %s\n"
-msgstr "Ezin izan da %s exekutatu"
+msgstr "Ezin izan da %s exekutatu\n"
 
 msgid "No password file"
 msgstr "Ez dago pasahitz-fitxategirik"
@@ -1976,10 +1880,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: lerro luzeegia %s-n: %s..."
 
-#, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
+#, c-format
 msgid "%s: rename: %s: %s\n"
-msgstr "%s: berrizendatu: %s: %s"
+msgstr "%s: berrizendatu: %s: %s\n"
 
 #, c-format
 msgid "%s: group '%s' is a NIS group.\n"
@@ -1989,11 +1892,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: talde gehiegi zehaztu dira (geh. %d).\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "       %s -D\n"
@@ -2001,21 +1900,23 @@
 "\n"
 "Options:\n"
 msgstr ""
-"Erabilera: %s [aukerak]\n"
+"Erabilera: %s [aukerak] IZENA\n"
+"           %s -D\n"
+"           %s -D [aukerak]\n"
 "\n"
 "Aukerak:\n"
 
 #, fuzzy
 #| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
+#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#| "                                home directory\n"
 msgid ""
 "  -b, --base-dir BASE_DIR       base directory for the home directory of "
 "the\n"
 "                                new account\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
-"                                SHA erronda kopurua\n"
+"  -b, --base-dir BASE_DIR       Erabiltzaile kontu berriaren etxe\n"
+"                                direktorioaren oinarri direktorioa\n"
 
 msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
 msgstr ""
@@ -2036,86 +1937,50 @@
 "account\n"
 msgstr ""
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -g, --gid GROUP               name or ID of the primary group of the new\n"
 "                                account\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
-"                                SHA erronda kopurua\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -G, --groups GROUPS           list of supplementary groups of the new\n"
 "                                account\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
-"                                SHA erronda kopurua\n"
 
 msgid ""
 "  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
 msgstr ""
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
-"                                SHA erronda kopurua\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -m, --create-home             create the user's home directory\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
 
 msgid ""
 "  -M, --no-create-home          do not create the user's home directory\n"
 msgstr ""
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
-"                                SHA erronda kopurua\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
 msgstr ""
-"  -m, --md5                     zifratu testu laueko pasahitza MD5\n"
-"                                algoritmoa erabiliaz\n"
 
 msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -s, --shell SHELL             login shell of the new account\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -u, --uid UID                 user ID of the new account\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
 
 msgid ""
 "  -U, --user-group              create a group with the same name as the "
@@ -2226,21 +2091,16 @@
 "%s: abisua: etxe direktorioa badago dagoeneko.\n"
 "Ez da bertara skel direktorioko fitxategirik kopiatuko.\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
 msgstr ""
-"  -m, --md5                     zifratu testu laueko pasahitza MD5\n"
-"                                algoritmoa erabiliaz\n"
+"  -f, --force                   fitxategien ezabatzea indartu nahiz ez\n"
+"                                erabiltzailearenak izan\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -r, --remove                  remove home directory and mail spool\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -r, --remove                  etxe direktorioa eta posta hilara ezabatu\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot remove the primary group of user '%s'\n"
@@ -2308,90 +2168,76 @@
 
 msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
 msgstr ""
+"  -c, --comment IRUZKINA         GECOS eremuaren balio berria\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid ""
 "  -d, --home HOME_DIR           new home directory for the user account\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -d, --home-dir ETXE_DIR       erabiltzaile kontu berriaren etxe direktorioa\n"
 
 msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
 msgstr ""
+"  -e, --expiredate IRAUNG_DATA  kontu iraungitze data ezarri\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -m, --md5                     zifratu testu laueko pasahitza MD5\n"
-"                                algoritmoa erabiliaz\n"
+"  -f, --inactive INAKTIBO       iraungitze ondorengo pasahitz ezgaitzea\n"
+"                                to INAKTIBO-ra ezarri\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -g, --gid TALDE               erabiltzaile kontu berriarekin TALDE\n"
+"                                erabiltzea behartu\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
-"                                SHA erronda kopurua\n"
+"  -G, --groups TALDEAK          erabiltzaile kontu berriaren talde\n"
+"                                gehigarriak bistarazi\n"
 
 msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
 msgstr ""
+"  -a, --append                  gehitu erabiltzailea -G aukerak zehaztutako talde\n"
+"                                gehigarrietara beste taldeetatik kendu gabe\n"
 
 msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
 msgstr ""
+"  -l, --login IZENA             saio hasiera izenaren balio berria\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -L, --lock                    lock the user account\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -L, --lock                    erabiltzaile kontua blokeatu\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* kriptografia algoritmoentzako\n"
-"                                SHA erronda kopurua\n"
+"  -m, --move-home               etxe direktorioaren edukia kokapen berrira\n"
+"                                mugitu (--d-rekin bakarrik erabilgarri)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
 msgstr ""
-"  -m, --md5                     zifratu testu laueko pasahitza MD5\n"
-"                                algoritmoa erabiliaz\n"
+"  -o, --non-unique              onartu UID bikoiztuak (ez bakarrak) erabiltzea\n"
 
 msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
 msgstr ""
+"  -p, --password PASAHITZA      Enkriptaturiko pasahitza erabili pasahitz\n"
+"                                berriarentzat\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -u, --uid UID                 new UID for the user account\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -u, --uid UID                 erabiltzaile kontuaren UID berria\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -U, --unlock                  unlock the user account\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -U, --unlock                  erabiltzaile kontua desblokeatu\n"
 
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
@@ -2486,40 +2332,29 @@
 "Konsistetziagatik %s eraldatu behar duzu.\n"
 "Mesedez erabili '%s' komandoa horretarako.\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Erabilera: %s [aukerak]\n"
+"Erabilera: vipw [aukerak]\n"
 "\n"
 "Aukerak:\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -g, --group                   edit group database\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -g, --group                   talde datu-basea editatu\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -p, --passwd                  edit passwd database\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
+"  -p, --passwd                  pasahitz datu-basea editatu\n"
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
-"  -h, --help                    laguntza mezu hau bistarazi eta irten\n"
+"  -s, --shadow                  shadow edo gshadow datubasea editatu\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -u, --user                    which user's tcb shadow file to edit\n"
-msgstr "  -r, --system                  sortu sistema kontuak\n"
+msgstr ""
 
 #, c-format
 msgid "%s: failed to remove %s\n"
@@ -2534,10 +2369,8 @@
 msgid "failed to create scratch directory"
 msgstr "huts egin du postontzia izenez aldatzean"
 
-#, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
-msgstr "%s: huts baimenak kentzerakoan (%s)\n"
+msgstr "huts baimenak kentzerakoan"
 
 msgid "Couldn't get file context"
 msgstr "Ezin da fitxategi testuingurua eskuratu"

Modified: upstream/trunk/po/fr.po
===================================================================
--- upstream/trunk/po/fr.po	2011-12-09 21:31:39 UTC (rev 3652)
+++ upstream/trunk/po/fr.po	2011-12-09 21:35:47 UTC (rev 3653)
@@ -13,7 +13,7 @@
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2011-11-13 18:42+0100\n"
-"PO-Revision-Date: 2011-11-13 20:15+0100\n"
+"PO-Revision-Date: 2011-11-22 18:11+0100\n"
 "Last-Translator: Thomas Blein <tblein at tblein.eu>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
 "Language: fr\n"
@@ -235,7 +235,7 @@
 
 #, c-format
 msgid "%s: failed to allocate memory: %s\n"
-msgstr "%s: impossible d'allouer la mémoire: %s\n"
+msgstr "%s : impossible d'allouer la mémoire: %s\n"
 
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"

Modified: upstream/trunk/po/ja.po
===================================================================
--- upstream/trunk/po/ja.po	2011-12-09 21:31:39 UTC (rev 3652)
+++ upstream/trunk/po/ja.po	2011-12-09 21:35:47 UTC (rev 3653)
@@ -8,7 +8,7 @@
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2011-11-13 18:42+0100\n"
-"PO-Revision-Date: 2011-04-06 11:18+0900\n"
+"PO-Revision-Date: 2011-11-24 21:02+0100\n"
 "Last-Translator: NAKANO Takeo <nakano at webmasters.gr.jp>\n"
 "Language-Team: Japanese\n"
 "Language: \n"
@@ -215,10 +215,9 @@
 "(%lu)\n"
 msgstr "%s: 設定が不正: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%lu)\n"
 
-#, fuzzy, c-format
-#| msgid "failed to allocate memory"
+#, c-format
 msgid "%s: failed to allocate memory: %s\n"
-msgstr "メモリ割当に失敗しました"
+msgstr "%s: メモリ割当に失敗しました: %s\n"
 
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
@@ -382,61 +381,48 @@
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
 msgstr ""
+"  -d, --lastday LAST_DAY        パスワードの最終変更日を LAST_DAY にする\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-msgstr "  -e, --expiredate EXPIRE_DATE  新アカウントの期限切れ日付\n"
+msgstr ""
+"  -E, --expiredate EXPIRE_DATE  アカウント期限切れの日を EXPIRE_DATE にする\n"
 
 msgid "  -h, --help                    display this help message and exit\n"
 msgstr "  -h, --help                    このヘルプを表示して終了する\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password PASSWORD       パスワードをこの (暗号化された) PASSWORD\n"
-"                                に変更する\n"
+"  -I, --inactive INACTIVE       パスワードを期限切れ後に無効化する日数を\n"
+"                                INACTIVEにする\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -l, --list                    show account aging information\n"
-msgstr "  -r, --reset                   ログイン失敗のカウンタをリセットする\n"
+msgstr ""
+"  -l, --list                    アカウントの経時情報を表示する\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
+"  -m, --mindays MIN_DAYS        パスワードが変更できるまでの最短日数を\n"
+"                                MIN_DAYS に変更する\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
+"  -M, --maxdays MAX_DAYS        パスワードが変更できる期間の最長日数を\n"
+"                                MAX_DAYS に変更する\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir HOME_DIR       新アカウントのホームディレクトリ\n"
+msgstr ""
 
 msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -W, --warndays WARN_DAYS      期限切れ警告の日数を WARN_DAYS にする\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr ""
@@ -547,17 +533,13 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: フィールド変更の際にエラーが起きました\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [LOGIN]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"使い方: %s [オプション] LOGIN\n"
+"使い方: %s [オプション] [LOGIN]\n"
 "\n"
 "オプション:\n"
 
@@ -573,10 +555,8 @@
 msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -u, --help                    display this help message and exit\n"
-msgstr "  -h, --help                    このヘルプを表示して終了する\n"
+msgstr "  -u, --help                    このヘルプを表示して終了する\n"
 
 msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
 msgstr ""
@@ -725,10 +705,9 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: %d 行目: ユーザ '%s' は存在しません\n"
 
-#, fuzzy
-#| msgid "  -s, --shell SHELL             login shell of the new account\n"
 msgid "  -s, --shell SHELL             new login shell for the user account\n"
-msgstr "  -s, --shell SHELL             新アカウントのログインシェル\n"
+msgstr ""
+"  -s, --shell SHELL             ユーザのシェルを新たに SHELL にする\n"
 
 msgid "Login Shell"
 msgstr "ログインシェル"
@@ -757,32 +736,22 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: 警告: %s は実行可能ではありません\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -u, --user                    which user's tcb shadow file to edit\n"
 msgid "  -c, --check                   check the user's password expiration\n"
-msgstr "  -u, --user                    編集する tcb shadow ファイルのユーザ\n"
+msgstr ""
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -f, --force                   force password change if the user's "
 "password\n"
 "                                is expired\n"
 msgstr ""
-"  -m, --md5                     平文テキストのパスワードを\n"
-"                                MD5 アルゴリズムで暗号化する\n"
 
 #, c-format
 msgid "%s: options %s and %s conflict\n"
 msgstr "%s: オプション %s と %s は同時に指定できません\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: unexpected argument: %s\n"
+#, c-format
 msgid "%s: unexpected argument: %s\n"
-msgstr "lastlog: この引き数は不正です: %s\n"
+msgstr "%s: この引き数は不正です: %s\n"
 
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr "  -a, --all                     全ユーザの faillog 記録を表示する\n"
@@ -818,10 +787,9 @@
 "                                -m, -l などを指定した場合は、指定 LOGIN\n"
 "                                についてのみ失敗カウンタや制限値を変更する\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+#, c-format
 msgid "%s: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: UID %lu のエントリを取得できませんでした\n"
+msgstr "%s: UID %lu のエントリを取得できませんでした\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "ログイン名  失敗     最大    最新                     場所\n"
@@ -834,30 +802,25 @@
 msgid " [%lds lock]"
 msgstr "[ロック %ld 秒]"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, c-format
 msgid "%s: Failed to reset fail count for UID %lu\n"
-msgstr "faillog: UID %lu の失敗回数をリセットできませんでした\n"
+msgstr "%s: UID %lu の失敗回数をリセットできませんでした\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set max for UID %lu\n"
-msgstr "faillog: UID %lu の最大回数を設定できませんでした\n"
+msgstr "%s: UID %lu の最大回数を設定できませんでした\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set locktime for UID %lu\n"
-msgstr "faillog: UID %lu のロック時間を設定できませんでした\n"
+msgstr "%s: UID %lu のロック時間を設定できませんでした\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Unknown user or range: %s\n"
+#, c-format
 msgid "%s: Unknown user or range: %s\n"
-msgstr "lastlog: 不明なユーザまたは範囲です: %s\n"
+msgstr "%s: 不明なユーザまたは範囲です: %s\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
+#, c-format
 msgid "%s: Cannot get the size of %s: %s\n"
-msgstr "lastlog: %s のサイズを取得できませんでした: %s\n"
+msgstr "%s: %s のサイズを取得できませんでした: %s\n"
 
 #, c-format
 msgid ""
@@ -873,12 +836,10 @@
 msgstr "  -a, --add USER                USER を GROUP に追加する\n"
 
 msgid "  -d, --delete USER             remove USER from GROUP\n"
-msgstr "  --d, --delete USER            USER を GROUP から削除する\n"
+msgstr "  -d, --delete USER             USER を GROUP から削除する\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir HOME_DIR       新アカウントのホームディレクトリ\n"
+msgstr ""
 
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         GROUP のパスワードを削除する\n"
@@ -1127,48 +1088,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: ユーザ %s は不明です\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"使い方: %s [オプション] [アクション]\n"
+"使い方: %s [オプション] [group [gshadow]]\n"
 "\n"
 "オプション:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"使い方: %s [オプション] [アクション]\n"
+"使い方: %s [オプション] [group]\n"
 "\n"
 "オプション:\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -r, --read-only               display errors and warnings\n"
 "                                but do not change files\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
 
-#, fuzzy
-#| msgid "  -l, --list                    list the members of the group\n"
 msgid "  -s, --sort                    sort entries by UID\n"
-msgstr "  -l, --list                    グループのメンバーを表示します。\n"
+msgstr ""
 
 #, c-format
 msgid "%s: -s and -r are incompatible\n"
@@ -1254,28 +1200,21 @@
 msgid " groups="
 msgstr " グループ="
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
-"  -t, --time DAYS               ここ DAYS 日分の faillog 記録を表示する\n"
+"  -b, --before DAYS             DAYS 日より以前の lastlog 記録だけを表示する\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
 msgstr ""
-"  -t, --time DAYS               ここ DAYS 日分の faillog 記録を表示する\n"
+"  -t, --time DAYS               DAYS 日前以降の lastlog 記録だけを表示する\n"
 
 msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
+"  -u, --user LOGIN              指定ユーザ LOGIN の lastlog 記録を表示する\n"
 
 msgid "Username         Port     From             Latest"
 msgstr "ユーザ名         ポート   場所             最近のログイン"
@@ -1482,57 +1421,44 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: %d 行: エントリを更新できません\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
 "  -a, --all                     report password status on all accounts\n"
-msgstr "  -a, --all                     全ユーザの faillog 記録を表示する\n"
+msgstr ""
+"  -a, --all                     全アカウントのパスワード状態をレポートする\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -d, --delete                  delete the password for the named account\n"
-msgstr "  -r, --system                  システムアカウントを作成します\n"
+msgstr ""
+"  -d, --delete                  指定アカウントのパスワードを削除する\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -e, --expire                  force expire the password for the named "
 "account\n"
-msgstr "  -r, --system                  システムアカウントを作成します\n"
+msgstr ""
+"  -e, --expire                  指定アカウントのパスワードを期限切れにする\n"
 
-#, fuzzy
-#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
 msgid "  -k, --keep-tokens             change password only if expired\n"
-msgstr "  -e, --encrypted               与えたパスワードを暗号化する\n"
+msgstr ""
+"  -k, --keep-tokens             期限切れの場合にのみパスワードを変更する\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password PASSWORD       パスワードをこの (暗号化された) PASSWORD\n"
-"                                に変更する\n"
+"  -i, --inactive INACTIVE       期限切れ後のパスワード無効化日数を\n"
+"                                INACTIVE にする\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -l, --lock                    lock the password of the named account\n"
-msgstr "  -u, --iud UID                 新アカウントのユーザ ID\n"
+msgstr ""
+"  -l, --lock                    指定アカウントをロックする\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
+"  -n, --mindays MIN_DAYS        パスワードが変更できるまでの最短日数を\n"
+"                                MIN_DAYS に変更する\n"
 
 msgid "  -q, --quiet                   quiet mode\n"
 msgstr "  -q, --quiet                   表示抑制モード\n"
@@ -1540,32 +1466,29 @@
 msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 msgstr ""
+"  -r, --repository REPOSITORY   リポジトリ REPOSITORY のパスワードを変更する\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -S, --status                  report password status on the named account\n"
-msgstr "  -r, --system                  システムアカウントを作成します\n"
+msgstr ""
+"  -S, --status                  指定アカウントのパスワードの状態を報告する\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
-msgstr "  -u, --iud UID                 新アカウントのユーザ ID\n"
+msgstr ""
+"  -u, --unlock                  指定アカウントのロックを解除する\n"
 
 msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -w, --warndays WARN_DAYS      期限切れ警告の日数を WARN_DAYS にする\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* 暗号化アルゴリズムの SHA ラウンド回数\n"
+"  -x, --maxdays MAX_DAYS        パスワードが変更できる期間の最長日数を\n"
+"                                MAX_DAYS に変更する\n"
 
 msgid "Old password: "
 msgstr "古いパスワード: "
@@ -1648,31 +1571,23 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s: パスワード期限切れ情報を変更しました\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"使い方: %s [オプション] [アクション]\n"
+"使い方: %s [オプション] [passwd]\n"
 "\n"
 "オプション:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd [shadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"使い方: %s [オプション] [アクション]\n"
+"使い方: %s [オプション] [passwd [shadow]]\n"
 "\n"
 "オプション:\n"
 
@@ -1867,10 +1782,9 @@
 msgid "%s: Cannot drop the controlling terminal\n"
 msgstr "%s: %s の内容を削除できませんでした: %s\n"
 
-#, fuzzy, c-format
-#| msgid "Cannot execute %s"
+#, c-format
 msgid "Cannot execute %s\n"
-msgstr "%s を実行できません"
+msgstr "%s を実行できません\n"
 
 msgid "No password file"
 msgstr "パスワードファイルがありません"
@@ -1913,10 +1827,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: %s の行が長すぎます: %s..."
 
-#, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
+#, c-format
 msgid "%s: rename: %s: %s\n"
-msgstr "%s: ファイル名変更: %s: %s"
+msgstr "%s: ファイル名変更: %s: %s\n"
 
 #, c-format
 msgid "%s: group '%s' is a NIS group.\n"
@@ -1926,11 +1839,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: 指定したグループ数が多すぎます (最大 %d 個)。\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "       %s -D\n"
@@ -1939,6 +1848,8 @@
 "Options:\n"
 msgstr ""
 "使い方: %s [オプション] LOGIN\n"
+"        %s -D\n"
+"        %s -D [オプション]\n"
 "\n"
 "オプション:\n"
 
@@ -2127,26 +2038,15 @@
 "%s: 警告: ホームディレクトリが既に存在します。\n"
 "skel ディレクトリからのコピーは行いません。\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -f, --force                   exit successfully if the group already "
-#| "exists,\n"
-#| "                                and cancel -g if the GID is already used\n"
 msgid ""
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
 msgstr ""
-"  -f, --force                   グループがすでに存在していたら正常終了しま"
-"す。\n"
-"                                また GID が既に用いられていたら -g をキャンセ"
-"ル\n"
-"                                します\n"
+"  -f, --force                   当該ユーザの所有でないファイルも削除する\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -r, --remove                  remove home directory and mail spool\n"
-msgstr "  -r, --reset                   ログイン失敗のカウンタをリセットする\n"
+msgstr ""
+"  -r, --remove                  ホームディレクトリとメールスプールを削除する\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot remove the primary group of user '%s'\n"
@@ -2208,97 +2108,78 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: ディレクトリ %s の削除でエラーが起きました\n"
 
-#, fuzzy
-#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
 msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
-msgstr "  -c, --comment COMMENT         新アカウントの GECOS フィールド\n"
+msgstr ""
+"  -c, --comment COMMENT         GECOS フィールドの値を再設定する\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
 "  -d, --home HOME_DIR           new home directory for the user account\n"
-msgstr "  -d, --home-dir HOME_DIR       新アカウントのホームディレクトリ\n"
+msgstr ""
+"  -d, --home HOME_DIR           ユーザアカウントのホームディレクトリを\n"
+"                                再設定する\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-msgstr "  -e, --expiredate EXPIRE_DATE  新アカウントの期限切れ日付\n"
+msgstr ""
+"  -e, --expiredate EXPIRE_DATE  アカウント期限切れの日を EXPIRE_DATE にする\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password PASSWORD       パスワードをこの (暗号化された) PASSWORD\n"
-"                                に変更する\n"
+"  -f, --inactive INACTIVE       パスワードを期限切れ後に無効化する日数を\n"
+"                                INACTIVEにする\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
-msgstr "  -g, --gid GID                 この新規グループに GID を用います\n"
+msgstr ""
+"  -g, --gid GROUP               主グループを GROUP に変更する\n"
 
-#, fuzzy
-#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
 msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-msgstr "  -M, --members USER,...        GROUP のメンバーのリストを設定する\n"
+msgstr ""
+"  -G, --groups GROUPS           新たな補助グループのリストを与える\n"
 
 msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
 msgstr ""
+"  -a, --append                  ユーザを (-G で指定された) 補助グループ群\n"
+"                                GROUPS に追加する。他のグループからの削除は\n"
+"                                行わない。\n"
 
 msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
 msgstr ""
+"  -l, --login NEW_LOGIN         ログイン名を変更する\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -L, --lock                    lock the user account\n"
-msgstr "  -u, --iud UID                 新アカウントのユーザ ID\n"
+msgstr ""
+"  -L, --lock                    このユーザアカウントをロックする\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
-#| "the\n"
-#| "                                new account\n"
 msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
 msgstr ""
-"  -b, --base-dir BASE_DIR       新アカウントのホームディクトリの\n"
-"                                ベースディレクトリ\n"
+"  -m, --move-home               現ホームディレクトリの内容を新たな場所に\n"
+"                                移動する (-d が指定された場合のみ)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
-#| "GID\n"
 msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
-msgstr "  -o, --non-unique              他と重なる GID を許可する\n"
+msgstr ""
+"  -o, --non-unique              一意でないユーザ (UID の重なるユーザ) を\n"
+"                                許可する\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       use this encrypted password for the new "
-#| "group\n"
 msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
 msgstr ""
-"  -p, --password PASSWORD       新規グループにこの暗号化済パスワードを用い"
-"る\n"
+"  -p, --password PASSWORD       新たな暗号化済みパスワードを与える\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -u, --uid UID                 new UID for the user account\n"
-msgstr "  -u, --iud UID                 新アカウントのユーザ ID\n"
+msgstr ""
+"  -u, --uid UID                 このユーザの UID を変更する\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -U, --unlock                  unlock the user account\n"
-msgstr "  -u, --iud UID                 新アカウントのユーザ ID\n"
+msgstr ""
+"  -U, --unlock                  このユーザアカウントのロックを解除する\n"
 
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
@@ -2492,18 +2373,6 @@
 #~ "使い方: chage [オプション] [ログイン名]\n"
 #~ "\n"
 #~ "オプション\n"
-#~ "  -d, --lastday LAST_DAY        パスワードの最終変更日を LAST_DAY にする\n"
-#~ "  -E, --expiredate EXPIRE_DATE  アカウント期限切れの日を 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      期限切れ警告の日数を WARN_DAYS にする\n"
 #~ "\n"
 
 #~ msgid "%s: PAM authentication failed\n"

Modified: upstream/trunk/po/kk.po
===================================================================
--- upstream/trunk/po/kk.po	2011-12-09 21:31:39 UTC (rev 3652)
+++ upstream/trunk/po/kk.po	2011-12-09 21:35:47 UTC (rev 3653)
@@ -8,7 +8,7 @@
 "Project-Id-Version: shadowutils\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2011-11-13 18:42+0100\n"
-"PO-Revision-Date: 2011-04-05 10:17+0600\n"
+"PO-Revision-Date: 2011-11-24 20:29+0100\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst at gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ at googlegroups.com>\n"
 "Language: kk\n"
@@ -216,10 +216,9 @@
 msgstr ""
 "%s: Қате баптаулар: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%lu)\n"
 
-#, fuzzy, c-format
-#| msgid "failed to allocate memory"
+#, c-format
 msgid "%s: failed to allocate memory: %s\n"
-msgstr "жадыны бөлу сәтсіз"
+msgstr "%s: жадыны бөлу сәтсіз: %s\n"
 
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
@@ -377,63 +376,48 @@
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
 msgstr ""
+"  -d, --lastday LAST_DAY        парольдің аяқталу мерзімін LAST_DAY күніне орнату\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
 msgstr ""
-"  -e, --expiredate АЯҚТАЛУ_КҮНІ жаңа тіркелгінің мерзімі аяқталатын күні\n"
+"  -E, --expiredate EXPIRE_DATE  тіркелгінің аяқталу мерзімі EXPIRE_DATE күніне орнату\n"
 
 msgid "  -h, --help                    display this help message and exit\n"
 msgstr "  -h, --help                    осы көмек ақпаратын көрсету мен шығу\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password ПАРОЛЬ         парольді осы ПАРОЛЬге (шифрленген) оранту\n"
+"  -I, --inactive INACTIVE       парольдің мерзімі біткен соң оны INACTIVE болып\n"
+"                                орнату үшін өтетін күн саны\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -l, --list                    show account aging information\n"
-msgstr "  -r, --reset                   сәтсіз кіру талап санағышын нөлдеу\n"
+msgstr ""
+"  -l, --list                    тіркелгінің жұмыс уақыты ақпаратын көрсету\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* тектес алгоритмдер үшін SHA\n"
-"                                раундтар саны\n"
+"  -m, --mindays MIN_DAYS        парольді ауыстыру арасында өту керек ең аз күн санын\n"
+"                                MIN_DAYS мәніне орнату\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* тектес алгоритмдер үшін SHA\n"
-"                                раундтар саны\n"
+"  -M, --maxdays MAX_DAYS        парольді ауыстыру арасында өту керек ең көп сүн санын\n"
+"                                MAX_DAYS мәніне орнату\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir ҮЙ_БУМАСЫ      жаңа тіркелгі үшін үй бумасы\n"
+msgstr ""
 
 msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -W, --warndays WARN_DAYS      мерзімі аяқталу туралы хабарламаны WARN_DAYS күн қалғанда көрсете бастау\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Жаңа мәнді енгізіңіз, немесе ұсынылатынды қабылдау үшін ENTER басыңыз"
@@ -545,17 +529,13 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: жолдарды өзгерту қатесі\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [LOGIN]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Қолданылуы: %s [опциялар] ЛОГИН\n"
+"Қолданылуы: %s [опциялар] [ЛОГИН]\n"
 "\n"
 "Опциялар:\n"
 
@@ -571,10 +551,8 @@
 msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -u, --help                    display this help message and exit\n"
-msgstr "  -h, --help                    осы көмек ақпаратын көрсету мен шығу\n"
+msgstr "  -u, --help                    осы көмек ақпаратын көрсету мен шығу\n"
 
 msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
 msgstr ""
@@ -724,10 +702,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: жол %d: пайдаланушы '%s' жоқ болып тұр\n"
 
-#, fuzzy
-#| msgid "  -s, --shell SHELL             login shell of the new account\n"
 msgid "  -s, --shell SHELL             new login shell for the user account\n"
-msgstr "  -s, --shell ҚОРШАМ            жаңа тіркелгі үшін кіру қоршамы\n"
+msgstr "  -s, --shell SHELL             пайдаланушы тіркелгісі үшін жаңа қоршам\n"
 
 msgid "Login Shell"
 msgstr "Қоршам"
@@ -756,34 +732,22 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: Ескерту: %s орындалатын емес\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -u, --user                    which user's tcb shadow file to edit\n"
 msgid "  -c, --check                   check the user's password expiration\n"
 msgstr ""
-"  -u, --user                    қай пайдаланушының tcb shadow файлын түзету "
-"керек\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -f, --force                   force password change if the user's "
 "password\n"
 "                                is expired\n"
 msgstr ""
-"  -m, --md5                     MD5 алгоритмін пайдаланып, таза мәтінді\n"
-"                                парольді шифрлеу\n"
 
 #, c-format
 msgid "%s: options %s and %s conflict\n"
 msgstr "%s: %s пен %s опциялары өзара ерегіседі\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: unexpected argument: %s\n"
+#, c-format
 msgid "%s: unexpected argument: %s\n"
-msgstr "lastlog: күтпеген аргумент: %s\n"
+msgstr "%s: күтпеген аргумент: %s\n"
 
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
@@ -824,10 +788,9 @@
 "-r, -m,\n"
 "                                не -l бірге көрсетілсе) басқару\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+#, c-format
 msgid "%s: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: UID %lu үшін жазбаны алу мүмкін емес\n"
+msgstr "%s: UID %lu үшін жазбаны алу мүмкін емес\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Пайдаланушы Сәтсіз кіру саны Максимум Соңғы         Қайда\n"
@@ -840,31 +803,26 @@
 msgid " [%lds lock]"
 msgstr " [%lds оқшаулар саны]"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, c-format
 msgid "%s: Failed to reset fail count for UID %lu\n"
 msgstr ""
-"faillog: UID %lu үшін сәтсіз кіру талаптар санағышын нөлдеу сәтсіз аяқталды\n"
+"%s: UID %lu үшін сәтсіз кіру талаптар санағышын нөлдеу сәтсіз аяқталды\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set max for UID %lu\n"
-msgstr "faillog: UID %lu үшін макс мәнін орнату сәтсіз аяқталды\n"
+msgstr "%s: UID %lu үшін макс мәнін орнату сәтсіз аяқталды\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set locktime for UID %lu\n"
-msgstr "faillog: UID %lu үшін блоктау уақытын орнату сәтсіз аяқталды\n"
+msgstr "%s: UID %lu үшін блоктау уақытын орнату сәтсіз аяқталды\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Unknown user or range: %s\n"
+#, c-format
 msgid "%s: Unknown user or range: %s\n"
-msgstr "lastlog: Белгісіз пайдаланушы не аралық: %s\n"
+msgstr "%s: Белгісіз пайдаланушы не аралық: %s\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
+#, c-format
 msgid "%s: Cannot get the size of %s: %s\n"
-msgstr "lastlog: %s өлшемін алу мүмкін емес: %s\n"
+msgstr "%s: %s өлшемін алу мүмкін емес: %s\n"
 
 #, c-format
 msgid ""
@@ -882,10 +840,8 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete ПАЙД             ПАЙДаланушыны ТОПтан өшіру\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir ҮЙ_БУМАСЫ      жаңа тіркелгі үшін үй бумасы\n"
+msgstr ""
 
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         ТОП паролін өшіру\n"
@@ -1131,49 +1087,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: белгісіз пайдаланушы %s\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Қолданылуы: %s [опциялар] [әрекет]\n"
+"Қолданылуы: %s [опциялар] [group [gshadow]]\n"
 "\n"
 "Опциялар:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Қолданылуы: %s [опциялар] [әрекет]\n"
+"Қолданылуы: %s [опциялар] [group]\n"
 "\n"
 "Опциялар:\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -r, --read-only               display errors and warnings\n"
 "                                but do not change files\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* тектес алгоритмдер үшін SHA\n"
-"                                раундтар саны\n"
 
-#, fuzzy
-#| msgid "  -l, --list                    list the members of the group\n"
 msgid "  -s, --sort                    sort entries by UID\n"
-msgstr "  -l, --list                    топ мүшелердің тізімін шығару\n"
+msgstr ""
 
 #, c-format
 msgid "%s: -s and -r are incompatible\n"
@@ -1259,30 +1199,21 @@
 msgid " groups="
 msgstr " топтар="
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
-"  -t, --time КҮН                КҮНнен кейін болған faillog жазбаларын "
-"көрсету\n"
+"  -b, --before КҮН              мерзімі КҮНнен үлкен ғана lastlog жазбаларын көрсету\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
 msgstr ""
-"  -t, --time КҮН                КҮНнен кейін болған faillog жазбаларын "
-"көрсету\n"
+"  -t, --time КҮН                мерзімі КҮНнен кіші ғана lastlog жазбаларын көрсету\n"
 
 msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
+"  -u, --user ТІРКЕЛГІ           көрсетілген ТІРКЕЛГІ үшін lastlog жазбаларын көрсету\n"
 
 msgid "Username         Port     From             Latest"
 msgstr "Пайдаланушы      Порт     Қайдан           Соңғы"
@@ -1488,59 +1419,44 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: жол %d: жазбаны жаңарту мүмкін емес\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
 "  -a, --all                     report password status on all accounts\n"
 msgstr ""
-"  -a, --all                     барлық пайдаланушылар үшін faillog "
-"жазбаларын көрсету\n"
+"  -a, --all                     барлық тіркелгілер үшін парольдер күйін шығару\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -d, --delete                  delete the password for the named account\n"
-msgstr "  -r, --system                  жүйелік тіркелгіні жасау\n"
+msgstr ""
+"  -d, --delete                  көрсетілген тіркелгі үшін парольді өшіру\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -e, --expire                  force expire the password for the named "
 "account\n"
-msgstr "  -r, --system                  жүйелік тіркелгіні жасау\n"
+msgstr ""
+"  -e, --expire                  көрсетілген тіркелгі үшін пароль мерзімінің аяқталуын мәжбүрлету\n"
 
-#, fuzzy
-#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
 msgid "  -k, --keep-tokens             change password only if expired\n"
-msgstr "  -e, --encrypted               берілген парольдер шифрленген\n"
+msgstr ""
+"  -k, --keep-tokens             парольді тек мерзімі аяқталса ғана өзгерту\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password ПАРОЛЬ         парольді осы ПАРОЛЬге (шифрленген) оранту\n"
+"  -i, --inactive INACTIVE       мерзімі аяқталғаннан кейін тіркелгіні сөндіру үшін\n"
+"                                керек күн санын INACTIVE мәніне орнату\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -l, --lock                    lock the password of the named account\n"
-msgstr "  -u, --uid UID                 жаңа тіркелгі үшін пайдаланушы ID-і\n"
+msgstr ""
+"  -l, --lock                    көрсетілген тіркелгіні оқшаулау\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* тектес алгоритмдер үшін SHA\n"
-"                                раундтар саны\n"
+"  -n, --mindays MIN_DAYS        парольді өзгерту арасында ең аз рұқсат етілген күн санын\n"
+"                                MIN_DAYS мәніне орнату\n"
 
 msgid "  -q, --quiet                   quiet mode\n"
 msgstr "  -q, --quiet                   тыныш режимі\n"
@@ -1548,33 +1464,29 @@
 msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 msgstr ""
+"  -r, --repository REPOSITORY   REPOSITORY репозиторийінде парольді өзгерту\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -S, --status                  report password status on the named account\n"
-msgstr "  -r, --system                  жүйелік тіркелгіні жасау\n"
+msgstr ""
+"  -S, --status                  көрсетілген тіркелгі үшін пароль күйін шығару\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
-msgstr "  -u, --uid UID                 жаңа тіркелгі үшін пайдаланушы ID-і\n"
+msgstr ""
+"  -u, --unlock                  көрсетілген тіркелгіні оқшаулаудан босату\n"
 
 msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -w, --warndays WARN_DAYS      мерзімі аяқталуы туралы WARN_DAYS қалғанда ескерте бастау\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              SHA* тектес алгоритмдер үшін SHA\n"
-"                                раундтар саны\n"
+"  -x, --maxdays MAX_DAYS        парольді өзгерту арасында ең көп рұқсат етілген күн санын\n"
+"                                MAX_DAYS мәніне орнату\n"
 
 msgid "Old password: "
 msgstr "Ағымдағы пароль:"
@@ -1656,31 +1568,23 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s: пароль мерзімі туралы ақпарат өзгертілді.\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Қолданылуы: %s [опциялар] [әрекет]\n"
+"Қолданылуы: %s [опциялар] [passwd]\n"
 "\n"
 "Опциялар:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd [shadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Қолданылуы: %s [опциялар] [әрекет]\n"
+"Қолданылуы: %s [опциялар] [passwd [shadow]]\n"
 "\n"
 "Опциялар:\n"
 
@@ -1878,10 +1782,9 @@
 msgid "%s: Cannot drop the controlling terminal\n"
 msgstr "%s: %s құрамасын өшіру мүмкін емес: %s\n"
 
-#, fuzzy, c-format
-#| msgid "Cannot execute %s"
+#, c-format
 msgid "Cannot execute %s\n"
-msgstr "%s орындау мүмкін емес"
+msgstr "%s орындау мүмкін емес\n"
 
 msgid "No password file"
 msgstr "Парольдер файлы жоқ"
@@ -1924,10 +1827,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: %s ішіндегі жол тым ұзын: %s..."
 
-#, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
+#, c-format
 msgid "%s: rename: %s: %s\n"
-msgstr "%s: атын ауыстыру: %s: %s"
+msgstr "%s: атын ауыстыру: %s: %s\n"
 
 #, c-format
 msgid "%s: group '%s' is a NIS group.\n"
@@ -1937,11 +1839,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: шектен көп топ саны көрсетілген (максимум %d).\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "       %s -D\n"
@@ -1950,6 +1848,8 @@
 "Options:\n"
 msgstr ""
 "Қолданылуы: %s [опциялар] ЛОГИН\n"
+"            %s -D\n"
+"            %s -D [опциялар]\n"
 "\n"
 "Опциялар:\n"
 
@@ -2142,24 +2042,16 @@
 "%s: ескерту: үй бумасы бар болып тұр.\n"
 "Оның ішіне skel бумасынан бірде-бір файл көшірілмеді.\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -f, --force                   exit successfully if the group already "
-#| "exists,\n"
-#| "                                and cancel -g if the GID is already used\n"
 msgid ""
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
 msgstr ""
-"  -f, --force                   топ бар болса сәтті шығу, ал GID қолдануда "
-"болса,\n"
-"                                -g опциясынан бас тарту\n"
+"  -f, --force                   файлдарды өшіруді мәжбүрлеу,\n"
+"                                пайдаланушы иелігінде болмаса да\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -r, --remove                  remove home directory and mail spool\n"
-msgstr "  -r, --reset                   сәтсіз кіру талап санағышын нөлдеу\n"
+msgstr ""
+"  -r, --remove                  үй бумасын мен поштасын өшіру\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot remove the primary group of user '%s'\n"
@@ -2222,99 +2114,76 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: %s бумасын өшіру қатемен аяқталды\n"
 
-#, fuzzy
-#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
 msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
-msgstr "  -c, --comment COMMENT         жаңа тіркелгінің GECOS өрісі\n"
+msgstr ""
+"  -c, --comment COMMENT         GECOS жазбасы үшін жаңа мәні\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
 "  -d, --home HOME_DIR           new home directory for the user account\n"
-msgstr "  -d, --home-dir ҮЙ_БУМАСЫ      жаңа тіркелгі үшін үй бумасы\n"
+msgstr ""
+"  -d, --home HOME_DIR           пайдаланушы тіркелгісі үшін жаңа үй бумасы\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
 msgstr ""
-"  -e, --expiredate АЯҚТАЛУ_КҮНІ жаңа тіркелгінің мерзімі аяқталатын күні\n"
+"  -e, --expiredate EXPIRE_DATE  тіркелгінің аяқталу мерзімін EXPIRE_DATE күніне орнату\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password ПАРОЛЬ         парольді осы ПАРОЛЬге (шифрленген) оранту\n"
+"  -f, --inactive INACTIVE       мерзімі аяқталғаннан кейін пароль сөндірілетін күн\n"
+"                                санын INACTIVE мәніне орнату\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
-msgstr "  -g, --gid GID                 жаңа топ үшін GID қолдану\n"
+msgstr ""
+"  -g, --gid ТОП                 жаңа басыңқы топ ретінде ТОПты қолдануды мәжбүрлету\n"
 
-#, fuzzy
-#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
 msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-msgstr "  -M, --members ПАЙД,...        ТОП мүшелерін орнату\n"
+msgstr ""
+"  -G, --groups ТОПТАР           пайдаланушыны қосымша ТОПТАРға қосу\n"
 
 msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
 msgstr ""
+"  -a, --append                  пайдаланушыны қосымша ТОПТАР ішіне қосу\n"
+"                                -G опциясы сияқты, пайдаланушыны басқа топтардан\n"
+"                                өшірмейді\n"
 
 msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
 msgstr ""
+"  -l, --login NEW_LOGIN         тіркелгі үшін жаңа аты\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -L, --lock                    lock the user account\n"
-msgstr "  -u, --uid UID                 жаңа тіркелгі үшін пайдаланушы ID-і\n"
+msgstr ""
+"  -L, --lock                    пайдаланушы тіркелгісін оқшаулау\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
-#| "the\n"
-#| "                                new account\n"
 msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
 msgstr ""
-"  -b, --base-dir НЕГ_БУМА       жаңа тіркелгінің үй бумасы орналасатын\n"
-"                                негізгі бума\n"
+"  -m, --move-home               үй бумасының құрамасын жаңа жерге ауыстыру\n"
+"                                (тек -d опциясымен бірге қолданыңыз)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
-#| "GID\n"
 msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
 msgstr ""
-"  -o, --non-unique              қайталанатын (ерекше емес) GID қолдануға "
-"рұқсат ету\n"
+"  -o, --non-unique              қайталанатын (ерекше емес) UID-тарды қолдануды рұқсат ету\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       use this encrypted password for the new "
-#| "group\n"
 msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
 msgstr ""
-"  -p, --password ПАРОЛЬ         бұл шифрленген парольді жаңа топ үшін "
-"қолдану\n"
+"  -p, --password PASSWORD       жаңа пароль ретінде шифрленген парольді қолдану\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -u, --uid UID                 new UID for the user account\n"
 msgstr "  -u, --uid UID                 жаңа тіркелгі үшін пайдаланушы ID-і\n"
+"  -u, --uid UID                 пайдаланушы тіркелгісі үшін жаңа UID\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -U, --unlock                  unlock the user account\n"
-msgstr "  -u, --uid UID                 жаңа тіркелгі үшін пайдаланушы ID-і\n"
+msgstr ""
+"  -U, --unlock                  пайдаланушы тіркелгісін оқшаулаудан босату\n"
 
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "

Modified: upstream/trunk/po/pt.po
===================================================================
--- upstream/trunk/po/pt.po	2011-12-09 21:31:39 UTC (rev 3652)
+++ upstream/trunk/po/pt.po	2011-12-09 21:35:47 UTC (rev 3653)
@@ -7,7 +7,7 @@
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2011-11-13 18:42+0100\n"
-"PO-Revision-Date: 2011-04-22 14:43+0100\n"
+"PO-Revision-Date: 2011-11-24 23:06+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
 "Language: pt\n"
@@ -223,10 +223,9 @@
 "%s: Configuração inválida: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
 "(%lu)\n"
 
-#, fuzzy, c-format
-#| msgid "failed to allocate memory"
+#, c-format
 msgid "%s: failed to allocate memory: %s\n"
-msgstr "falhou alocar memória"
+msgstr "%s: falhou alocar memória: %s\n"
 
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
@@ -391,64 +390,52 @@
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
 msgstr ""
+"  -d, --lastday ÚLTIMO_DIA      definir data da última alteração da\n"
+"                                palavra-passe para ÚLTIMO_DIA\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-msgstr "  -e, --expiredate DATA_EXPIRA  data de expiração para a nova conta\n"
+msgstr ""
+"  -E, --expiredate DATA_EXPIRA  definir a data em que a conta caduca\n"
+"                                para DATA_EXPIRA\n"
 
 msgid "  -h, --help                    display this help message and exit\n"
-msgstr "  -h, --help\t\tmostrar esta mensagem de ajuda e sair\n"
+msgstr "  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password PALAVRAPASSE\t mudar a palavra-passe para esta "
-"PALAVRAPASSE\n"
-"\t\t\t\t (encriptada)\n"
+"  -I, --inactive INACTIVO       definir a palavra-passe como inactiva após\n"
+"                                expirar em INACTIVO\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -l, --list                    show account aging information\n"
-msgstr "  -r, --reset\t\tapagar o contador de logins falhados\n"
+msgstr ""
+"  -l, --list                    mostrar informação de envelhecimento da \n"
+"                                conta\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              número de iterações SHA para algoritmos\n"
-"                                de encriptação SHA*\n"
+"  -m, --mindays MIN_DIAS        definir para MIN_DIAS o número mínimo de\n"
+"                                dias para alterar a palavra-passe\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              número de iterações SHA para algoritmos\n"
-"                                de encriptação SHA*\n"
+"  -M, --maxdays MAX_DIAS        definir para MAX_DIAS o número máximo de\n"
+"                                dias para alterar a palavra-passe\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir HOME_DIR\tdirectório home para a nova conta\n"
+msgstr ""
 
 msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -W, --warndays DIAS_AVISO     definir para DIAS_AVISO o número de dias\n"
+"                                para aviso de caducar\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Introduza o novo valor, ou carregue em ENTER para o valor pré-definido"
@@ -558,17 +545,13 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: erro na alteração de campos\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [LOGIN]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Utilização: %s [opções] LOGIN\n"
+"Utilização: %s [opções] [LOGIN]\n"
 "\n"
 "Opções:\n"
 
@@ -584,10 +567,8 @@
 msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -u, --help                    display this help message and exit\n"
-msgstr "  -h, --help\t\tmostrar esta mensagem de ajuda e sair\n"
+msgstr "  -u, --help                    mostrar esta mensagem de ajuda e sair\n"
 
 msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
 msgstr ""
@@ -678,17 +659,17 @@
 
 #, c-format
 msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
-msgstr "  -c, --crypt-method <MÉTODO>\to método crypt (um de %s)\n"
+msgstr "  -c, --crypt-method <MÉTODO>   o método crypt (um de %s)\n"
 
 msgid "  -e, --encrypted               supplied passwords are encrypted\n"
-msgstr "  -e, --encrypted\t\tas palavras-passe fornecidas são encriptadas\n"
+msgstr "  -e, --encrypted               as palavras-passe fornecidas são encriptadas\n"
 
 msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
 msgstr ""
-"  -m, --md5\t\t\t encriptar a palavra-passe de texto\n"
-"\t\t\t utilizando o algoritmo MD5\n"
+"  -m, --md5                     encriptar a palavra-passe de texto\n"
+"                                utilizando o algoritmo MD5\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -737,10 +718,10 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: linha %d: o utilizador '%s' não existe\n"
 
-#, fuzzy
-#| msgid "  -s, --shell SHELL             login shell of the new account\n"
 msgid "  -s, --shell SHELL             new login shell for the user account\n"
-msgstr "  -s, --shell SHELL\t\tshell de login para a nova conta\n"
+msgstr ""
+"  -s, --shell SHELL             nova shell de login para a conta do\n"
+"                                utilizador\n"
 
 msgid "Login Shell"
 msgstr "Shell de Login"
@@ -769,57 +750,47 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: Aviso: %s não é executável\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -u, --user                    which user's tcb shadow file to edit\n"
 msgid "  -c, --check                   check the user's password expiration\n"
-msgstr "  -u, --user\t\tqual o ficheiro shadow tcb do utilizador a editar\n"
+msgstr ""
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -f, --force                   force password change if the user's "
 "password\n"
 "                                is expired\n"
 msgstr ""
-"  -m, --md5\t\t\t encriptar a palavra-passe de texto\n"
-"\t\t\t utilizando o algoritmo MD5\n"
 
 #, c-format
 msgid "%s: options %s and %s conflict\n"
 msgstr "%s: conflito entre as opções %s e %s\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: unexpected argument: %s\n"
+#, c-format
 msgid "%s: unexpected argument: %s\n"
-msgstr "lastlog: argumento inesperado: %s\n"
+msgstr "%s: argumento inesperado: %s\n"
 
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
-"  -a, --all\t\t\tmostrar registos do faillog para todos os utilizadores\n"
+"  -a, --all                     mostrar registos do faillog para todos os utilizadores\n"
 
 msgid ""
 "  -l, --lock-secs SEC           after failed login lock account for SEC "
 "seconds\n"
 msgstr ""
-"  -l, --lock-secs SEG\t\t depois de login falhado bloquear por SEG segundos\n"
+"  -l, --lock-secs SEG           depois de login falhado bloquear por SEG segundos\n"
 
 msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 msgstr ""
-"  -m, --maximum MAX\t\tdefinir os contadores de máximo de logins falhados "
+"  -m, --maximum MAX             definir os contadores de máximo de logins falhados "
 "para MAX\n"
 
 msgid "  -r, --reset                   reset the counters of login failures\n"
-msgstr "  -r, --reset\t\tapagar o contador de logins falhados\n"
+msgstr "  -r, --reset                   apagar o contador de logins falhados\n"
 
 msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
 msgstr ""
-"  -t, --time DIAS\t\t mostrar os registos do faillog mais recentes do que "
+"  -t, --time DIAS               mostrar os registos do faillog mais recentes do que "
 "DIAS\n"
 
 msgid ""
@@ -827,14 +798,13 @@
 "                                counters and limits (if used with -r, -m,\n"
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
-"  -u, --user LOGIN/RANGE\tmostrar registo faillog ou manter contadores\n"
-"\t\t\tde falhas e limites (se utilizado com -r, -m\n"
-"\t\t\tou -l) apenas para LOGIN(s) especificado(s)\n"
+"  -u, --user LOGIN/RANGE        mostrar registo faillog ou manter contadores\n"
+"                                de falhas e limites (se utilizado com -r, -m\n"
+"                                ou -l) apenas para LOGIN(s) especificado(s)\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+#, c-format
 msgid "%s: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: Falhou obter a entrada para UID %lu\n"
+msgstr "%s: Falhou obter a entrada para UID %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Falhas   Máximo  Última                   Em\n"
@@ -847,30 +817,25 @@
 msgid " [%lds lock]"
 msgstr " [%lds bloqueio]"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, c-format
 msgid "%s: Failed to reset fail count for UID %lu\n"
-msgstr "faillog: Falhou reiniciar a contagem de falhas para o UID %lu\n"
+msgstr "%s: Falhou reiniciar a contagem de falhas para o UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set max for UID %lu\n"
-msgstr "faillog: Falhou definir o máximo para UID %lu\n"
+msgstr "%s: Falhou definir o máximo para UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set locktime for UID %lu\n"
-msgstr "faillog: Falhou definir a hora de bloqueio para UID %lu\n"
+msgstr "%s: Falhou definir a hora de bloqueio para UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Unknown user or range: %s\n"
+#, c-format
 msgid "%s: Unknown user or range: %s\n"
-msgstr "lastlog: Utilizador ou gama desconhecida: %s\n"
+msgstr "%s: Utilizador ou gama desconhecida: %s\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
+#, c-format
 msgid "%s: Cannot get the size of %s: %s\n"
-msgstr "lastlog: Não conseguiu obter o tamanho de %s: %s\n"
+msgstr "%s: Não conseguiu obter o tamanho de %s: %s\n"
 
 #, c-format
 msgid ""
@@ -883,32 +848,30 @@
 "Opções:\n"
 
 msgid "  -a, --add USER                add USER to GROUP\n"
-msgstr "  -a, --add UTILIZADOR\t\tacrescentar UTILIZADOR ao GRUPO\n"
+msgstr "  -a, --add UTILIZADOR          acrescentar UTILIZADOR ao GRUPO\n"
 
 msgid "  -d, --delete USER             remove USER from GROUP\n"
-msgstr "  -d, --delete UTILIZADOR\tremover UTILIZADOR do GRUPO\n"
+msgstr "  -d, --delete UTILIZADOR       remover UTILIZADOR do GRUPO\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir HOME_DIR\tdirectório home para a nova conta\n"
+msgstr ""
 
 msgid "  -r, --remove-password         remove the GROUP's password\n"
-msgstr "  -r, --remove-password\tremover a palavra-passe do GRUPO\n"
+msgstr "  -r, --remove-password         remover a palavra-passe do GRUPO\n"
 
 msgid ""
 "  -R, --restrict                restrict access to GROUP to its members\n"
-msgstr "  -R, --restrict\t\trestringir acesso ao grupo aos seus membros\n"
+msgstr "  -R, --restrict          restringir acesso ao grupo aos seus membros\n"
 
 msgid "  -M, --members USER,...        set the list of members of GROUP\n"
-msgstr "  -M, --members UTILIZADOR,...\tdefinir a lista de membros do GRUPO\n"
+msgstr "  -M, --members UTILIZADOR,...  definir a lista de membros do GRUPO\n"
 
 msgid ""
 "  -A, --administrators ADMIN,...\n"
 "                                set the list of administrators for GROUP\n"
 msgstr ""
 "  -A, --administrators ADMIN,...\n"
-"\t\t\tdefinir a lista de administradores do GRUPO\n"
+"                                definir a lista de administradores do GRUPO\n"
 
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
 msgstr "Excepto para as opções -A e -M, as opções não podem ser combinadas.\n"
@@ -976,32 +939,32 @@
 "exists,\n"
 "                                and cancel -g if the GID is already used\n"
 msgstr ""
-"  -f, --force\t\tsair com sucesso se o grupo já existir,\n"
-"\t\t\te cancelar -g se o GID já for utilizado\n"
+"  -f, --force                   sair com sucesso se o grupo já existir,\n"
+"                                e cancelar -g se o GID já for utilizado\n"
 
 msgid "  -g, --gid GID                 use GID for the new group\n"
-msgstr "  -g, --gid GID\t\tutilizar GID para o novo grupo\n"
+msgstr "  -g, --gid GID                 utilizar GID para o novo grupo\n"
 
 msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
 msgstr ""
-"  -K, --key KEY=VALOR\t\tultrapassar as predefinições de /etc/login.defs\n"
+"  -K, --key KEY=VALOR           ultrapassar as predefinições de /etc/login.defs\n"
 
 msgid ""
 "  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
 msgstr ""
-"  -o, --non-unique\t\t permitir criar grupos com GIDs duplicados\n"
-"\t\t\t\t (não-únicos)\n"
+"  -o, --non-unique              permitir criar grupos com GIDs duplicados\n"
+"                                (não-únicos)\n"
 
 msgid ""
 "  -p, --password PASSWORD       use this encrypted password for the new "
 "group\n"
 msgstr ""
-"  -p, --password PALAVRA-PASSE\t utilizar a palavra-passe encriptada para o "
+"  -p, --password PALAVRA-PASSE  utilizar a palavra-passe encriptada para o "
 "novo grupo\n"
 
 msgid "  -r, --system                  create a system account\n"
-msgstr "  -r, --system\t\tcriar uma conta de sistema\n"
+msgstr "  -r, --system                  criar uma conta de sistema\n"
 
 #, c-format
 msgid "%s: '%s' is not a valid group name\n"
@@ -1062,7 +1025,7 @@
 "\n"
 "Options:\n"
 msgstr ""
-"Utilização: %s [opções] [acção}\n"
+"Utilização: %s [opções] [acção]\n"
 "\n"
 "Opções:\n"
 
@@ -1071,8 +1034,8 @@
 "group\n"
 "                                (root only)\n"
 msgstr ""
-"  -g, --group nomegrupo\t mudar nomegrupo em vez do grupo do utilizador\n"
-"\t\t\t\t (apenas root)\n"
+"  -g, --group nomegrupo         mudar nomegrupo em vez do grupo do utilizador\n"
+"                                (apenas root)\n"
 
 msgid "\n"
 msgstr "\n"
@@ -1083,20 +1046,20 @@
 msgid ""
 "  -a, --add username            add username to the members of the group\n"
 msgstr ""
-"  -a, --add NomeUtilizador\t acrescentar NomeUtilizador aos membros do "
+"  -a, --add NomeUtilizador      acrescentar NomeUtilizador aos membros do "
 "grupo\n"
 
 msgid ""
 "  -d, --delete username         remove username from the members of the "
 "group\n"
 msgstr ""
-"  -d, --delete NomeUtilizador\t remover NomeUtilizador dos membros do grupo\n"
+"  -d, --delete NomeUtilizador   remover NomeUtilizador dos membros do grupo\n"
 
 msgid "  -p, --purge                   purge all members from the group\n"
-msgstr "  -p, --purge\t\tpurgar todos os membros do grupo\n"
+msgstr "  -p, --purge                   purgar todos os membros do grupo\n"
 
 msgid "  -l, --list                    list the members of the group\n"
-msgstr "  -l, --list\t\tlistar os membros do grupo\n"
+msgstr "  -l, --list                    listar os membros do grupo\n"
 
 #, c-format
 msgid "%s: your groupname does not match your username\n"
@@ -1107,23 +1070,23 @@
 msgstr "%s: apenas o root pode utilizar a opção -g/--group\n"
 
 msgid "  -g, --gid GID                 change the group ID to GID\n"
-msgstr "  -g, --gid GID\t\tmudar o ID do grupo para GID\n"
+msgstr "  -g, --gid GID                 mudar o ID do grupo para GID\n"
 
 msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
-msgstr " --n, --new-name NOVO_GRUPO\tmudar o nome para NOVO_GRUPO\n"
+msgstr " --n, --new-name NOVO_GRUPO     mudar o nome para NOVO_GRUPO\n"
 
 msgid ""
 "  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
 msgstr ""
-"  -o, ..non-unique\t\t permitir utilizar um GID duplicado (não-único)\n"
+"  -o, ..non-unique              permitir utilizar um GID duplicado (não-único)\n"
 
 msgid ""
 "  -p, --password PASSWORD       change the password to this (encrypted)\n"
 "                                PASSWORD\n"
 msgstr ""
-"  -p, --password PALAVRAPASSE\t mudar a palavra-passe para esta "
+"  -p, --password PALAVRAPASSE   mudar a palavra-passe para esta "
 "PALAVRAPASSE\n"
-"\t\t\t\t (encriptada)\n"
+"                                (encriptada)\n"
 
 #, c-format
 msgid "%s: invalid group name '%s'\n"
@@ -1137,49 +1100,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: utilizador desconhecido %s\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Utilização: %s [opções] [acção}\n"
+"Utilização: %s [opções] [grupo [gshadow]]\n"
 "\n"
 "Opções:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Utilização: %s [opções] [acção}\n"
+"Utilização: %s [opções] [grupo]\n"
 "\n"
 "Opções:\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -r, --read-only               display errors and warnings\n"
 "                                but do not change files\n"
 msgstr ""
-"  -s, --sha-rounds              número de iterações SHA para algoritmos\n"
-"                                de encriptação SHA*\n"
 
-#, fuzzy
-#| msgid "  -l, --list                    list the members of the group\n"
 msgid "  -s, --sort                    sort entries by UID\n"
-msgstr "  -l, --list\t\tlistar os membros do grupo\n"
+msgstr ""
 
 #, c-format
 msgid "%s: -s and -r are incompatible\n"
@@ -1265,30 +1212,24 @@
 msgid " groups="
 msgstr " grupos="
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
-"  -t, --time DIAS\t\t mostrar os registos do faillog mais recentes do que "
-"DIAS\n"
+"  -b, --before DIAS             escrever apenas registos de lastlog mais\n"
+"                                antigos que DIAS\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
 msgstr ""
-"  -t, --time DIAS\t\t mostrar os registos do faillog mais recentes do que "
-"DIAS\n"
+"  -t, --time DIAS               escrever apenas registos de lastlog mais\n"
+"                                recentes que DIAS\n"
 
 msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
+"  -u, --user LOGIN              mostra o registo de lastlog para o\n"
+"                                utilizador LOGIN\n"
 
 msgid "Username         Port     From             Latest"
 msgstr "Utilizador       Porto    De               Último"
@@ -1438,10 +1379,10 @@
 
 #, c-format
 msgid "  -c, --crypt-method            the crypt method (one of %s)\n"
-msgstr "  -c, --crypt-method\t\to método de encriptação (um de %s)\n"
+msgstr "  -c, --crypt-method            o método de encriptação (um de %s)\n"
 
 msgid "  -r, --system                  create system accounts\n"
-msgstr "  -r, --system\t\tcriar contas de sistema\n"
+msgstr "  -r, --system                  criar contas de sistema\n"
 
 #, c-format
 msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
@@ -1493,94 +1434,81 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: linha %d: não é possível actualizar o registo\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
 "  -a, --all                     report password status on all accounts\n"
 msgstr ""
-"  -a, --all\t\t\tmostrar registos do faillog para todos os utilizadores\n"
+"  -a, --all                     reportar o estado das palavras-passe de\n"
+"                                todas as contas\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -d, --delete                  delete the password for the named account\n"
-msgstr "  -r, --system\t\tcriar uma conta de sistema\n"
+msgstr ""
+"  -d, --delete                  apagar a palavra-passe para a conta indicada\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -e, --expire                  force expire the password for the named "
 "account\n"
-msgstr "  -r, --system\t\tcriar uma conta de sistema\n"
+msgstr ""
+"  -e, --expire                  forçar que a palavra-passe caduque para a\n"
+"                                conta indicada\n"
 
-#, fuzzy
-#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
 msgid "  -k, --keep-tokens             change password only if expired\n"
-msgstr "  -e, --encrypted\t\tas palavras-passe fornecidas são encriptadas\n"
+msgstr ""
+"  -k, --keep-tokens             apenas mudar a palavra-passe se tiver\n"
+"                                caducado\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password PALAVRAPASSE\t mudar a palavra-passe para esta "
-"PALAVRAPASSE\n"
-"\t\t\t\t (encriptada)\n"
+"  -i, --inactive INACTIVA       definir a palavra-passe como inactiva após\n"
+"                                caducar para INACTIVA\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -l, --lock                    lock the password of the named account\n"
-msgstr "  -u, --uid UID\t\tID do utilizador para a nova conta\n"
+msgstr ""
+"  -l, --lock                    bloquear a palavra-passe da conta indicada\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              número de iterações SHA para algoritmos\n"
-"                                de encriptação SHA*\n"
+"  -n, --mindays MIN_DIAS        definir para MIN_DIAS o número de dias\n"
+"                                antes de alterar a palavra-passe\n"
 
 msgid "  -q, --quiet                   quiet mode\n"
-msgstr "  -q, --quiet\t\tmodo silencioso\n"
+msgstr "  -q, --quiet                   modo silencioso\n"
 
 msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 msgstr ""
+"  -r, --repository REPOSITÓRIO  mudar a palavra-passe no repositório\n"
+"                                REPOSITÓRIO\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -S, --status                  report password status on the named account\n"
-msgstr "  -r, --system\t\tcriar uma conta de sistema\n"
+msgstr ""
+"  -S, --status                  reportar estado da palavra-passe na conta\n"
+"                                indicada\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
-msgstr "  -u, --uid UID\t\tID do utilizador para a nova conta\n"
+msgstr ""
+"  -u, --unlock                  desbloquear a palavra-passe da conta\n"
+"                                indicada\n"
 
 msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -w, --warndays AVISAR_DIAS    definir para AVISAR_DIAS o número de dias\n"
+"                                para alerta de caducar\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              número de iterações SHA para algoritmos\n"
-"                                de encriptação SHA*\n"
+"  -x, --maxdays MAX_DIAS        definir para MAX_DIAS o número de dias\n"
+"                                máximo antes de alterar a palavra-passe\n"
 
 msgid "Old password: "
 msgstr "Palavra-passe antiga: "
@@ -1665,38 +1593,30 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s: informação de caducidade da palavra-passe alterada.\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Utilização: %s [opções] [acção}\n"
+"Utilização: %s [opções] [passwd]\n"
 "\n"
 "Opções:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd [shadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Utilização: %s [opções] [acção}\n"
+"Utilização: %s [opções] [passwd [shadow]]\n"
 "\n"
 "Opções:\n"
 
 #, fuzzy
 #| msgid "  -q, --quiet                   quiet mode\n"
 msgid "  -q, --quiet                   report errors only\n"
-msgstr "  -q, --quiet\t\tmodo silencioso\n"
+msgstr "  -q, --quiet                   modo silencioso\n"
 
 #, c-format
 msgid "%s: no alternative shadow file allowed when USE_TCB is enabled.\n"
@@ -1886,10 +1806,9 @@
 msgid "%s: Cannot drop the controlling terminal\n"
 msgstr "%s: Não pode remover o conteúdo de %s: %s\n"
 
-#, fuzzy, c-format
-#| msgid "Cannot execute %s"
+#, c-format
 msgid "Cannot execute %s\n"
-msgstr "Não foi possível executar %s"
+msgstr "Não foi possível executar %s\n"
 
 msgid "No password file"
 msgstr "Ficheiro de palavras-passe não existe"
@@ -1934,10 +1853,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: linha demasiado longa em %s: %s..."
 
-#, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
+#, c-format
 msgid "%s: rename: %s: %s\n"
-msgstr "%s: renomear: %s: %s"
+msgstr "%s: renomear: %s: %s\n"
 
 #, c-format
 msgid "%s: group '%s' is a NIS group.\n"
@@ -1947,11 +1865,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: estão especificados demasiados grupos (max %d).\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "       %s -D\n"
@@ -1960,6 +1874,8 @@
 "Options:\n"
 msgstr ""
 "Utilização: %s [opções] LOGIN\n"
+"            %s -D\n"
+"            %s -D [opções]\n"
 "\n"
 "Opções:\n"
 
@@ -1968,20 +1884,20 @@
 "the\n"
 "                                new account\n"
 msgstr ""
-"  -b, --base-dir BASE_DIR\t directório base para o directório home da \t\t\t"
-"\t nova conta\n"
+"  -b, --base-dir BASE_DIR       directório base para o directório home da\n"
+"                                nova conta\n"
 
 msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
-msgstr "  -c, --comment COMENTÁRIO\tcampo GECOS da nova conta\n"
+msgstr "  -c, --comment COMENTÁRIO      campo GECOS da nova conta\n"
 
 msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
-msgstr "  -d, --home-dir HOME_DIR\tdirectório home para a nova conta\n"
+msgstr "  -d, --home-dir HOME_DIR       directório home para a nova conta\n"
 
 msgid ""
 "  -D, --defaults                print or change default useradd "
 "configuration\n"
 msgstr ""
-"  -D, --defauls\t\t escrever ou alterar a configuração predefinida de "
+"  -D, --defauls                 escrever ou alterar a configuração predefinida de "
 "useradd\n"
 
 msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
@@ -1991,74 +1907,74 @@
 "  -f, --inactive INACTIVE       password inactivity period of the new "
 "account\n"
 msgstr ""
-"  -f, --inactiva INACTIVA\t período de inactividade da palavra-passe para a "
+"  -f, --inactiva INACTIVA       período de inactividade da palavra-passe para a "
 "nova conta\n"
 
 msgid ""
 "  -g, --gid GROUP               name or ID of the primary group of the new\n"
 "                                account\n"
-msgstr "  -g, --gid GRUPO\t\t nome ou ID do grupo primário da nova conta\n"
+msgstr "  -g, --gid GRUPO        nome ou ID do grupo primário da nova conta\n"
 
 msgid ""
 "  -G, --groups GROUPS           list of supplementary groups of the new\n"
 "                                account\n"
 msgstr ""
-"  -G, --groups GRUPOS\t\t lista de grupos suplementares da nova conta\n"
+"  -G, --groups GRUPOS           lista de grupos suplementares da nova conta\n"
 
 msgid ""
 "  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
 msgstr ""
-"  -k, --skel SKEL_DIR\t\t utilizar este directório skeleton como "
+"  -k, --skel SKEL_DIR           utilizar este directório skeleton como "
 "alternativa\n"
 
 msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
 msgstr ""
-"  -l, --no-log-init\t\t não acrescentar o utilizador às bases de\n"
-"dados lastlog e faillog\n"
+"  -l, --no-log-init             não acrescentar o utilizador às bases de\n"
+"                                dados lastlog e faillog\n"
 
 msgid "  -m, --create-home             create the user's home directory\n"
-msgstr "  -m, --create-home\t\tcriar o directório home do utilizador\n"
+msgstr "  -m, --create-home             criar o directório home do utilizador\n"
 
 msgid ""
 "  -M, --no-create-home          do not create the user's home directory\n"
-msgstr "  -M, --no-create-home\t\t não criar o directório home do utilizador\n"
+msgstr "  -M, --no-create-home          não criar o directório home do utilizador\n"
 
 msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 msgstr ""
-"  -N, --no-user-group\t\t não criar um grupo com o mesmo nome do utilizador\n"
+"  -N, --no-user-group           não criar um grupo com o mesmo nome do utilizador\n"
 
 msgid ""
 "  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
 msgstr ""
-"  -o, --non-unique\t\t permitir criar utilizadores com UID\n"
-"\t\t\t\t duplicado (não-único)\n"
+"  -o, --non-unique              permitir criar utilizadores com UID\n"
+"                                duplicado (não-único)\n"
 
 msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
 msgstr ""
 "  -p, --password PALAVRA-PASSE  palavra-passe encriptada para a nova conta\n"
 
 msgid "  -s, --shell SHELL             login shell of the new account\n"
-msgstr "  -s, --shell SHELL\t\tshell de login para a nova conta\n"
+msgstr "  -s, --shell SHELL      shell de login para a nova conta\n"
 
 msgid "  -u, --uid UID                 user ID of the new account\n"
-msgstr "  -u, --uid UID\t\tID do utilizador para a nova conta\n"
+msgstr "  -u, --uid UID          ID do utilizador para a nova conta\n"
 
 msgid ""
 "  -U, --user-group              create a group with the same name as the "
 "user\n"
-msgstr "  -U, --user-group\t\t criar um grupo com o mesmo nome do utilizador\n"
+msgstr "  -U, --user-group       criar um grupo com o mesmo nome do utilizador\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux user "
 "mapping\n"
 msgstr ""
-"  -Z, --selinux-user SEUSER\t utilizar um SEUSER especifico para o \t\t\t\t "
-"mapeamento do utilizador de SELinux\n"
+"  -Z, --selinux-user SEUSER     utilizar um SEUSER especifico para o\n"
+"                                mapeamento do utilizador de SELinux\n"
 
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
@@ -2157,23 +2073,16 @@
 "%s: aviso: o directório home já existe.\n"
 "Não irá copiar quaisquer ficheiros o directório skel para lá.\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -f, --force                   exit successfully if the group already "
-#| "exists,\n"
-#| "                                and cancel -g if the GID is already used\n"
 msgid ""
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
 msgstr ""
-"  -f, --force\t\tsair com sucesso se o grupo já existir,\n"
-"\t\t\te cancelar -g se o GID já for utilizado\n"
+"  -f, --force                   forçar a remoção de ficheiros,\n"
+"                                mesmo que não pertençam ao utilizador\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -r, --remove                  remove home directory and mail spool\n"
-msgstr "  -r, --reset\t\tapagar o contador de logins falhados\n"
+msgstr ""
+"  -r, --remove                  remover o directório home e o spool de mail\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot remove the primary group of user '%s'\n"
@@ -2238,105 +2147,88 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: erro ao remover o directório %s\n"
 
-#, fuzzy
-#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
 msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
-msgstr "  -c, --comment COMENTÁRIO\tcampo GECOS da nova conta\n"
+msgstr ""
+"  -c, --comment COMENTÁRIO      novo valor do campo GECOS\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
 "  -d, --home HOME_DIR           new home directory for the user account\n"
-msgstr "  -d, --home-dir HOME_DIR\tdirectório home para a nova conta\n"
+msgstr ""
+"  -d, --home HOME_DIR           novo directório home para a conta do\n"
+"                                utilizador\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-msgstr "  -e, --expiredate DATA_EXPIRA  data de expiração para a nova conta\n"
+msgstr ""
+"  -e, --expiredate DATA_EXPIRAR definir a data em que a conta caduca\n"
+"                                para DATA_EXPIRAR\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password PALAVRAPASSE\t mudar a palavra-passe para esta "
-"PALAVRAPASSE\n"
-"\t\t\t\t (encriptada)\n"
+"  -f, --inactive INACTIVA       definir para INACTIVA o número de dias após\n"
+"                                os quais uma palavra-passe caducada passa\n"
+"                                a inactiva\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
-msgstr "  -g, --gid GID\t\tutilizar GID para o novo grupo\n"
+msgstr ""
+"  -g, --gid GRUPO               forçar a utilização do GRUPO como novo\n"
+"                                grupo primário\n"
 
-#, fuzzy
-#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
 msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-msgstr "  -M, --members UTILIZADOR,...\tdefinir a lista de membros do GRUPO\n"
+msgstr ""
+"  -G, --groups GRUPOS           nova lista de grupos adicionais\n"
 
 msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
 msgstr ""
+"  -a, --append                  juntar o utilizador aos GRUPOS\n"
+"                                suplementares mencionados pela opção -G\n"
+"                                sem o/a remover dos outros grupos\n"
 
 msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
 msgstr ""
+"  -l, --login NEW_LOGIN         novo valor para o nome de login\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -L, --lock                    lock the user account\n"
-msgstr "  -u, --uid UID\t\tID do utilizador para a nova conta\n"
+msgstr ""
+"  -L, --lock                    bloquear a conta do utilizador\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
-#| "the\n"
-#| "                                new account\n"
 msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
 msgstr ""
-"  -b, --base-dir BASE_DIR\t directório base para o directório home da \t\t\t"
-"\t nova conta\n"
+"  -m, --move-home               mover o conteúdo do directório home para\n"
+"                                o novo local (usar apenas com -d)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
-#| "GID\n"
 msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
 msgstr ""
-"  -o, ..non-unique\t\t permitir utilizar um GID duplicado (não-único)\n"
+"  -o, --non-unique              permitir utilizar UID duplicado\n"
+"                                (não único)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       use this encrypted password for the new "
-#| "group\n"
 msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
 msgstr ""
-"  -p, --password PALAVRA-PASSE\t utilizar a palavra-passe encriptada para o "
-"novo grupo\n"
+"  -p, --password PALAVRA-PASSE  utilizar PALAVRA-PASSE encriptada para a\n"
+"                                nova palavra-passe\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -u, --uid UID                 new UID for the user account\n"
-msgstr "  -u, --uid UID\t\tID do utilizador para a nova conta\n"
+msgstr ""
+"  -u, --uid UID                 novo UID para a conta do utilizador\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -U, --unlock                  unlock the user account\n"
-msgstr "  -u, --uid UID\t\tID do utilizador para a nova conta\n"
+msgstr ""
+"  -U, --unlock                  desbloquear a conta do utilizador\n"
 
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
 "account\n"
 msgstr ""
-"  -Z, --selinux-user\t\t novo mapeamento de utilizador SELinux para a conta "
+"  -Z, --selinux-user            novo mapeamento de utilizador SELinux para a conta "
 "do utilizador\n"
 
 #, c-format
@@ -2437,16 +2329,16 @@
 "Opções:\n"
 
 msgid "  -g, --group                   edit group database\n"
-msgstr "  -g, --group\t\teditar base de dados de grupos\n"
+msgstr "  -g, --group                   editar base de dados de grupos\n"
 
 msgid "  -p, --passwd                  edit passwd database\n"
-msgstr "  -p, --passwd\t\teditar a base de dados passwd\n"
+msgstr "  -p, --passwd                  editar a base de dados passwd\n"
 
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
-msgstr "  -s, --shadow\t\teditar a base de dados shadow ou gshadow\n"
+msgstr "  -s, --shadow                  editar a base de dados shadow ou gshadow\n"
 
 msgid "  -u, --user                    which user's tcb shadow file to edit\n"
-msgstr "  -u, --user\t\tqual o ficheiro shadow tcb do utilizador a editar\n"
+msgstr "  -u, --user                    qual o ficheiro shadow tcb do utilizador a editar\n"
 
 #, c-format
 msgid "%s: failed to remove %s\n"

Modified: upstream/trunk/po/pt_BR.po
===================================================================
--- upstream/trunk/po/pt_BR.po	2011-12-09 21:31:39 UTC (rev 3652)
+++ upstream/trunk/po/pt_BR.po	2011-12-09 21:35:47 UTC (rev 3653)
@@ -7,7 +7,7 @@
 "Project-Id-Version: shadow 4.0.15\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2011-11-13 18:42+0100\n"
-"PO-Revision-Date: 2011-04-12 00:16-0300\n"
+"PO-Revision-Date: 2011-11-25 20:20+0100\n"
 "Last-Translator: Fred Ulisses Maranhão <fred.maranhao at gmail.com>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
 "Language: \n"
@@ -220,10 +220,9 @@
 "%s: Configuração inválida: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
 "(%lu)\n"
 
-#, fuzzy, c-format
-#| msgid "failed to allocate memory"
+#, c-format
 msgid "%s: failed to allocate memory: %s\n"
-msgstr "falha ao alocar memória"
+msgstr "%s: falha ao alocar memória: %s\n"
 
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
@@ -386,62 +385,48 @@
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
 msgstr ""
+"  -d, --lastday ULTIMO_DIA      define última mudança de senha para ULTIMO_DIA\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
 msgstr ""
-"  -e, --expiredate DATA_DE_EXPIRAÇÃO  data de expiração da nova conta\n"
+"  -E, --expiredate DATA_EXPIRAÇÃO\n"
+"                                define data de expiração de conta para\n"
+"                                DATA_EXPIRAÇÃO\n"
 
 msgid "  -h, --help                    display this help message and exit\n"
 msgstr ""
 "  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password SENHA          muda a senha para esta SENHA "
-"(criptografada)\n"
+"  -I, --inactive INATIVO        define senha inativa após expiração\n"
+"                                para INATIVO\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -l, --list                    show account aging information\n"
 msgstr ""
-"  -r, --reset                   zera os contadores de falhas de login\n"
+"  -l, --list                    exibe informação sobre idade da conta\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"-s, --sha-rounds                Números de SHA rodadas para a SHA *\n"
-"                                algoritmos criptografados\n"
+"  -m, --mindays MIN_DIAS        define número mínimo de dias antes da\n"
+"                                troca de senha para MIN_DIAS\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"-s, --sha-rounds                Números de SHA rodadas para a SHA *\n"
-"                                algoritmos criptografados\n"
+"  -M, --maxdays MAX_DIAS        define número 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"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir DIR_PESSOAL    diretório pessoal da nova conta\n"
+msgstr ""
 
 msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
@@ -555,17 +540,13 @@
 msgid "%s: error changing fields\n"
 msgstr "%s : erro modificando campos\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [LOGIN]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Uso: %s [opções] LOGIN\n"
+"Uso: %s [opções] [LOGIN]\n"
 "\n"
 "Opções:\n"
 
@@ -581,11 +562,9 @@
 msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -u, --help                    display this help message and exit\n"
 msgstr ""
-"  -h, --help                    mostrar esta mensagem de ajuda e sair\n"
+"  -u, --help                    mostrar esta mensagem de ajuda e sair\n"
 
 msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
 msgstr ""
@@ -735,10 +714,9 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: linha %d: usuário '%s' não existe\n"
 
-#, fuzzy
-#| msgid "  -s, --shell SHELL             login shell of the new account\n"
 msgid "  -s, --shell SHELL             new login shell for the user account\n"
-msgstr "  -s, --shell SHELL             shell de login da nova conta\n"
+msgstr ""
+"  -s, --shell SHELL             novo shell de login para a conta de usuário\n"
 
 msgid "Login Shell"
 msgstr "Shell de Login"
@@ -767,33 +745,22 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: Atenção: %s não é executável\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -u, --user                    which user's tcb shadow file to edit\n"
 msgid "  -c, --check                   check the user's password expiration\n"
 msgstr ""
-"  -u, --user                    que arquivo shadow tcb de usuário editar\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -f, --force                   force password change if the user's "
 "password\n"
 "                                is expired\n"
 msgstr ""
-"  -m, --md5                     criptografa a senha em texto plano usando o\n"
-"                                algoritmo MD5\n"
 
 #, c-format
 msgid "%s: options %s and %s conflict\n"
 msgstr "%s: opções %s e %s em conflito\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: unexpected argument: %s\n"
+#, c-format
 msgid "%s: unexpected argument: %s\n"
-msgstr "lastlog: argumento inesperado: %s\n"
+msgstr "%s: argumento inesperado: %s\n"
 
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
@@ -835,10 +802,9 @@
 "                                -r, -m ou -l) apenas para os LOGIN(s)\n"
 "                                especificados\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+#, c-format
 msgid "%s: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: Falha ao obter a entrada para o UID %lu\n"
+msgstr "%s: Falha ao obter a entrada para o UID %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Falhas   Máximo  Último                   Em\n"
@@ -851,30 +817,25 @@
 msgid " [%lds lock]"
 msgstr " [%lds lock]"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, c-format
 msgid "%s: Failed to reset fail count for UID %lu\n"
-msgstr "faillog: Falha em zerar o contador de falhas para o UID %lu\n"
+msgstr "%s: Falha em zerar o contador de falhas para o UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set max for UID %lu\n"
-msgstr "faillog: Falha ao ajustar o max para o UID %lu\n"
+msgstr "%s: Falha ao ajustar o max para o UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set locktime for UID %lu\n"
-msgstr "faillog: Falha ao ajustar o tempo de trava para o UID %lu\n"
+msgstr "%s: Falha ao ajustar o tempo de trava para o UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Unknown user or range: %s\n"
+#, c-format
 msgid "%s: Unknown user or range: %s\n"
-msgstr "lastlog: Usuário ou intervalo desconhecidos: %s\n"
+msgstr "%s: Usuário ou intervalo desconhecidos: %s\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
+#, c-format
 msgid "%s: Cannot get the size of %s: %s\n"
-msgstr "lastlog: Não foi possível obter o tamanho de %s: %s\n"
+msgstr "%s: Não foi possível obter o tamanho de %s: %s\n"
 
 #, c-format
 msgid ""
@@ -892,10 +853,8 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete USUÁRIO          remove USUÁRIO do GRUPO\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir DIR_PESSOAL    diretório pessoal da nova conta\n"
+msgstr ""
 
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         remove a senha do GRUPO\n"
@@ -1140,49 +1099,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s : usuário %s desconhecido\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Uso: %s [opções] [ação]\n"
+"Uso: %s [opções] [group [gshadow]]\n"
 "\n"
 "Opções:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Uso: %s [opções] [ação]\n"
+"Uso: %s [opções] [group]\n"
 "\n"
 "Opções:\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -r, --read-only               display errors and warnings\n"
 "                                but do not change files\n"
 msgstr ""
-"-s, --sha-rounds                Números de SHA rodadas para a SHA *\n"
-"                                algoritmos criptografados\n"
 
-#, fuzzy
-#| msgid "  -l, --list                    list the members of the group\n"
 msgid "  -s, --sort                    sort entries by UID\n"
-msgstr "  -l, --list                    lista os membros do grupo\n"
+msgstr ""
 
 #, c-format
 msgid "%s: -s and -r are incompatible\n"
@@ -1268,30 +1211,24 @@
 msgid " groups="
 msgstr " grupos="
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
-"  -t, --time DIAS               mostra os registros do faillog mais recentes "
-"que DIAS dias\n"
+"  -b, --before DIAS             imprime somente registros lastlog mais\n"
+"                                antigos que DIAS\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
 msgstr ""
-"  -t, --time DIAS               mostra os registros do faillog mais recentes "
-"que DIAS dias\n"
+"  -t, --time DIAS               imprime somente registros lastlog mais\n"
+"                                recentes que DIAS\n"
 
 msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
+"  -u, --user LOGIN              imprime registro lastlog para usuário com\n"
+"                                LOGIN especificado\n"
 
 msgid "Username         Port     From             Latest"
 msgstr "Nome de Usuário         Porta     De             Último"
@@ -1496,60 +1433,44 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s : linha %d : não foi possível atualizar entrada\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
 "  -a, --all                     report password status on all accounts\n"
 msgstr ""
-"  -a, --all                     mostrar registros de faillog de todos os "
-"usuários\n"
+"  -a, --all                     reportar estado de senhas em toda as contas\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -d, --delete                  delete the password for the named account\n"
-msgstr "  -r, --system                  cria uma conta de sistema\n"
+msgstr ""
+"  -d, --delete                  remover a senha para a conta indicada\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -e, --expire                  force expire the password for the named "
 "account\n"
-msgstr "  -r, --system                  cria uma conta de sistema\n"
+msgstr ""
+"  -e, --expire                  forçar expiração da senha para a conta indicada\n"
 
-#, fuzzy
-#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
 msgid "  -k, --keep-tokens             change password only if expired\n"
-msgstr "  -e, --encrypted               senhas fornecidas são criptografadas\n"
+msgstr ""
+"  -k, --keep-tokens             mudar senha somente caso expirada\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password SENHA          muda a senha para esta SENHA "
-"(criptografada)\n"
+"  -i, --inactive INATIVO        definir senha inativa após expiração para\n"
+"                                INATIVO\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -l, --lock                    lock the password of the named account\n"
-msgstr "  -u, --uid UID                 ID de usuário da nova conta\n"
+msgstr ""
+"  -l, --lock                    trava a conta indicada\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"-s, --sha-rounds                Números de SHA rodadas para a SHA *\n"
-"                                algoritmos criptografados\n"
+"  -n, --mindays MIN_DIAS        define número mínimo de dias antes da troca\n"
+"                                de senhas para MIN_DIAS\n"
 
 msgid "  -q, --quiet                   quiet mode\n"
 msgstr "  -q, --quiet                   modo silencioso\n"
@@ -1557,33 +1478,30 @@
 msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 msgstr ""
+"  -r, --repository REPOSITÓRIO  mudar senha no repositório REPOSITÓRIO\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -S, --status                  report password status on the named account\n"
-msgstr "  -r, --system                  cria uma conta de sistema\n"
+msgstr ""
+"  -S, --status                  reportar estado de senha para a conta indicada\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
-msgstr "  -u, --uid UID                 ID de usuário da nova conta\n"
+msgstr ""
+"  -u, --unlock                  destravar a conta indicada\n"
 
 msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -w, --warndays DIAS_AVISO     define dias de aviso de expiração para\n"
+"                                DIAS_AVISO\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"-s, --sha-rounds                Números de SHA rodadas para a SHA *\n"
-"                                algoritmos criptografados\n"
+"  -x, --maxdays MAX_DIAS        define número máximo de dias antes da troca\n"
+"                                de senhas para MAX_DIAS\n"
 
 msgid "Old password: "
 msgstr "Senha antiga : "
@@ -1668,31 +1586,23 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s: informação de expiração de senha alterada.\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Uso: %s [opções] [ação]\n"
+"Uso: %s [opções] [passwd]\n"
 "\n"
 "Opções:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd [shadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Uso: %s [opções] [ação]\n"
+"Uso: %s [opções] [passwd [shadow]]\n"
 "\n"
 "Opções:\n"
 
@@ -1889,10 +1799,9 @@
 msgid "%s: Cannot drop the controlling terminal\n"
 msgstr "%s: Não é possível remover o conteúdo de %s: %s\n"
 
-#, fuzzy, c-format
-#| msgid "Cannot execute %s"
+#, c-format
 msgid "Cannot execute %s\n"
-msgstr "Não foi possível executar %s"
+msgstr "Não foi possível executar %s\n"
 
 msgid "No password file"
 msgstr "Sem arquivo de senhas"
@@ -1935,10 +1844,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: linha muito longa em %s: %s..."
 
-#, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
+#, c-format
 msgid "%s: rename: %s: %s\n"
-msgstr "%s: renomear: %s: %s"
+msgstr "%s: renomear: %s: %s\n"
 
 #, c-format
 msgid "%s: group '%s' is a NIS group.\n"
@@ -1948,11 +1856,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: muitos grupos especificados (máximo %d).\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "       %s -D\n"
@@ -1961,6 +1865,8 @@
 "Options:\n"
 msgstr ""
 "Uso: %s [opções] LOGIN\n"
+"     %s -D\n"
+"     %s -D [opções]\n"
 "\n"
 "Opções:\n"
 
@@ -2165,24 +2071,16 @@
 "%s: aviso: o diretório pessoal já existe.\n"
 "Não copiando nenhum arquivo do diretótio skel.\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -f, --force                   exit successfully if the group already "
-#| "exists,\n"
-#| "                                and cancel -g if the GID is already used\n"
 msgid ""
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
 msgstr ""
-"  -f, --force                   sai com sucesso se o grupo já existe,\n"
-"                                e cancela -g se o GID já está em uso\n"
+"  -f, --force                   força remoção dos arquivos,\n"
+"                                mesmo se não forem do usuário\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -r, --remove                  remove home directory and mail spool\n"
 msgstr ""
-"  -r, --reset                   zera os contadores de falhas de login\n"
+"  -r, --remove                  remove o diretório pessoal e spool de mensagens\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot remove the primary group of user '%s'\n"
@@ -2245,98 +2143,78 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s : erro removendo diretório %s\n"
 
-#, fuzzy
-#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
 msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
-msgstr "  -c, --comment COMENTÁRIO      campo GECOS da nova conta\n"
+msgstr ""
+"  -c, --comment COMENTÁRIO      novo valor do campo GECOS\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
 "  -d, --home HOME_DIR           new home directory for the user account\n"
-msgstr "  -d, --home-dir DIR_PESSOAL    diretório pessoal da nova conta\n"
+msgstr ""
+"  -d, --home DIR_PESSOAL        novo diretório de login para a nova conta de\n"
+"                                usuário\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
 msgstr ""
-"  -e, --expiredate DATA_DE_EXPIRAÇÃO  data de expiração da nova conta\n"
+"  -e, --expiredate DATA_EXPIRA  define data de expiração de conta para\n"
+"                                DATA_EXPIRA\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password SENHA          muda a senha para esta SENHA "
-"(criptografada)\n"
+"  -f, --inactive INATIVO        define inatividade de senha após expiração\n"
+"                                para INATIVO\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
-msgstr "  -g, --gid GID                 usa GID para o novo grupo\n"
+msgstr ""
+"  -g, --gid GRUPO               forçar usar GRUPO como novo grupo primário\n"
 
-#, fuzzy
-#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
 msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-msgstr "  -M, --members USUÁRIO,...     ajusta a lista de membros do GRUPO\n"
+msgstr ""
+"  -G, --groups GRUPOS           nova lista de GRUPOS suplementares\n"
 
 msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
 msgstr ""
+"  -a, --append                  anexa o usuário para os GRUPOS suplementares\n"
+"                                mencionados pela opção -G sem remove-lo de\n"
+"                                outros grupos\n"
 
 msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
 msgstr ""
+"  -l, --login LOGIN             novo valor do nome de login\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -L, --lock                    lock the user account\n"
-msgstr "  -u, --uid UID                 ID de usuário da nova conta\n"
+msgstr ""
+"  -L, --lock                    trava a conta de usuário\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
-#| "the\n"
-#| "                                new account\n"
 msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
 msgstr ""
-"  -b, --base-dir BASE_DIR       diretório base para o diretório pessoal da\n"
-"                                nova conta\n"
+"  -m, --move-home               move o conteúdo do diretório pessoal para\n"
+"                                a novo localização (use somente com -d)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
-#| "GID\n"
 msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
 msgstr ""
-"  -o, --non-unique              permite usar um GID (não-único) duplicado\n"
+"  -o, --non-unique              permitir usar UID duplicados (não-únicos)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       use this encrypted password for the new "
-#| "group\n"
 msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
 msgstr ""
-"  -p, --password SENHA          usa a senha criptografada para o novo grupo\n"
+"  -p, --password SENHA          usar senha criptografada para a nova senha\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -u, --uid UID                 new UID for the user account\n"
-msgstr "  -u, --uid UID                 ID de usuário da nova conta\n"
+msgstr ""
+"  -u, --uid UID                 novo UID para a conta de usuário\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -U, --unlock                  unlock the user account\n"
-msgstr "  -u, --uid UID                 ID de usuário da nova conta\n"
+msgstr ""
+"  -U, --unlock                  destravar a conta de usuário\n"
 
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "

Modified: upstream/trunk/po/ru.po
===================================================================
--- upstream/trunk/po/ru.po	2011-12-09 21:31:39 UTC (rev 3652)
+++ upstream/trunk/po/ru.po	2011-12-09 21:35:47 UTC (rev 3653)
@@ -11,7 +11,7 @@
 "Project-Id-Version: shadow request\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2011-11-13 18:42+0100\n"
-"PO-Revision-Date: 2011-04-10 13:45+0400\n"
+"PO-Revision-Date: 2011-11-24 21:30+0100\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
 "Language: ru\n"
@@ -230,10 +230,9 @@
 msgstr ""
 "%s: неверная настройка: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%lu)\n"
 
-#, fuzzy, c-format
-#| msgid "failed to allocate memory"
+#, c-format
 msgid "%s: failed to allocate memory: %s\n"
-msgstr "не удалось выделить память"
+msgstr "%s: не удалось выделить память: %s\n"
 
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
@@ -397,68 +396,53 @@
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
 msgstr ""
+"  -d, --lastday LAST_DAY        установить последний день смены пароля\n"
+"                                в LAST_DAY\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
 msgstr ""
-"  -e, --expiredate ДАТА_УСТ     дата устаревания новой учётной записи\n"
+"  -E, --expiredate EXPIRE_DATE  установить дату окончания действия\n"
+"                                учётной записи в EXPIRE_DATE\n"
 
 msgid "  -h, --help                    display this help message and exit\n"
 msgstr ""
 "  -h, --help                    показать данное сообщение и закончить "
 "работу\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password ПАРОЛЬ         изменить пароль на заданный (шифрованный)\n"
-"                                ПАРОЛЬ\n"
+"  -I, --inactive INACTIVE       установить неактивность пароля после\n"
+"                                устаревания в значение INACTIVE\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -l, --list                    show account aging information\n"
 msgstr ""
-"  -r, --reset                   сбросить счётчик неудачных попыток входа\n"
+"  -l, --list                    показать «возраст» учётной записи\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds      количество раундов SHA для алгоритмов\n"
-"                        шифрования SHA*\n"
+"  -m, --mindays MIN_DAYS        установить минимальное число дней перед\n"
+"                                сменой пароля в MIN_DAYS\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds      количество раундов SHA для алгоритмов\n"
-"                        шифрования SHA*\n"
+"  -M, --maxdays MAX_DAYS        установить максимальное число дней перед\n"
+"                                сменой пароля в MAX_DAYS\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
 msgstr ""
-"  -d, --home-dir ДОМ_КАТ        домашний каталог новой учётной записи\n"
 
 msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -W, --warndays WARN_DAYS      установить количество дней с выдачей\n"
+"                                предупреждения в WARN_DAYS\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr ""
@@ -569,17 +553,13 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: ошибка при изменении полей\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [LOGIN]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Использование: %s [параметры] ПОЛЬЗОВАТЕЛЬ\n"
+"Использование: %s [параметры] [ПОЛЬЗОВАТЕЛЬ]\n"
 "\n"
 "Параметры:\n"
 
@@ -595,11 +575,9 @@
 msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -u, --help                    display this help message and exit\n"
 msgstr ""
-"  -h, --help                    показать данное сообщение и закончить "
+"  -u, --help                    показать данное сообщение и закончить "
 "работу\n"
 
 msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
@@ -750,12 +728,10 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: строка %d: пользователь «%s» не существует\n"
 
-#, fuzzy
-#| msgid "  -s, --shell SHELL             login shell of the new account\n"
 msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"  -s, --shell ОБОЛОЧКА          регистрационная оболочка новой\n"
-"                                учётной записи\n"
+"  -s, --shell SHELL             новая регистрационная оболочка для учётной\n"
+"                                записи\n"
 
 msgid "Login Shell"
 msgstr "Командная оболочка"
@@ -784,34 +760,22 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: предупреждение: %s не является исполняемым\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -u, --user                    which user's tcb shadow file to edit\n"
 msgid "  -c, --check                   check the user's password expiration\n"
 msgstr ""
-"  -u, --user                    редактировать пользовательский файл\n"
-"                                shadow структуры tcb\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -f, --force                   force password change if the user's "
 "password\n"
 "                                is expired\n"
 msgstr ""
-"  -m, --md5                     шифровать видимые пароли с помощью \n"
-"                                алгоритма MD5\n"
 
 #, c-format
 msgid "%s: options %s and %s conflict\n"
 msgstr "%s: конфликт параметров %s и %s\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: unexpected argument: %s\n"
+#, c-format
 msgid "%s: unexpected argument: %s\n"
-msgstr "lastlog: неожиданный параметр: %s\n"
+msgstr "%s: неожиданный параметр: %s\n"
 
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
@@ -855,10 +819,9 @@
 "                                с -r, -m или -l) только для указанного\n"
 "                                ПОЛЬЗОВАТЕЛЯ(ЕЙ)\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+#, c-format
 msgid "%s: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: не удалось получить запись для UID %lu\n"
+msgstr "%s: не удалось получить запись для UID %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Уч.запись      Неуд. попыток  Максимум  Последний раз\n"
@@ -871,31 +834,26 @@
 msgid " [%lds lock]"
 msgstr " [%ld блокировок]"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, c-format
 msgid "%s: Failed to reset fail count for UID %lu\n"
-msgstr "faillog: не удалось сбросить счётчик неудачных попыток для UID %lu\n"
+msgstr "%s: не удалось сбросить счётчик неудачных попыток для UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set max for UID %lu\n"
 msgstr ""
-"faillog: не удалось установить максимальное число попыток для UID %lu\n"
+"%s: не удалось установить максимальное число попыток для UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set locktime for UID %lu\n"
-msgstr "faillog: не удалось установить время блокировки для UID %lu\n"
+msgstr "%s: не удалось установить время блокировки для UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Unknown user or range: %s\n"
+#, c-format
 msgid "%s: Unknown user or range: %s\n"
-msgstr "lastlog: неизвестный пользователь или диапазон: %s\n"
+msgstr "%s: неизвестный пользователь или диапазон: %s\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
+#, c-format
 msgid "%s: Cannot get the size of %s: %s\n"
-msgstr "lastlog: не удалось получить размер %s: %s\n"
+msgstr "%s: не удалось получить размер %s: %s\n"
 
 #, c-format
 msgid ""
@@ -913,11 +871,8 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete ПОЛЬЗ            удалить ПОЛЬЗОВАТЕЛЯ из ГРУППЫ\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
 msgstr ""
-"  -d, --home-dir ДОМ_КАТ        домашний каталог новой учётной записи\n"
 
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         удалить пароль ГРУППЫ\n"
@@ -1167,27 +1122,19 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: неизвестный пользователь %s\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Использование: %s [параметры] [действие]\n"
+"Использование: %s [параметры] [файл_group [файл_gshadow]]\n"
 "\n"
 "Параметры:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
-"Usage: %s [options] [group]\n"
+"Usage: %s [options] [файл_group]\n"
 "\n"
 "Options:\n"
 msgstr ""
@@ -1195,21 +1142,13 @@
 "\n"
 "Параметры:\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -r, --read-only               display errors and warnings\n"
 "                                but do not change files\n"
 msgstr ""
-"  -s, --sha-rounds      количество раундов SHA для алгоритмов\n"
-"                        шифрования SHA*\n"
 
-#, fuzzy
-#| msgid "  -l, --list                    list the members of the group\n"
 msgid "  -s, --sort                    sort entries by UID\n"
-msgstr "  -l, --list                    перечислить всех членов группы\n"
+msgstr ""
 
 #, c-format
 msgid "%s: -s and -r are incompatible\n"
@@ -1293,30 +1232,21 @@
 msgid " groups="
 msgstr " группы="
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
-"  -t, --time ДНЕЙ               показать записи faillog за последнее\n"
-"                                количество ДНЕЙ\n"
+"  -b, --before ДНЕЙ             показать записи lastlog за последние ДНЕЙ дней\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
 msgstr ""
-"  -t, --time ДНЕЙ               показать записи faillog за последнее\n"
-"                                количество ДНЕЙ\n"
+"  -t, --time ДНЕЙ               показать записи lastlog за последние ДНЕЙ дней\n"
 
 msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
+"  -u, --user ИМЯ                показать запись lastlog для учётной записи ИМЯ\n"
 
 msgid "Username         Port     From             Latest"
 msgstr "Пользователь     Порт     С                Последний раз"
@@ -1522,61 +1452,46 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: строка %d: не удалось обновить запись\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
 "  -a, --all                     report password status on all accounts\n"
 msgstr ""
-"  -a, --all                     показать записи faillog для всех "
-"пользователей\n"
+"  -a, --all                     показать состояние паролей всех учётных\n"
+"                                записей\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -d, --delete                  delete the password for the named account\n"
-msgstr "  -r, --system                  создать системную учётную запись\n"
+msgstr ""
+"  -d, --delete                  удалить пароль заданной учётной записи\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -e, --expire                  force expire the password for the named "
 "account\n"
-msgstr "  -r, --system                  создать системную учётную запись\n"
+msgstr ""
+"  -e, --expire                  просрочить пароль заданной учётной записи\n"
 
-#, fuzzy
-#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
 msgid "  -k, --keep-tokens             change password only if expired\n"
-msgstr "  -e, --encrypted               пароли передаются зашифрованными\n"
+msgstr ""
+"  -k, --keep-tokens             изменять пароль только с истёкшим сроком\n"
+"                                действия\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password ПАРОЛЬ         изменить пароль на заданный (шифрованный)\n"
-"                                ПАРОЛЬ\n"
+"  -i, --inactive INACTIVE       установить неактивность пароля после\n"
+"                                истечения срока в значение INACTIVE\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -l, --lock                    lock the password of the named account\n"
 msgstr ""
-"  -u, --uid UID                 пользовательский ID новой учётной записи\n"
+"  -l, --lock                    заблокировать заданную учётную запись\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds      количество раундов SHA для алгоритмов\n"
-"                        шифрования SHA*\n"
+"  -n, --mindays MIN_DAYS        установить минимальное число дней перед\n"
+"                                сменой пароля в MIN_DAYS\n"
 
 msgid "  -q, --quiet                   quiet mode\n"
 msgstr ""
@@ -1585,34 +1500,31 @@
 msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 msgstr ""
+"  -r, --repository REPOSITORY   изменить пароль в репозитории REPOSITORY\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -S, --status                  report password status on the named account\n"
-msgstr "  -r, --system                  создать системную учётную запись\n"
+msgstr ""
+"  -S, --status                  показать состояние пароля заданной учётной\n"
+"                                записи\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
 msgstr ""
-"  -u, --uid UID                 пользовательский ID новой учётной записи\n"
+"  -u, --unlock                  разблокировать заданную учётную запись\n"
 
 msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -w, --warndays WARN_DAYS      установить количество дней с\n"
+"                                выдачей предупреждения в WARN_DAYS\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds      количество раундов SHA для алгоритмов\n"
-"                        шифрования SHA*\n"
+"  -x, --maxdays MAX_DAYS        установить максимальное число дней перед\n"
+"                                сменой пароля в MAX_DAYS\n"
 
 msgid "Old password: "
 msgstr "Старый пароль: "
@@ -1696,31 +1608,23 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s: информация об истечении срока действия пароля изменена.\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Использование: %s [параметры] [действие]\n"
+"Использование: %s [параметры] [passwd]\n"
 "\n"
 "Параметры:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd [shadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Использование: %s [параметры] [действие]\n"
+"Использование: %s [параметры] [passwd [shadow]]\n"
 "\n"
 "Параметры:\n"
 
@@ -1918,10 +1822,9 @@
 msgid "%s: Cannot drop the controlling terminal\n"
 msgstr "%s: не удалось удалить содержимое %s: %s\n"
 
-#, fuzzy, c-format
-#| msgid "Cannot execute %s"
+#, c-format
 msgid "Cannot execute %s\n"
-msgstr "Не удалось выполнить %s"
+msgstr "Не удалось выполнить %s\n"
 
 msgid "No password file"
 msgstr "Отсутствует файл паролей"
@@ -1964,10 +1867,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: слишком длинная строка в %s: %s…"
 
-#, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
+#, c-format
 msgid "%s: rename: %s: %s\n"
-msgstr "%s: rename: %s: %s"
+msgstr "%s: rename: %s: %s\n"
 
 #, c-format
 msgid "%s: group '%s' is a NIS group.\n"
@@ -1977,11 +1879,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: указано слишком много групп (максимум %d).\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "       %s -D\n"
@@ -1990,6 +1888,8 @@
 "Options:\n"
 msgstr ""
 "Использование: %s [параметры] ПОЛЬЗОВАТЕЛЬ\n"
+"               %s -D\n"
+"               %s -D [параметры]\n"
 "\n"
 "Параметры:\n"
 
@@ -2202,25 +2102,16 @@
 "%s: предупреждение: домашний каталог уже существует.\n"
 "Никакие файлы из каталога шаблонов копироваться не будут.\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -f, --force                   exit successfully if the group already "
-#| "exists,\n"
-#| "                                and cancel -g if the GID is already used\n"
 msgid ""
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
 msgstr ""
-"  -f, --force                   закончить работу без ошибки, если группа\n"
-"                                существует и отменить -g, если GID уже\n"
-"                                используется\n"
+"  -f, --force                   удалять файлы, даже если они\n"
+"                                не принадлежат пользователю\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -r, --remove                  remove home directory and mail spool\n"
 msgstr ""
-"  -r, --reset                   сбросить счётчик неудачных попыток входа\n"
+"  -r, --remove                  удалить домашний каталог и почтовый ящик\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot remove the primary group of user '%s'\n"
@@ -2284,105 +2175,78 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: ошибка удаления каталога %s\n"
 
-#, fuzzy
-#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
 msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
-msgstr "  -c, --comment КОММЕНТАРИЙ     поле GECOS новой учётной записи\n"
+msgstr "  -c, --comment КОММЕНТАРИЙ     новое значение поля GECOS\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
 "  -d, --home HOME_DIR           new home directory for the user account\n"
 msgstr ""
-"  -d, --home-dir ДОМ_КАТ        домашний каталог новой учётной записи\n"
+"  -d, --home ДОМ_КАТ            новый домашний каталог учётной записи\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
 msgstr ""
-"  -e, --expiredate ДАТА_УСТ     дата устаревания новой учётной записи\n"
+"  -e, --expiredate ДАТА_УСТ     установить дату окончания действия\n"
+"                                учётной записи в ДАТА_УСТ\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password ПАРОЛЬ         изменить пароль на заданный (шифрованный)\n"
-"                                ПАРОЛЬ\n"
+"  -f, --inactive НЕАКТИВНОСТЬ   установить период неактивности пароля после\n"
+"                                устаревания учётной записи равным НЕАКТИВНОСТЬ\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
 msgstr ""
-"  -g, --gid GID                 для новой группы использовать указанный GID\n"
+"  -g, --gid ГРУППА              принудительно назначить первичную ГРУППУ\n"
 
-#, fuzzy
-#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
 msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-msgstr "  -M, --members ПОЛЬЗ,…         задать список членов ГРУППЫ\n"
+msgstr ""
+"  -G, --groups ГРУППЫ           список дополнительных ГРУПП\n"
 
 msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
 msgstr ""
+"  -a, --append                  добавить пользователя в дополнительные\n"
+"                                ГРУППЫ, указанные в параметре -G не удаляя\n"
+"                                пользователя из других групп\n"
 
 msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
 msgstr ""
+"  -l, --login НОВОЕ_ИМЯ         новое значение имени учётной записи\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -L, --lock                    lock the user account\n"
 msgstr ""
-"  -u, --uid UID                 пользовательский ID новой учётной записи\n"
+"  -L, --lock                    заблокировать учётную запись\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
-#| "the\n"
-#| "                                new account\n"
 msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
 msgstr ""
-"  -b, --base-dir БАЗ_КАТ        базовый каталог для домашнего каталога "
-"новой\n"
-"                                учётной записи\n"
+"  -m, --move-home               переместить содержимое домашнего каталога в\n"
+"                                новое место (использовать только вместе с -d)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
-#| "GID\n"
 msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
 msgstr ""
-"  -o, --non-unique              разрешить повторяющиеся (не уникальные) GID\n"
+"  -o, --non-unique              разрешить создание учётной записи с уже\n"
+"                                имеющимся (не уникальным) UID\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       use this encrypted password for the new "
-#| "group\n"
 msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
 msgstr ""
-"  -p, --password ПАРОЛЬ         использовать этот шифрованный пароль для\n"
-"                                новой группы\n"
+"  -p, --password ПАРОЛЬ         задать новый шифрованный пароль для\n"
+"                                учётной записи\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -u, --uid UID                 new UID for the user account\n"
 msgstr ""
-"  -u, --uid UID                 пользовательский ID новой учётной записи\n"
+"  -u, --uid UID                 новый UID для учётной записи\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -U, --unlock                  unlock the user account\n"
 msgstr ""
-"  -u, --uid UID                 пользовательский ID новой учётной записи\n"
+"  -U, --unlock                  разблокировать учётную запись\n"
 
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "

Modified: upstream/trunk/po/sk.po
===================================================================
--- upstream/trunk/po/sk.po	2011-12-09 21:31:39 UTC (rev 3652)
+++ upstream/trunk/po/sk.po	2011-12-09 21:35:47 UTC (rev 3653)
@@ -7,7 +7,7 @@
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2011-11-13 18:42+0100\n"
-"PO-Revision-Date: 2009-04-11 15:38+0100\n"
+"PO-Revision-Date: 2011-11-26 22:06+0100\n"
 "Last-Translator: Ivan Masár <helix84 at centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
 "Language: sk\n"
@@ -194,13 +194,12 @@
 msgid "%s: failed to unlock %s\n"
 msgstr "%s: nepodarilo sa odmknúť %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: %s\n"
+#, c-format
 msgid "%s: "
-msgstr "%s: %s\n"
+msgstr "%s: "
 
 msgid ": "
-msgstr ""
+msgstr ": "
 
 msgid "Environment overflow\n"
 msgstr "Preplnenie prostredia\n"
@@ -384,61 +383,56 @@
 msgid "No"
 msgstr "Nie"
 
-#, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
+#, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
-msgstr "Použitie: %s [vstup]\n"
+msgstr ""
+"Použitie: %s [voľby] ÚČET\n"
+"\n"
+"Voľby:\n"
 
 msgid ""
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
 msgstr ""
+"  -d, --lastday POSL_DEN        nastaví dátum poslednej zmeny hesla na POSL_DEN\n"
 
 msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
 msgstr ""
+"  -E, --expiredate EXP_DATUM    nastaví dátum vypršania platnosti účtu na\n"
+"                                EXP_DATUM\n"
 
 msgid "  -h, --help                    display this help message and exit\n"
 msgstr ""
+"  -h, --help                    zobrazí tohto pomocníka a ukončí sa\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
+"  -I, --inactive NEAKTIV        nastaví nefunkčnosť hesla na NEAKTIV dní\n"
+"                                po vypršaní platnosti účtu\n"
 
 msgid "  -l, --list                    show account aging information\n"
 msgstr ""
+"  -l, --list                    zobrazí časové údaje o účte\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
+"  -m, --mindays MIN_DNÍ         nastaví minimálny počet dní pred zmenou\n"
+"                                hesla na MIN_DNÍ\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
+"  -M, --maxdays MAX_DNÍ         nastaví maximálny počet dní pred zmenou\n"
+"                                hesla na MAX_DNÍ\n"
 
 msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
 msgstr ""
@@ -446,6 +440,7 @@
 msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -W, --warndays UPOZ_DNÍ       nastaví upozornenie o platnosti účtu na UPOZ_DNÍ\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr ""
@@ -519,10 +514,9 @@
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s: vaše používateľské meno sa nedá zistiť.\n"
 
-#, fuzzy, c-format
-#| msgid "%s: %s\n"
+#, c-format
 msgid "%s: PAM: %s\n"
-msgstr "%s: %s\n"
+msgstr "%s: PAM: %s\n"
 
 #, c-format
 msgid "%s: cannot lock %s; try again later.\n"
@@ -556,13 +550,15 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: chyba pri zmene položiek\n"
 
-#, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-msgstr "Použitie: %s [vstup]\n"
+msgstr ""
+"Použitie: %s [voľby] [ÚČET]\n"
+"\n"
+"Voľby:\n"
 
 msgid "  -f, --full-name FULL_NAME     change user's full name\n"
 msgstr ""
@@ -578,6 +574,7 @@
 
 msgid "  -u, --help                    display this help message and exit\n"
 msgstr ""
+"  -u, --help                    zobrazí tohto pomocníka a ukončí sa\n"
 
 msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
 msgstr ""
@@ -656,31 +653,33 @@
 msgid "%s: fields too long\n"
 msgstr "%s: položka je príliš dlhá\n"
 
-#, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
+#, c-format
 msgid ""
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-msgstr "Použitie: %s [vstup]\n"
+msgstr ""
+"Použitie: %s [voľby]\n"
+"\n"
+"Voľby:\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "  -c, --crypt-method            the crypt method (one of %s)\n"
 msgid "  -c, --crypt-method <METHOD>   the crypt method (one of %s)\n"
 msgstr ""
+"  -c, --crypt-method            metóda šifrovania (jedna z %s)\n"
 
 msgid "  -e, --encrypted               supplied passwords are encrypted\n"
 msgstr ""
+"  -e, --encrypted               zadané heslá sú zakódované\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --md5                     encrypt the clear text password using\n"
 "                                the MD5 algorithm\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
+"  -m, --md5                     použije MD5 kódovanie namiesto DES, ak\n"
+"                                zadané heslá nie sú zakódované\n"
 
 msgid ""
 "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
@@ -748,10 +747,9 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Chybná položka: %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: %s is an invalid shell.\n"
+#, c-format
 msgid "%s: %s is an invalid shell\n"
-msgstr "%s: %s je neplatný shell.\n"
+msgstr "%s: %s je neplatný shell\n"
 
 #, fuzzy, c-format
 #| msgid "%s: user %s does not exist\n"
@@ -766,57 +764,61 @@
 msgid "  -c, --check                   check the user's password expiration\n"
 msgstr ""
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -f, --force                   force password change if the user's "
 "password\n"
 "                                is expired\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
 
 #, c-format
 msgid "%s: options %s and %s conflict\n"
 msgstr "%s: voľby %s a %s sú v konflikte\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: unexpected argument: %s\n"
+#, c-format
 msgid "%s: unexpected argument: %s\n"
-msgstr "lastlog: neočakávaný argument: %s\n"
+msgstr "%s: neočakávaný argument: %s\n"
 
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
+"  -a, --all                     zobrazí faillog záznamy všetkých používateľov\n"
 
 msgid ""
 "  -l, --lock-secs SEC           after failed login lock account for SEC "
 "seconds\n"
 msgstr ""
+"  -l, --lock-secs SEC           po chybnom prihlásení zablokuje účet na SEC\n"
+"                                sekúnd\n"
 
 msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 msgstr ""
+"  -m, --maximum MAX             nastaví maximálny počet chybných prihlásení\n"
+"                                na MAX\n"
 
 msgid "  -r, --reset                   reset the counters of login failures\n"
 msgstr ""
+"  -r, --reset                   vynuluje počítadlá chybných prihlásení\n"
 
 msgid ""
 "  -t, --time DAYS               display faillog records more recent than "
 "DAYS\n"
 msgstr ""
+"  -t, --time DAYS               zobrazí záznamy faillog nie staršie ako\n"
+"                                DAYS dní\n"
 
 msgid ""
 "  -u, --user LOGIN/RANGE        display faillog record or maintains failure\n"
 "                                counters and limits (if used with -r, -m,\n"
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
+"  -u, --user LOGIN              zobrazí záznam faillog alebo nastaví počítadlá\n"
+"                                chybných prihlásení a limitov (iba s použitím\n"
+"                                volieb -r, -m or -l) pre používateľa s loginom\n"
+"                                LOGIN\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %d\n"
+#, c-format
 msgid "%s: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: Nepodarilo sa získať položku s UID %d\n"
+msgstr "%s: Nepodarilo sa získať položku s UID %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Chybné   Najviac Posledné                 Na\n"
@@ -829,30 +831,25 @@
 msgid " [%lds lock]"
 msgstr " [%lds zámok]"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %d\n"
+#, c-format
 msgid "%s: Failed to reset fail count for UID %lu\n"
-msgstr "faillog: Nepodarilo sa znulovať počet chýb pre UID %d\n"
+msgstr "%s: Nepodarilo sa znulovať počet chýb pre UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %d\n"
+#, c-format
 msgid "%s: Failed to set max for UID %lu\n"
-msgstr "faillog: Nepodarilo sa nastaviť max. pre UID %d\n"
+msgstr "%s: Nepodarilo sa nastaviť max. pre UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %d\n"
+#, c-format
 msgid "%s: Failed to set locktime for UID %lu\n"
-msgstr "faillog: Nepodarilo sa nastaviť čas zamknutia pre UID %d\n"
+msgstr "%s: Nepodarilo sa nastaviť čas zamknutia pre UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Unknown user or range: %s\n"
+#, c-format
 msgid "%s: Unknown user or range: %s\n"
-msgstr "lastlog: Neznámy používateľ alebo rozsah: %s.\n"
+msgstr "%s: Neznámy používateľ alebo rozsah: %s\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
+#, c-format
 msgid "%s: Cannot get the size of %s: %s\n"
-msgstr "lastlog: Nepodarilo sa zistiť veľkosť %s: %s\n"
+msgstr "%s: Nepodarilo sa zistiť veľkosť %s: %s\n"
 
 #, fuzzy, c-format
 #| msgid "Usage: %s [input]\n"
@@ -947,42 +944,33 @@
 msgid "%s: Not a tty\n"
 msgstr "%s: Nejedná sa o tty\n"
 
-#, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
+#, c-format
 msgid ""
 "Usage: %s [options] GROUP\n"
 "\n"
 "Options:\n"
-msgstr "Použitie: %s [vstup]\n"
+msgstr ""
+"Použitie: %s [voľby] SKUPINA\n"
+"\n"
+"Voľby:\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -f, --force                   exit successfully if the group already "
 "exists,\n"
 "                                and cancel -g if the GID is already used\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
 
 msgid "  -g, --gid GID                 use GID for the new group\n"
 msgstr ""
+"  -g, --gid GID                 pre novú skupinu použije GID\n"
 
 msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
 msgstr ""
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -o, --non-unique              allow to create groups with duplicate\n"
 "                                (non-unique) GID\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
 
 msgid ""
 "  -p, --password PASSWORD       use this encrypted password for the new "
@@ -991,6 +979,7 @@
 
 msgid "  -r, --system                  create a system account\n"
 msgstr ""
+"  -r, --system                  vytvorí systémový účet\n"
 
 #, c-format
 msgid "%s: '%s' is not a valid group name\n"
@@ -1045,25 +1034,23 @@
 msgid "%s: Out of memory. Cannot update %s.\n"
 msgstr "%s: Nedostatok pamäte. Nie je možné aktualizovať %s.\n"
 
-#, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
 "Options:\n"
-msgstr "Použitie: %s [vstup]\n"
+msgstr ""
+"Použitie: %s [voľby] [operácia]\n"
+"\n"
+"Voľby:\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -g, --group groupname         change groupname instead of the user's "
 "group\n"
 "                                (root only)\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
+"  -g, --group groupname         zmeniť názov skupiny namiesto skupiny\n"
+"                                používateľa (iba root)\n"
 
 msgid "\n"
 msgstr ""
@@ -1074,17 +1061,21 @@
 msgid ""
 "  -a, --add username            add username to the members of the group\n"
 msgstr ""
+"  -a, --add používateľ          pridať používateľa medzi členov skupiny\n"
 
 msgid ""
 "  -d, --delete username         remove username from the members of the "
 "group\n"
 msgstr ""
+"  -d, --delete používateľ       odobrať používateľa spomedzi členov skupiny\n"
 
 msgid "  -p, --purge                   purge all members from the group\n"
 msgstr ""
+"  -p, --purge                   odstrániť všetkých členov skupiny\n"
 
 msgid "  -l, --list                    list the members of the group\n"
 msgstr ""
+"  -l, --list                    vypísať členov skupiny\n"
 
 #, c-format
 msgid "%s: your groupname does not match your username\n"
@@ -1121,38 +1112,35 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: používateľ %s je neznámy\n"
 
-#, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
 "\n"
 "Options:\n"
-msgstr "Použitie: %s [vstup]\n"
+msgstr ""
+"Použitie: %s [voľby] [súbor_so_skupinami [súbor_s_tieňovými_skupinami]]\n"
+"\n"
+"Voľby:\n"
 
-#, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group]\n"
 "\n"
 "Options:\n"
-msgstr "Použitie: %s [vstup]\n"
+msgstr ""
+"Použitie: %s [voľby] [súbor_so_skupinami]\n"
+"\n"
+"Voľby:\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -r, --read-only               display errors and warnings\n"
 "                                but do not change files\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
 
 msgid "  -s, --sort                    sort entries by UID\n"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "%s: -s and -r are incompatibile\n"
+#, c-format
 msgid "%s: -s and -r are incompatible\n"
 msgstr "%s: -s a -r nie sú zlučiteľné\n"
 
@@ -1289,16 +1277,13 @@
 "\n"
 "[Odpojenie vynechané -- používateľ root sa môže prihlásiť.]"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Login timed out after %d seconds.\n"
+#, c-format
 msgid ""
 "\n"
 "Login timed out after %u seconds.\n"
 msgstr ""
 "\n"
-"Uplynul časový limit (%d sekúnd) na prihlásenie.\n"
+"Uplynul časový limit (%u sekúnd) na prihlásenie.\n"
 
 #, c-format
 msgid "%s: Cannot possibly work without effective root\n"
@@ -1318,10 +1303,9 @@
 msgid "login: "
 msgstr "Prihlasovacie meno: "
 
-#, fuzzy, c-format
-#| msgid "Maximum number of tries exceeded (%d)\n"
+#, c-format
 msgid "Maximum number of tries exceeded (%u)\n"
-msgstr "Prekročený maximálny počet pokusov (%d)\n"
+msgstr "Prekročený maximálny počet pokusov (%u)\n"
 
 msgid "login: abort requested by PAM\n"
 msgstr "prihlásenie: PAM prerušenie\n"
@@ -1456,74 +1440,74 @@
 msgid ""
 "  -a, --all                     report password status on all accounts\n"
 msgstr ""
+"  -a, --all                     zobrazí stav hesiel pre všetky účty\n"
 
 msgid ""
 "  -d, --delete                  delete the password for the named account\n"
 msgstr ""
+"  -d, --delete                  odstráni heslo pre zadaný účet\n"
 
 msgid ""
 "  -e, --expire                  force expire the password for the named "
 "account\n"
 msgstr ""
+"  -e, --expire                  vynúti platnosť hesla pre zadaný účet\n"
 
 msgid "  -k, --keep-tokens             change password only if expired\n"
 msgstr ""
+"  -k, --keep-tokens             zmení heslo iba v prípade vypršania času\n"
+"                                jeho platnosti\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
+"  -i, --inactive INACTIVE       nastaví neplatnosť hesla po vypršaní času\n"
+"                                platnosti na INACTIVE dní\n"
 
 msgid ""
 "  -l, --lock                    lock the password of the named account\n"
 msgstr ""
+"  -l, --lock                    zablokuje zadaný účet\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
+"  -n, --mindays MIN_DNÍ         nastaví minimálny počet dní pred zmenou\n"
+"                                hesla na MIN_DNÍ dní\n"
 
 msgid "  -q, --quiet                   quiet mode\n"
 msgstr ""
+"  -q, --quiet                   stručný režim\n"
 
 msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 msgstr ""
+"  -r, --repository REPOSITORY   zmení heslo v repozitári REPOSITORY\n"
 
 msgid ""
 "  -S, --status                  report password status on the named account\n"
 msgstr ""
+"  -S, --status                  zobrazí stav hesla pre zadaný účet\n"
 
 msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
 msgstr ""
+"  -u, --unlock                  odblokuje zadaný účet\n"
 
 msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -w, --warndays WARN_DAYS      nastaví počet dní na upozornenie o vypršaní\n"
+"                                platnosti na WARN_DAYS dní\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
+"  -x, --maxdays MAX_DNÍ         nastaví maximálny počet dní pred zmenou\n"
+"                                hesla na MAX_DNÍ dní\n"
 
 msgid "Old password: "
 msgstr "Staré heslo: "
@@ -1597,31 +1581,34 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Heslo používateľa %s nebolo zmenené.\n"
 
-#, fuzzy, c-format
-#| msgid "Password changed."
+#, c-format
 msgid "%s: password changed.\n"
-msgstr "Heslo bolo zmenené."
+msgstr "%s: heslo bolo zmenené.\n"
 
 #, fuzzy, c-format
 #| msgid "Password Expiration Warning"
 msgid "%s: password expiry information changed.\n"
 msgstr "Upozornenie o uplynutí doby platnosti hesla"
 
-#, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd]\n"
 "\n"
 "Options:\n"
-msgstr "Použitie: %s [vstup]\n"
+msgstr ""
+"Použitie: %s [voľby] [súbor_s_heslami]\n"
+"\n"
+"Voľby:\n"
 
-#, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd [shadow]]\n"
 "\n"
 "Options:\n"
-msgstr "Použitie: %s [vstup]\n"
+msgstr ""
+"Použitie: %s [voľby] [súbor_s_heslami [súbor_s_tieňovými_heslami]]\n"
+"\n"
+"Voľby:\n"
 
 msgid "  -q, --quiet                   report errors only\n"
 msgstr ""
@@ -1791,7 +1778,6 @@
 msgid "(Enter your own password)"
 msgstr "(Zadajte vaše heslo)"
 
-#  c-format
 #, c-format
 msgid "%s: Authentication failure\n"
 msgstr "%s: Autentifikácia zlyhala\n"
@@ -1818,10 +1804,9 @@
 msgid "%s: Cannot drop the controlling terminal\n"
 msgstr "lastlog: Nepodarilo sa zistiť veľkosť %s: %s\n"
 
-#, fuzzy, c-format
-#| msgid "Cannot execute %s"
+#, c-format
 msgid "Cannot execute %s\n"
-msgstr "%s sa nedá spustiť."
+msgstr "%s sa nedá spustiť\n"
 
 msgid "No password file"
 msgstr "Súbor s heslami neexistuje"
@@ -1865,10 +1850,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: riadok %d: volanie chown zlyhalo\n"
 
-#, fuzzy, c-format
-#| msgid "%s: rename: %s"
+#, c-format
 msgid "%s: rename: %s: %s\n"
-msgstr "%s: premenovať: %s"
+msgstr "%s: premenovať: %s: %s\n"
 
 #, c-format
 msgid "%s: group '%s' is a NIS group.\n"
@@ -1878,27 +1862,25 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: bolo zadaných príliš veľa skupín (max %d).\n"
 
-#, fuzzy, c-format
-#| msgid "Usage: %s [input]\n"
+#, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "       %s -D\n"
 "       %s -D [options]\n"
 "\n"
 "Options:\n"
-msgstr "Použitie: %s [vstup]\n"
+msgstr ""
+"Použitie: %s [voľby] ÚČET\n"
+"          %s -D\n"
+"          %s -D [voľby]\n"
+"\n"
+"Voľby:\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -b, --base-dir BASE_DIR       base directory for the home directory of "
 "the\n"
 "                                new account\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
 
 msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
 msgstr ""
@@ -1919,42 +1901,26 @@
 "account\n"
 msgstr ""
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -g, --gid GROUP               name or ID of the primary group of the new\n"
 "                                account\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -G, --groups GROUPS           list of supplementary groups of the new\n"
 "                                account\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
 
 msgid ""
 "  -k, --skel SKEL_DIR           use this alternative skeleton directory\n"
 msgstr ""
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -l, --no-log-init             do not add the user to the lastlog and\n"
 "                                faillog databases\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
+"  -l, --no-log-init             nepridávať používateľa do databáz\n"
+"                                lastlog a faillog \n"
 
 msgid "  -m, --create-home             create the user's home directory\n"
 msgstr ""
@@ -1963,27 +1929,17 @@
 "  -M, --no-create-home          do not create the user's home directory\n"
 msgstr ""
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
+"  -N, --no-user-group           nevytvorí skupinu s rovnakým menom\n"
+"                                ako má používateľ\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -o, --non-unique              allow to create users with duplicate\n"
 "                                (non-unique) UID\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
 
 msgid "  -p, --password PASSWORD       encrypted password of the new account\n"
 msgstr ""
@@ -2100,19 +2056,16 @@
 "%s: upozornenie: domovský adresár už existuje.\n"
 "Zo skel adresára sa tam neskopíruje žiaden súbor.\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
+"  -f, --force                   vynúti odstránenie súborov, aj keď\n"
+"                                používateľ nie je ich vlastníkom\n"
 
 msgid "  -r, --remove                  remove home directory and mail spool\n"
 msgstr ""
+"  -r, --remove                  odstráni domovský adresár a súbory s poštou\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot remove the primary group of user '%s'\n"
@@ -2135,10 +2088,9 @@
 msgid "%s: %s mail spool (%s) not found\n"
 msgstr "%s: chybný domovský adresár „%s“\n"
 
-#, fuzzy, c-format
-#| msgid "%s: warning: can't remove %s: %s"
+#, c-format
 msgid "%s: warning: can't remove %s: %s\n"
-msgstr "%s: upozornenie: nemôžem odstrániť %s: %s"
+msgstr "%s: upozornenie: nemôžem odstrániť %s: %s\n"
 
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
@@ -2182,37 +2134,35 @@
 
 msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
 msgstr ""
+"  -c, --comment KOMENTÁR        nová hodnota poľa GECOS\n"
 
 msgid ""
 "  -d, --home HOME_DIR           new home directory for the user account\n"
 msgstr ""
+"  -d, --home DOM_ADR            nový domovský adresár pre nový používateľský\n"
+"                                účet\n"
 
 msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
 msgstr ""
+"  -e, --expiredate EXP_DATUM    nastaví čas vypršania platnosti účtu na\n"
+"                                EXP_DATUM\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
+"  -f, --inactive NEAKTIV        zablokuje platnosť hesla po NEAKTIV dňoch\n"
+"                                od času vypršania platnosti\n"
 
 msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
 msgstr ""
+"  -g, --gid SKUPINA             vynúti použitie skupiny SKUPINA ako novej\n"
+"                                prvotnej prihlasovacej skupiny\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
+"  -G, --groups SKUPINY          zobrazí prídavné skupiny\n"
 
 msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
@@ -2222,40 +2172,38 @@
 
 msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
 msgstr ""
+"  -l, --login LOGIN             nová hodnota prihlasovacieho mena\n"
 
 msgid "  -L, --lock                    lock the user account\n"
 msgstr ""
+"  -L, --lock                    zablokuje používateľský účet\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
+"  -m, --move-home               presunie obsah domovského adresára do nového\n"
+"                                umiestnenia (používať iba s -d)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
 msgstr ""
-"  -s, --sha-rounds              počet cyklov šifrovacích\n"
-"                                algoritmov SHA*\n"
+"  -o, --non-unique              dovolí použitie duplicitného\n"
+"                                (nejedinečného) UID\n"
 
 msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
 msgstr ""
+"  -p, --password HESLO          ako nové heslo použije zadané zašifrované\n"
+"                                HESLO\n"
 
 msgid "  -u, --uid UID                 new UID for the user account\n"
 msgstr ""
+"  -u, --uid UID                 nový UID pre používateľský účet\n"
 
 msgid "  -U, --unlock                  unlock the user account\n"
 msgstr ""
+"  -U, --unlock                  odblokuje používateľský účet\n"
 
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
@@ -2347,22 +2295,26 @@
 "Kvôli zachovaniu konzistentnosti budete možno musieť zmeniť %s.\n"
 "Prosím, urobte tak príkazom „%s“.\n"
 
-#, fuzzy
-#| msgid "Usage: %s [input]\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-msgstr "Použitie: %s [vstup]\n"
+msgstr ""
+"Použitie: vipw [voľby]\n"
+"\n"
+"Voľby:\n"
 
 msgid "  -g, --group                   edit group database\n"
 msgstr ""
+"  -g, --group                   upraví databázu skupín\n"
 
 msgid "  -p, --passwd                  edit passwd database\n"
 msgstr ""
+"  -p, --passwd                  upraví databázu passwd\n"
 
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgstr ""
+"  -s, --shadow                  upraví databázu shadow alebo gshadow\n"
 
 msgid "  -u, --user                    which user's tcb shadow file to edit\n"
 msgstr ""
@@ -2380,10 +2332,8 @@
 msgid "failed to create scratch directory"
 msgstr "chyba pri premenovaní schránky"
 
-#, fuzzy
-#| msgid "%s: failed to drop privileges (%s)\n"
 msgid "failed to drop privileges"
-msgstr "%s: zlyhalo odstránenie právomocí (%s)\n"
+msgstr "zlyhalo odstránenie právomocí"
 
 #, fuzzy
 #| msgid "Couldn't lock file"

Modified: upstream/trunk/po/sv.po
===================================================================
--- upstream/trunk/po/sv.po	2011-12-09 21:31:39 UTC (rev 3652)
+++ upstream/trunk/po/sv.po	2011-12-09 21:35:47 UTC (rev 3653)
@@ -8,7 +8,7 @@
 "Project-Id-Version: shadow 4.1.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2011-11-13 18:42+0100\n"
-"PO-Revision-Date: 2011-04-04 15:37+0000\n"
+"PO-Revision-Date: 2011-11-25 22:08+0100\n"
 "Last-Translator: Daniel Nylander <yeager at ubuntu.com>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
 "Language: sv\n"
@@ -220,10 +220,9 @@
 "%s: Ogiltig konfiguration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
 "(%lu)\n"
 
-#, fuzzy, c-format
-#| msgid "failed to allocate memory"
+#, c-format
 msgid "%s: failed to allocate memory: %s\n"
-msgstr "misslyckades att allokera minne"
+msgstr "%s: misslyckades att allokera minne: %s\n"
 
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
@@ -382,65 +381,49 @@
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
 msgstr ""
+"  -d, --lastday SISTA_DAG       ställ in datum för sista lösenordsändring till SISTA_DAG\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-msgstr "  -e, --expiredate UTGÅNGSDATUM utgångsdatum för det nya kontot\n"
+msgstr ""
+"  -E, --expiredate UTGÅNGSDATUM ställ in kontots utgångsdatum till UTGÅNGSDATUM\n"
 
 msgid "  -h, --help                    display this help message and exit\n"
 msgstr ""
 "  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password LÖSENORD       ändra lösenordet till detta (krypterade)\n"
-"                                LÖSENORD\n"
+"  -I, --inactive INAKTIV        ställ in lösenordet till inaktivt efter utgång\n"
+"                                till INAKTIV\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -l, --list                    show account aging information\n"
 msgstr ""
-"  -r, --reset                   nollställd räknarna för inloggningsfel\n"
+"  -l, --list                    visa åldringsinformation om kontot\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              antal SHA-rundor för SHA*-\n"
-"                                krypteringsalgoritmerna\n"
+"  -m, --mindays MIN_DAGAR       ställ in minimum antal dagar innan lösenords-\n"
+"                                ändring till MIN_DAGAR\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              antal SHA-rundor för SHA*-\n"
-"                                krypteringsalgoritmerna\n"
+"  -M, --maxdays MAX_DAGAR       ställ in maximalt antal dagar innan lösenords-\n"
+"                                ändring till MAX_DAGAR\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir HEM_KAT        hemkatalog för det nya kontot\n"
+msgstr ""
 
 msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -W, --warndays VARN_DAGAR     ställ in dagar för utgångsvarning till VARN_DAGAR\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Ange det nya värdet eller tryck ENTER för standardvärdet"
@@ -550,17 +533,13 @@
 msgid "%s: error changing fields\n"
 msgstr "%s: fel vid ändring av fält\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [LOGIN]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Användning: %s [flaggor] INLOGGNINGSNAMN\n"
+"Användning: %s [flaggor] [INLOGGNINGSNAMN]\n"
 "\n"
 "Flaggor:\n"
 
@@ -576,11 +555,9 @@
 msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -u, --help                    display this help message and exit\n"
 msgstr ""
-"  -h, --help                    visa detta hjälpmeddelande och avsluta\n"
+"  -u, --help                    visa detta hjälpmeddelande och avsluta\n"
 
 msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
 msgstr ""
@@ -730,10 +707,9 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: rad %d: användaren \"%s\" finns inte\n"
 
-#, fuzzy
-#| msgid "  -s, --shell SHELL             login shell of the new account\n"
 msgid "  -s, --shell SHELL             new login shell for the user account\n"
-msgstr "  -s, --shell SKAL              inloggningsskal för det nya kontot\n"
+msgstr ""
+"  -s, --shell SHELL             nytt inloggningsskal för användarkontot\n"
 
 msgid "Login Shell"
 msgstr "Inloggningsskal"
@@ -762,34 +738,22 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: Varning: %s är inte en körbar fil\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -u, --user                    which user's tcb shadow file to edit\n"
 msgid "  -c, --check                   check the user's password expiration\n"
 msgstr ""
-"  -u, --user                    vilken användares tcb shadow-fil att "
-"redigera\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -f, --force                   force password change if the user's "
 "password\n"
 "                                is expired\n"
 msgstr ""
-"  -m, --md5                     kryptera klartextlösenordet med\n"
-"                                MD5-algoritmen\n"
 
 #, c-format
 msgid "%s: options %s and %s conflict\n"
 msgstr "%s: flaggorna %s och %s står i konflikt\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: unexpected argument: %s\n"
+#, c-format
 msgid "%s: unexpected argument: %s\n"
-msgstr "lastlog: oväntat argument: %s\n"
+msgstr "%s: oväntat argument: %s\n"
 
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
@@ -799,6 +763,8 @@
 "  -l, --lock-secs SEC           after failed login lock account for SEC "
 "seconds\n"
 msgstr ""
+"  -l, --lock-secs S             efter misslyckad inloggning lås kontot i "
+"S sekunder\n"
 
 msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
@@ -821,10 +787,9 @@
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to get the entry for UID %lu\n"
+#, c-format
 msgid "%s: Failed to get the entry for UID %lu\n"
-msgstr "faillog: Misslyckades med att få posten för UID %lu\n"
+msgstr "%s: Misslyckades med att få posten för UID %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Användare       Fel      Max Senaste                  På\n"
@@ -837,30 +802,25 @@
 msgid " [%lds lock]"
 msgstr " [%lds låsta]"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %lu\n"
+#, c-format
 msgid "%s: Failed to reset fail count for UID %lu\n"
-msgstr "faillog: Misslyckades med att ställa in låstid för UID %lu\n"
+msgstr "%s: Misslyckades med att ställa in låstid för UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set max for UID %lu\n"
-msgstr "faillog: Misslyckades med att ställa in max för UID %lu\n"
+msgstr "%s: Misslyckades med att ställa in max för UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set locktime for UID %lu\n"
-msgstr "faillog: Misslyckades med att ställa in låstid för UID %lu\n"
+msgstr "%s: Misslyckades med att ställa in låstid för UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Unknown user or range: %s\n"
+#, c-format
 msgid "%s: Unknown user or range: %s\n"
-msgstr "lastlog: Okänd användare eller intervall: %s\n"
+msgstr "%s: Okänd användare eller intervall: %s\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
+#, c-format
 msgid "%s: Cannot get the size of %s: %s\n"
-msgstr "lastlog: Kan inte få storleken för %s: %s\n"
+msgstr "%s: Kan inte få storleken för %s: %s\n"
 
 #, c-format
 msgid ""
@@ -878,10 +838,8 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete ANVÄNDARE        ta bort ANVÄNDARE från GRUPP\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir HEM_KAT        hemkatalog för det nya kontot\n"
+msgstr ""
 
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         ta bort GRUPPens lösenord\n"
@@ -1133,49 +1091,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s: okänd användare %s\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Användning: %s [flaggor] [åtgärd]\n"
+"Användning: %s [flaggor] [grupp [gshadow]]\n"
 "\n"
 "Flaggor:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Användning: %s [flaggor] [åtgärd]\n"
+"Användning: %s [flaggor] [grupp]\n"
 "\n"
 "Flaggor:\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -r, --read-only               display errors and warnings\n"
 "                                but do not change files\n"
 msgstr ""
-"  -s, --sha-rounds              antal SHA-rundor för SHA*-\n"
-"                                krypteringsalgoritmerna\n"
 
-#, fuzzy
-#| msgid "  -l, --list                    list the members of the group\n"
 msgid "  -s, --sort                    sort entries by UID\n"
-msgstr "  -l, --list                    lista medlemmarna av gruppen\n"
+msgstr ""
 
 #, c-format
 msgid "%s: -s and -r are incompatible\n"
@@ -1261,26 +1203,24 @@
 msgid " groups="
 msgstr " grupper="
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
-"  -a, --all                     visa faillog-poster för alla användare\n"
+"  -b, --before DAGAR            skriv endast ut lastlog information äldre än\n"
+"                                DAGAR\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
 msgstr ""
-"  -a, --all                     visa faillog-poster för alla användare\n"
+"  -t, --time DAGAR              skriv endast ut lastlog information senare än\n"
+"                                DAGAR\n"
 
 msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
+"  -u, --user LOGIN              skriv ut lastlog information för användare\n"
+"                                angiven med LOGIN\n"
 
 msgid "Username         Port     From             Latest"
 msgstr "Användarnamn      Port     Från             Senast"
@@ -1483,59 +1423,44 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: rad %d: kan inte uppdatera post\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
 "  -a, --all                     report password status on all accounts\n"
 msgstr ""
-"  -a, --all                     visa faillog-poster för alla användare\n"
+"  -a, --all                     rapportera lösenordsstatus för alla konton\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -d, --delete                  delete the password for the named account\n"
-msgstr "  -r, --system                  skapa ett systemkonto\n"
+msgstr ""
+"  -d, --delete                  ta bort lösenordet för angivet konto\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -e, --expire                  force expire the password for the named "
 "account\n"
-msgstr "  -r, --system                  skapa ett systemkonto\n"
+msgstr ""
+"  -e, --expire                  tvinga utgång för lösenordet för det angivna kontot\n"
 
-#, fuzzy
-#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
 msgid "  -k, --keep-tokens             change password only if expired\n"
-msgstr "  -e, --encrypted               angivna lösenord är krypterade\n"
+msgstr ""
+"  -k, --keep-tokens             ändra lösenord endast om utgånget\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password LÖSENORD       ändra lösenordet till detta (krypterade)\n"
-"                                LÖSENORD\n"
+"  -i, --inactive INAKTIV        ställ in lösenordet som inaktivt efter utgång\n"
+"                                till INAKTIV\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -l, --lock                    lock the password of the named account\n"
-msgstr "  -u, --uid UID                 användare-ID för det nya kontot\n"
+msgstr ""
+"  -l, --lock                    lås lösenordet för det angivna kontot\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              antal SHA-rundor för SHA*-\n"
-"                                krypteringsalgoritmerna\n"
+"  -n, --mindays MIN_DAGAR       ställ in minsta antal dagar innan lösenords-\n"
+"                                ändring till MIN_DAGAR\n"
 
 msgid "  -q, --quiet                   quiet mode\n"
 msgstr "  -q, --quiet                   tyst läge\n"
@@ -1543,33 +1468,29 @@
 msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 msgstr ""
+"  -r, --repository FÖRRÅD       ändra lösenord i förrådet FÖRRÅD\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -S, --status                  report password status on the named account\n"
-msgstr "  -r, --system                  skapa ett systemkonto\n"
+msgstr ""
+"  -S, --status                  rapportera lösenordsstatus för det angivna kontot\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
-msgstr "  -u, --uid UID                 användare-ID för det nya kontot\n"
+msgstr ""
+"  -u, --unlock                  lås upp lösenordet för det angivna kontot\n"
 
 msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -w, --warndays VARN_DAGAR     ställ in dagar för utgångsvarning till VARN_DAGAR\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              antal SHA-rundor för SHA*-\n"
-"                                krypteringsalgoritmerna\n"
+"  -x, --maxdays MAX_DAGAR       ställ in maximalt antal dagar innan lösenords-\n"
+"                                ändring till MAX_DAGAR\n"
 
 msgid "Old password: "
 msgstr "Gammalt lösenord: "
@@ -1653,31 +1574,23 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s: information om lösenordets utgång har ändrats.\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Användning: %s [flaggor] [åtgärd]\n"
+"Användning: %s [flaggor] [lösenord]\n"
 "\n"
 "Flaggor:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd [shadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Användning: %s [flaggor] [åtgärd]\n"
+"Användning: %s [flaggor] [lösenord [skugga]]\n"
 "\n"
 "Flaggor:\n"
 
@@ -1873,10 +1786,9 @@
 msgid "%s: Cannot drop the controlling terminal\n"
 msgstr "%s: Kan inte ta bort innehållet i %s: %s\n"
 
-#, fuzzy, c-format
-#| msgid "Cannot execute %s"
+#, c-format
 msgid "Cannot execute %s\n"
-msgstr "Kunde inte starta %s"
+msgstr "Kunde inte starta %s\n"
 
 msgid "No password file"
 msgstr "Ingen lösenordsfil"
@@ -1919,10 +1831,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: raden är för lång i %s: %s..."
 
-#, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
+#, c-format
 msgid "%s: rename: %s: %s\n"
-msgstr "%s: byt namn: %s: %s"
+msgstr "%s: byt namn: %s: %s\n"
 
 #, c-format
 msgid "%s: group '%s' is a NIS group.\n"
@@ -1932,11 +1843,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: för många grupper angivna (max %d).\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "       %s -D\n"
@@ -1945,6 +1852,8 @@
 "Options:\n"
 msgstr ""
 "Användning: %s [flaggor] INLOGGNINGSNAMN\n"
+"            %s -D\n"
+"            %s -D [flaggor]\n"
 "\n"
 "Flaggor:\n"
 
@@ -2143,24 +2052,16 @@
 "%s: varning: hem-katalogen finns redan.\n"
 "Kopierar ingen fil från skel-katalogen till den.\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -f, --force                   exit successfully if the group already "
-#| "exists,\n"
-#| "                                and cancel -g if the GID is already used\n"
 msgid ""
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
 msgstr ""
-"  -f, --force                   avsluta normalt om gruppen redan finns,\n"
-"                                och avbryt -g om GID redan används\n"
+"  -f, --force                   tvinga borttagning av filer, även om\n"
+"                                de inte ägs av användaren\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -r, --remove                  remove home directory and mail spool\n"
 msgstr ""
-"  -r, --reset                   nollställd räknarna för inloggningsfel\n"
+"  -r, --remove                  ta bort hemkatalog och postkö\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot remove the primary group of user '%s'\n"
@@ -2224,100 +2125,77 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: fel vid borttagning av katalogen %s\n"
 
-#, fuzzy
-#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
 msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
-msgstr "  -c, --comment KOMMENTAR       GECOS-fält för det nya kontot\n"
+msgstr ""
+"  -c, --comment KOMMENTAR       nytt värde för GECOS-fältet\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
 "  -d, --home HOME_DIR           new home directory for the user account\n"
-msgstr "  -d, --home-dir HEM_KAT        hemkatalog för det nya kontot\n"
+msgstr ""
+"  -d, --home HEMKAT             ny hemkatalog för användarkontot\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-msgstr "  -e, --expiredate UTGÅNGSDATUM utgångsdatum för det nya kontot\n"
+msgstr ""
+"  -e, --expiredate UTGÅNGSDATUM ställ in kontots utgångsdatum\n"
+"                                till UTGÅNGSDATUM\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password LÖSENORD       ändra lösenordet till detta (krypterade)\n"
-"                                LÖSENORD\n"
+"  -f, --inactive INAKTIV        ställ in lösenordet som inaktivt efter\n"
+"                                utgångsdatum till INAKTIV\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
-msgstr "  -g, --gid GID                 använd GID för den nya gruppen\n"
+msgstr ""
+"  -g, --gid GRUPP               tvinga användning av GRUPP som ny primärgrupp\n"
 
-#, fuzzy
-#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
 msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
 msgstr ""
-"  -M, --members ANVÄNDARE,...   ställ in listan för medlemmar av GRUPP\n"
+"  -G, --groups GRUPPER          ny lista över ytterligare GRUPPER\n"
 
 msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
 msgstr ""
+"  -a, --append                  lägg till användaren till ytterligare GRUPPER\n"
+"                                som nämns av flaggan -G utan att ta bort\n"
+"                                honom/henne från andra grupper\n"
 
 msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
 msgstr ""
+"  -l, --login NYTT_NAMN         nytt värde för inloggningsnamnet\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -L, --lock                    lock the user account\n"
-msgstr "  -u, --uid UID                 användare-ID för det nya kontot\n"
+msgstr ""
+"  -L, --lock                    lås användarkontot\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
-#| "the\n"
-#| "                                new account\n"
 msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
 msgstr ""
-"  -b, --base-dir BASKATALOG     baskatalog för hemkatalogen för\n"
-"                                det nya kontot\n"
+"  -m, --move-home               flytta innehållet i hemkatalogen till\n"
+"                                en ny plats (använd endast med -d)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
-#| "GID\n"
 msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
 msgstr ""
-"  -o, --non-unique              tillåt användning av dubletta (icke-unika) "
-"GID\n"
+"  -o, --non-unique              tillåt användning av dubbletta (icke-unika) UID\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       use this encrypted password for the new "
-#| "group\n"
 msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
 msgstr ""
-"  -p, --password LÖSENORD       använd detta krypterade lösenord för nya "
-"gruppen\n"
+"  -p, --password LÖSENORD       använd krypterat lösenord som nytt lösenord\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -u, --uid UID                 new UID for the user account\n"
-msgstr "  -u, --uid UID                 användare-ID för det nya kontot\n"
+msgstr ""
+"  -u, --uid UID                 nytt UID för användarkontot\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -U, --unlock                  unlock the user account\n"
-msgstr "  -u, --uid UID                 användare-ID för det nya kontot\n"
+msgstr ""
+"  -U, --unlock                  lås upp användarkontot\n"
 
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "

Modified: upstream/trunk/po/vi.po
===================================================================
--- upstream/trunk/po/vi.po	2011-12-09 21:31:39 UTC (rev 3652)
+++ upstream/trunk/po/vi.po	2011-12-09 21:35:47 UTC (rev 3653)
@@ -7,7 +7,7 @@
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2011-11-13 18:42+0100\n"
-"PO-Revision-Date: 2009-09-29 22:09+0930\n"
+"PO-Revision-Date: 2011-11-22 23:18+0100\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
 "Language: vi\n"
@@ -379,17 +379,13 @@
 msgid "No"
 msgstr "Không"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Sử dụng: %s [tuỳ_chọn ...]\n"
+"Sử dụng: %s [tuỳ_chọn ...] [ĐĂNG_NHẬP]\n"
 "\n"
 "Tuỳ chọn:\n"
 
@@ -397,62 +393,46 @@
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
 msgstr ""
+"  -d, --lastday NGÀY_CUỐI       đặt ngày thay đổi mật khẩu cuối cùng thành ngày này\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-msgstr "  -e, --expiredate NGÀY      ngày hết hạn sử dụng tài khoản mới\n"
+msgstr ""
+"  -E, --expiredate NGÀY_HẾT_HẠN đặt ngày hết hạn dùng tài khoản thành ngày này\n"
 
 msgid "  -h, --help                    display this help message and exit\n"
 msgstr "  -h, --help                    hiển thị trợ giúp này, sau đó thoát\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password MẬT_KHẨU       thay đổi mật khẩu thành MẬT_KHẨU (đã mật mã) "
-"này\n"
+"  -I, --inactive INACTIVE       đặt mật khẩu không còn hoạt động lại sau khi hết hạn dùng,\n"
+"                                thành INACTIVE\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -l, --list                    show account aging information\n"
 msgstr ""
-"  -r, --reset                   đặt lại các bộ đếm lần không đăng nhập được\n"
+"  -l, --list                    hiển thị thông tin về khoảng thời gian sử dụng tài khoản\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              số vòng SHA cho thuật toán mã hoá SHA*\n"
+"  -m, --mindays SỐ              đặt thành số này số tối thiểu các ngày trước khi thay đổi mật khẩu\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              số vòng SHA cho thuật toán mã hoá SHA*\n"
+"  -M, --maxdays SỐ              đặt thành số này số tối đa các ngày trước khi thay đổi mật khẩu\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir THƯ_MỤC       thư mục chính của tài khoản mới\n"
+msgstr ""
 
 msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -W, --warndays SỐ             đặt thành số này số các ngày gây ra cảnh báo về hết hạn dùng\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "Nhập giá trị mới, hoạc bấm phím Enter đặt chọn giá trị mặc định"
@@ -588,10 +568,8 @@
 msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -u, --help                    display this help message and exit\n"
-msgstr "  -h, --help                    hiển thị trợ giúp này, sau đó thoát\n"
+msgstr "  -u, --help                    hiển thị trợ giúp này, sau đó thoát\n"
 
 msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
 msgstr ""
@@ -742,11 +720,10 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s: dòng %d: người dùng « %s » không tồn tại\n"
 
-#, fuzzy
-#| msgid "  -s, --shell SHELL             login shell of the new account\n"
 msgid "  -s, --shell SHELL             new login shell for the user account\n"
 msgstr ""
-"  -s, --shell TRÌNH_BAO             trình bao đăng nhập của tài khoản mới\n"
+"  -s, --shell TRÌNH_BAO         trình bao đăng nhập mới\n"
+"                                cho tài khoản người dùng\n"
 
 msgid "Login Shell"
 msgstr "Trình bao Đăng nhập"
@@ -778,52 +755,39 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s: cảnh báo : %s không phải được %s sở hữu\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -c, --check                   check the user's password expiration\n"
-msgstr "  -u, --uid UID                 mã số người dùng của tài khoản mới\n"
+msgstr ""
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -f, --force                   force password change if the user's "
 "password\n"
 "                                is expired\n"
 msgstr ""
-"  -m, --md5                     mật mã hoá mật khẩu chữ thô, dùng thuật toán "
-"MD5\n"
 
 #, c-format
 msgid "%s: options %s and %s conflict\n"
 msgstr "%s: hai tùy chọn %s và %s xung đột với nhau\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: unexpected argument: %s\n"
+#, c-format
 msgid "%s: unexpected argument: %s\n"
-msgstr "lastlog: đối số bất thường: %s\n"
+msgstr "%s: đối số bất thường: %s\n"
 
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr ""
 "  -a, --all                     hiển thị các mục ghi faillog cho mọi người "
 "dùng\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -l, --lock-time SEC           after failed login lock account for SEC "
-#| "seconds\n"
 msgid ""
 "  -l, --lock-secs SEC           after failed login lock account for SEC "
 "seconds\n"
 msgstr ""
-"  -l, --lock-time GIÂY           sau khi không đăng nhập được thì khoá tài "
+"  -l, --lock-secs GIÂY          sau khi không đăng nhập được thì khoá tài "
 "khoản trong vòng số GIÂY này\n"
 
 msgid ""
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 msgstr ""
-"  -m, --maximum SỐ             đặt thành SỐ này số tối đa các bộ đếm lần "
+"  -m, --maximum SỐ              đặt thành SỐ này số tối đa các bộ đếm lần "
 "không đăng nhập được\n"
 
 msgid "  -r, --reset                   reset the counters of login failures\n"
@@ -842,16 +806,14 @@
 "                                counters and limits (if used with -r, -m,\n"
 "                                or -l) only for the specified LOGIN(s)\n"
 msgstr ""
-"  -u, --user ĐĂNG_NHẬP/PHẠM_VI        hiển thị mục ghi faillog hoặc duy trì "
-"các bộ đếm\n"
-"\t\t\tlần không đăng nhập được và các giới hạn như thế\n"
-"\t\t\t(nếu dùng với cờ « -r », « -m » hay « -l » riêng từng cái)\n"
-"\t\t\tchỉ cho mỗi tên đăng nhập đưa ra\n"
+"  -u, --user ĐĂNG_NHẬP/PHẠM_VI  hiển thị mục ghi faillog hoặc duy trì các bộ đếm\n"
+"                                lần không đăng nhập được và các giới hạn như thế\n"
+"                                (nếu dùng với cờ « -r », « -m » hay « -l » riêng từng cái)\n"
+"                                chỉ cho mỗi tên đăng nhập đưa ra\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+#, c-format
 msgid "%s: Failed to get the entry for UID %lu\n"
-msgstr "lastlog: Không lấy được mục nhập cho UID %lu\n"
+msgstr "%s: Không lấy được mục nhập cho UID %lu\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Đăng nhập\t\tBị lỗi\tTối đa\tMới nhất        Vào\n"
@@ -864,89 +826,69 @@
 msgid " [%lds lock]"
 msgstr " [%lds khóa]"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, c-format
 msgid "%s: Failed to reset fail count for UID %lu\n"
-msgstr "faillog: không đặt lại được hàm đếm cho UID %lu\n"
+msgstr "%s: không đặt lại được hàm đếm cho UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set max for UID %lu\n"
-msgstr "faillog: không đặt được số tối đa cho UID %lu\n"
+msgstr "%s: không đặt được số tối đa cho UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set locktime for UID %lu\n"
 msgstr "faillog: không đặt được thời gian khoá cho UID %lu\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Unknown user or range: %s\n"
+#, c-format
 msgid "%s: Unknown user or range: %s\n"
-msgstr "lastlog: không nhận ra người dùng hay phạm vi: %s\n"
+msgstr "%s: không nhận ra người dùng hay phạm vi: %s\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
+#, c-format
 msgid "%s: Cannot get the size of %s: %s\n"
-msgstr "lastlog: Không thể lấy kích cỡ của %s: %s\n"
+msgstr "%s: Không thể lấy kích cỡ của %s: %s\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] GROUP\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [option] GROUP\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Sử dụng: %s [tuỳ_chọn ...] NHÓM\n"
+"Sử dụng: %s [tuỳ_chọn] NHÓM\n"
 "\n"
 "Tuỳ chọn:\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 change the group ID to GID\n"
 msgid "  -a, --add USER                add USER to GROUP\n"
-msgstr "  -g, --gid GID                 thay đổi mã số nhóm sang GID này\n"
+msgstr ""
+"  -a, --add NGƯỜI_DÙNG          thêm người dùng này vào NHÓM\n"
 
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr ""
+"  -d, --delete NGƯỜI_DÙNG       gỡ bỏ người dùng này khỏi NHÓM\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir THƯ_MỤC       thư mục chính của tài khoản mới\n"
+msgstr ""
 
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr ""
+"  -r, --remove-password         gỡ bỏ mật khẩu của NHÓM\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid ""
 "  -R, --restrict                restrict access to GROUP to its members\n"
 msgstr ""
-"  -r, --reset                   đặt lại các bộ đếm lần không đăng nhập được\n"
+"  -R, --restrict                hạn chế truy cập đến NHÓM thành các thành viên của nó\n"
 
 msgid "  -M, --members USER,...        set the list of members of GROUP\n"
 msgstr ""
+"  -M, --members NGƯỜI_DÙNG,...  đặt danh sách các thành viên của NHÓM\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -A, --administrators ADMIN,...\n"
-#| "                                set the list of administrators for GROUP\n"
-#| "Except for the -A and -M options, the options cannot be combined.\n"
 msgid ""
 "  -A, --administrators ADMIN,...\n"
 "                                set the list of administrators for GROUP\n"
 msgstr ""
-"  -A, --administrators QUẢN_TRỊ,...\tđặt danh sách các quản trị cho NHÓM\n"
-"\n"
-"Trừ hai tuỳ chọn « -A » và « -M », không thể tổ hợp các tuỳ chọn.\n"
+"  -A, --administrators QUẢN_TRỊ,...\n"
+"                                đặt danh sách các quản trị cho NHÓM\n"
 
-#, fuzzy
-#| msgid "The options cannot be combined.\n"
 msgid "Except for the -A and -M options, the options cannot be combined.\n"
-msgstr "Không thể tổ hợp các tuỳ chọn.\n"
+msgstr "Trừ hai tuỳ chọn « -A » và « -M », không thể tổ hợp các tuỳ chọn.\n"
 
 msgid "The options cannot be combined.\n"
 msgstr "Không thể tổ hợp các tuỳ chọn.\n"
@@ -1019,7 +961,7 @@
 
 msgid "  -K, --key KEY=VALUE           override /etc/login.defs defaults\n"
 msgstr ""
-"  -K, --key KHOÁ=GIÁ_TRỊ           ghi đè lên các giá trị mặc định « /etc/"
+"  -K, --key KHOÁ=GIÁ_TRỊ        ghi đè lên các giá trị mặc định « /etc/"
 "login.defs »\n"
 
 msgid ""
@@ -1091,58 +1033,47 @@
 msgid "%s: Out of memory. Cannot update %s.\n"
 msgstr "%s: Không đủ bộ nhớ. Không thể cập nhật %s.\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [action]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Sử dụng: %s [tuỳ_chọn ...]\n"
+"Sử dụng: %s [tuỳ_chọn ...] [hành_vi]\n"
 "\n"
 "Tuỳ chọn:\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -N, --no-user-group           do not create a group with the same name "
-#| "as\n"
-#| "                                the user\n"
 msgid ""
 "  -g, --group groupname         change groupname instead of the user's "
 "group\n"
 "                                (root only)\n"
 msgstr ""
-"  -N, --no-user-group           đừng tạo một nhóm cùng tên với người dùng\n"
+"  -g, --group TÊN_NHÓM          thay đổi tên của nhóm này thay cho nhóm của người dùng (chỉ người chủ)\n"
 
 msgid "\n"
-msgstr ""
+msgstr "\n"
 
 msgid "Actions:\n"
-msgstr ""
+msgstr "Hành vi:\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid ""
 "  -a, --add username            add username to the members of the group\n"
-msgstr "  -g, --gid GID                 dùng GID này cho nhóm mới\n"
+msgstr ""
+"  -a, --add TÊN                 thêm tên người dùng này vào nhóm\n"
 
 msgid ""
 "  -d, --delete username         remove username from the members of the "
 "group\n"
 msgstr ""
+"  -d, --delete TÊN              gỡ bỏ tên này khỏi nhóm\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -p, --purge                   purge all members from the group\n"
-msgstr "  -g, --gid GID                 dùng GID này cho nhóm mới\n"
+msgstr ""
+"  -p, --purge                   tẩy mọi người ra nhóm\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -l, --list                    list the members of the group\n"
-msgstr "  -g, --gid GID                 dùng GID này cho nhóm mới\n"
+msgstr ""
+"  -l, --list                    liệt kê những người trong nhóm\n"
 
 #, c-format
 msgid "%s: your groupname does not match your username\n"
@@ -1156,7 +1087,7 @@
 msgstr "  -g, --gid GID                 thay đổi mã số nhóm sang GID này\n"
 
 msgid "  -n, --new-name NEW_GROUP      change the name to NEW_GROUP\n"
-msgstr "  -n, --new-name NHÓM_MỚI      thay đổi tên sang tên này\n"
+msgstr "  -n, --new-name NHÓM_MỚI       thay đổi tên sang tên này\n"
 
 msgid ""
 "  -o, --non-unique              allow to use a duplicate (non-unique) GID\n"
@@ -1310,30 +1241,23 @@
 msgid " groups="
 msgstr " nhóm="
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
-"  -t, --time NGÀY               hiển thị các mục ghi faillog mới hơn số NGÀY "
-"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"
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
 msgstr ""
-"  -t, --time NGÀY               hiển thị các mục ghi faillog mới hơn số NGÀY "
-"này\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"
 
 msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
+"  -u, --user ĐĂNG_NHẬP          hiển thị mục ghi lastlog cho _người dùng_ tên này\n"
 
 msgid "Username         Port     From             Latest"
 msgstr "Tên dùng\t\t Cổng    Từ\t\tMới nhất"
@@ -1543,95 +1467,73 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: dòng %d: không thể cập nhật mục nhập\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
 "  -a, --all                     report password status on all accounts\n"
 msgstr ""
-"  -a, --all                     hiển thị các mục ghi faillog cho mọi người "
-"dùng\n"
+"  -a, --all                     thông báo trạng thái mật khẩu về mọi tài khoản\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -d, --delete                  delete the password for the named account\n"
-msgstr "  -r, --system                  tạo một tài khoản hệ thống\n"
+msgstr ""
+"  -d, --delete                  xoá mật khẩu cho tài khoản đặt tên\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -e, --expire                  force expire the password for the named "
 "account\n"
-msgstr "  -r, --system                  tạo một tài khoản hệ thống\n"
+msgstr ""
+"  -e, --expire                  ép buộc hết hạn dùng mật khẩu cho tài khoản đặt tên\n"
 
-#, fuzzy
-#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
 msgid "  -k, --keep-tokens             change password only if expired\n"
 msgstr ""
-"  -e, --encrypted               các mật khẩu đã cung cấp cũng được mật mã\n"
+"  -k, --keep-tokens             thay đổi mật khẩu chỉ nếu bị hết hạn dùng\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password MẬT_KHẨU       thay đổi mật khẩu thành MẬT_KHẨU (đã mật mã) "
-"này\n"
+"  -i, --inactive INACTIVE       đặt thành INACTIVE mật khẩu không còn hoạt động lại\n"
+"                                sau khi hết hạn dùng\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -l, --lock                    lock the password of the named account\n"
-msgstr "  -u, --uid UID                 mã số người dùng của tài khoản mới\n"
+msgstr ""
+"  -l, --lock                    khoá mật khẩu của tài khoản đặt tên\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              số vòng SHA cho thuật toán mã hoá SHA*\n"
+"  -n, --mindays SỐ              đặt thành số này số tối thiểu các ngày trước khi mật khẩu thay đổi được\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -q, --quiet                   quiet mode\n"
-msgstr "  -g, --gid GID                 dùng GID này cho nhóm mới\n"
+msgstr ""
+"  -q, --quiet                   chế độ không xuất chi tiết\n"
 
 msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 msgstr ""
+"  -r, --repository KHO          thay đổi mật khẩu trong kho lưu này\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -S, --status                  report password status on the named account\n"
-msgstr "  -r, --system                  tạo một tài khoản hệ thống\n"
+msgstr ""
+"  -S, --status                  thông báo trạng thái mật khẩu về tài khoản đặt tên\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
-msgstr "  -u, --uid UID                 mã số người dùng của tài khoản mới\n"
+msgstr ""
+"  -u, --unlock                  mở khoá mật khẩu của tài khoản đặt tên\n"
 
 msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -w, --warndays NGÀY           đặt thành số này số các ngày cảnh báo về hết hạn dùng\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -s, --sha-rounds              số vòng SHA cho thuật toán mã hoá SHA*\n"
+"  -x, --maxdays NGÀY            đặt thành số này số tối đa các ngày trước khi thay đổi được mật khẩu\n"
 
 msgid "Old password: "
 msgstr "Mật khẩu cũ : "
@@ -1891,12 +1793,12 @@
 "[su: siêu người dùng]\n"
 "\n"
 "Tùy chọn:\n"
-"  -c, --command LỆNH        gởi lệnh này qua cho trình bao đã gọi\n"
-"  -h, --help                hiển thị _trợ giúp_ này rồi thoát\n"
-"  -, -l, --login            lập trình bao là trình bao _đăng nhập_\n"
+"  -c, --command LỆNH            gởi lệnh này qua cho trình bao đã gọi\n"
+"  -h, --help                    hiển thị _trợ giúp_ này rồi thoát\n"
+"  -, -l, --login                lập trình bao là trình bao _đăng nhập_\n"
 "  -m, -p,\n"
-"  --preserve-environment    đừng lập lại các biến _môi trường_, và _giữ_\n"
-"                            trình bao hiện có\n"
+"  --preserve-environment        đừng lập lại các biến _môi trường_, và _giữ_\n"
+"                                trình bao hiện có\n"
 "  -s, --shell TRÌNH_BAO         sử dụng trình bao này thay cho trình mặc "
 "định trong passwd\n"
 "\n"
@@ -1989,10 +1891,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: dòng quá dài trong %s: %s..."
 
-#, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
+#, c-format
 msgid "%s: rename: %s: %s\n"
-msgstr "%s: thay tên: %s: %s"
+msgstr "%s: thay tên: %s: %s\n"
 
 #, c-format
 msgid "%s: group '%s' is a NIS group.\n"
@@ -2213,24 +2114,16 @@
 "%s: cảnh báo : thư mục chính đã có.\n"
 "Vì vậy không sao chép vào nó tập tin nào từ thư mục « skel ».\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -f, --force                   exit successfully if the group already "
-#| "exists,\n"
-#| "                                and cancel -g if the GID is already used\n"
 msgid ""
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
 msgstr ""
-"  -f, --force                   thoát thành công nếu nhóm đã có, và hủy bỏ « "
-"-g » nếu GID đã được dùng\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"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -r, --remove                  remove home directory and mail spool\n"
 msgstr ""
-"  -r, --reset                   đặt lại các bộ đếm lần không đăng nhập được\n"
+"  -r, --remove                  gỡ bỏ thư mục chính và ống chỉ thư tín\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot remove the primary group of user '%s'\n"
@@ -2297,101 +2190,75 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: gặp lỗi khi gỡ bỏ thư mục %s\n"
 
-#, fuzzy
-#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
 msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
-msgstr "  -c, --comment GHI_CHÚ         trường GECOS của tài khoản mới\n"
+msgstr ""
+"  -c, --comment GHI_LƯU         giá trị mới của trường GECOS\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
 "  -d, --home HOME_DIR           new home directory for the user account\n"
-msgstr "  -d, --home-dir THƯ_MỤC       thư mục chính của tài khoản mới\n"
+msgstr ""
+"  -d, --home THƯ_MỤC            thư mục chính mới cho tài khoản người dùng\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-msgstr "  -e, --expiredate NGÀY      ngày hết hạn sử dụng tài khoản mới\n"
+msgstr ""
+"  -e, --expiredate NGÀY         đặt thành ngày này ngày hết hạn dùng tài khoản\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
 msgstr ""
-"  -p, --password MẬT_KHẨU       thay đổi mật khẩu thành MẬT_KHẨU (đã mật mã) "
-"này\n"
+"  -f, --inactive INACTIVE       đặt thành INACTIVE mật khẩu không còn hoạt động lại\n"
+"                                sau khi hết hạn dùng\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
-msgstr "  -g, --gid GID                 dùng GID này cho nhóm mới\n"
+msgstr ""
+"  -g, --gid NHÓM                ép buộc sử dụng nhóm này làm nhóm chính mới\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -G, --groups GROUPS           list of supplementary groups of the new\n"
-#| "                                account\n"
 msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
 msgstr ""
-"  -G, --groups NHÓM           danh sách các nhóm phụ của tài khoản mới\n"
+"  -G, --groups NHÓM             danh sách mới chứa các nhóm phụ\n"
 
 msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
 msgstr ""
+"  -a, --append                  phụ thêm người dùng vào các nhóm phụ\n"
+"                                đưa ra bởi tuỳ chọn « -G » mà không gỡ bỏ ta khỏi nhóm khác\n"
 
 msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
 msgstr ""
+"  -l, --login ĐĂNG_NHẬP         giá trị mới của tên đăng nhập\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -L, --lock                    lock the user account\n"
-msgstr "  -u, --uid UID                 mã số người dùng của tài khoản mới\n"
+msgstr ""
+"  -L, --lock                    khoá tài khoản người dùng\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
-#| "the\n"
-#| "                                new account\n"
 msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
 msgstr ""
-"  -b, --base-dir THƯ_MỤC       đặt thư mục cơ bản cho thư mục chính của tài "
-"khoản mới\n"
+"  -m, --move-home               di chuyển nội dung của thư mục chính sang vị trí mới\n"
+"                                (chỉ dùng cùng với « -d »)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
-#| "GID\n"
 msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
 msgstr ""
-"  -o, --non-unique              cho phép sử dụng một GID trùng (không duy "
-"nhất)\n"
+"  -o, --non-unique              cho phép sử dụng UID trùng (không duy nhất)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       use this encrypted password for the new "
-#| "group\n"
 msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
 msgstr ""
-"  -p, --password MẬT_KHẨU       dùng mật khẩu đã mật mã này cho nhóm mới\n"
+"  -p, --password MẬT_KHẨU       mật mã hoá mật khẩu mới\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -u, --uid UID                 new UID for the user account\n"
-msgstr "  -u, --uid UID                 mã số người dùng của tài khoản mới\n"
+msgstr ""
+"  -u, --uid UID                 UID mới cho tài khoản người dùng\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -U, --unlock                  unlock the user account\n"
-msgstr "  -u, --uid UID                 mã số người dùng của tài khoản mới\n"
+msgstr ""
+"  -U, --unlock                  mở khoá tài khoản người dùng\n"
 
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "
@@ -2486,37 +2353,23 @@
 "Để thống nhất thì bạn cũng có thể cần sửa đổi %s.\n"
 "Hãy sử dụng câu lệnh « %s » để làm như thế.\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: %s [options]\n"
-#| "\n"
-#| "Options:\n"
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"Sử dụng: %s [tuỳ_chọn ...]\n"
+"Sử dụng: vipw [tuỳ_chọn ...]\n"
 "\n"
 "Tuỳ chọn:\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 change the group ID to GID\n"
 msgid "  -g, --group                   edit group database\n"
-msgstr "  -g, --gid GID                 thay đổi mã số nhóm sang GID này\n"
+msgstr "  -g, --group                   sửa đổi cơ sở dữ liệu nhóm\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create system accounts\n"
 msgid "  -p, --passwd                  edit passwd database\n"
-msgstr "  -r, --system                  tạo các tài khoản hệ thống\n"
+msgstr "  -p, --passwd                  sửa đổi cơ sở dữ liệu passwd\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid "  -s, --shadow                  edit shadow or gshadow database\n"
-msgstr ""
-"  -a, --all                     hiển thị các mục ghi faillog cho mọi người "
-"dùng\n"
+msgstr "  -s, --shadow                  sửa đổi cơ sở dữ liệu shadow hay gshadow\n"
 
 #, fuzzy
 #| msgid "  -u, --uid UID                 user ID of the new account\n"

Modified: upstream/trunk/po/zh_CN.po
===================================================================
--- upstream/trunk/po/zh_CN.po	2011-12-09 21:31:39 UTC (rev 3652)
+++ upstream/trunk/po/zh_CN.po	2011-12-09 21:35:47 UTC (rev 3653)
@@ -10,7 +10,7 @@
 "Project-Id-Version: shadow 4.0.15\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2011-11-13 18:42+0100\n"
-"PO-Revision-Date: 2010-10-07 03:09+0800\n"
+"PO-Revision-Date: 2011-11-25 22:45+0100\n"
 "Last-Translator: YunQiang Su <wzssyqa at gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh at googlegroups.com>\n"
 "Language: \n"
@@ -219,10 +219,9 @@
 "(%lu)\n"
 msgstr "%s:无效的配置:SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%lu)\n"
 
-#, fuzzy, c-format
-#| msgid "failed to allocate memory"
+#, c-format
 msgid "%s: failed to allocate memory: %s\n"
-msgstr "申请内存失败"
+msgstr "%s:申请内存失败:%s\n"
 
 #, c-format
 msgid "%s: Can't get unique system GID (no more available GIDs)\n"
@@ -379,57 +378,45 @@
 "  -d, --lastday LAST_DAY        set date of last password change to "
 "LAST_DAY\n"
 msgstr ""
+"  -d, --lastday 最近日期        将最近一次密码设置时间设为“最近日期”\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-msgstr " -e, --expiredate EXPIRE_DATE  新账户的过期日期\n"
+msgstr ""
+"  -E, --expiredate 过期日期     将帐户过期时间设为“过期日期”\n"
 
 msgid "  -h, --help                    display this help message and exit\n"
-msgstr "  -h, --help\t\t显示此帮助信息并推出\n"
+msgstr "  -h, --help                    显示此帮助信息并推出\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-msgstr "  -p, --password PASSWORD\t将密码更改为(加密过的) PASSWORD\n"
+msgstr ""
+"  -I, --inactive INACITVE       过期 INACTIVE 天数后,设定密码为失效状态\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -l, --list                    show account aging information\n"
-msgstr "  -r, --reset\t\t重置登陆失败计数\n"
+msgstr ""
+"  -l, --list                    显示帐户年龄信息\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-msgstr "  -s, --sha-rounds\t\tSHA* 加密算法中的 SHA 旁边的数字\n"
+msgstr ""
+"  -m, --mindays 最小天数        将两次改变密码之间相距的最小天数设为“最小天数”\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
 "                                change to MAX_DAYS\n"
-msgstr "  -s, --sha-rounds\t\tSHA* 加密算法中的 SHA 旁边的数字\n"
+msgstr ""
+"  -M, --maxdays 最大天数        将两次改变密码之间相距的最大天数设为“最大天数”\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir HOME_DIR       新账户的主目录\n"
+msgstr ""
 
 msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -W, --warndays 警告天数       将过期警告天数设为“警告天数”\n"
 
 msgid "Enter the new value, or press ENTER for the default"
 msgstr "请输入新值,或直接敲回车键以使用默认值"
@@ -539,17 +526,13 @@
 msgid "%s: error changing fields\n"
 msgstr "%s:改变字段时出错\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [LOGIN]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"用法:%s [选项] 登录\n"
+"用法:%s [选项] [登录]\n"
 "\n"
 "选项:\n"
 
@@ -565,10 +548,8 @@
 msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
 msgstr ""
 
-#, fuzzy
-#| msgid "  -h, --help                    display this help message and exit\n"
 msgid "  -u, --help                    display this help message and exit\n"
-msgstr "  -h, --help\t\t显示此帮助信息并推出\n"
+msgstr "  -u, --help                    显示此帮助信息并推出\n"
 
 msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
 msgstr ""
@@ -716,10 +697,8 @@
 msgid "%s: line %d: user '%s' does not exist\n"
 msgstr "%s:第 %d 行:用户“%s”不存在\n"
 
-#, fuzzy
-#| msgid "  -s, --shell SHELL             login shell of the new account\n"
 msgid "  -s, --shell SHELL             new login shell for the user account\n"
-msgstr "  -s, --shell SHELL\t\t新账户的登录 shell\n"
+msgstr "  -s, --shell SHELL             该用户帐号的新登录 shell\n"
 
 msgid "Login Shell"
 msgstr "登录 Shell"
@@ -748,30 +727,22 @@
 msgid "%s: Warning: %s is not executable\n"
 msgstr "%s:警告:%s 不可执行\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -u, --user                    which user's tcb shadow file to edit\n"
 msgid "  -c, --check                   check the user's password expiration\n"
-msgstr "  -u, --user                    要编辑哪个用户的 tcb 影子文件\n"
+msgstr ""
 
-#, fuzzy
-#| msgid ""
-#| "  -m, --md5                     encrypt the clear text password using\n"
-#| "                                the MD5 algorithm\n"
 msgid ""
 "  -f, --force                   force password change if the user's "
 "password\n"
 "                                is expired\n"
-msgstr "  -m, --md5\t\t使用 MD5 算法加密明文密码\n"
+msgstr ""
 
 #, c-format
 msgid "%s: options %s and %s conflict\n"
 msgstr "%s:选项 %s 和 %s 冲突\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: unexpected argument: %s\n"
+#, c-format
 msgid "%s: unexpected argument: %s\n"
-msgstr "lastlog:意外的参数:%s\n"
+msgstr "%s:意外的参数:%s\n"
 
 msgid "  -a, --all                     display faillog records for all users\n"
 msgstr "  -a, --all\t\t\t为所有用户显示登陆失败记录\n"
@@ -801,10 +772,9 @@
 "  -u, --user LOGIN/RANGE\t只为指定的登录显示登录失败记录或维护失败\n"
 "\t\t\t\t\t计数和限制(如果使用了 -r, -m 或 -l)\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Failed to get the entry for UID %lu\n"
+#, c-format
 msgid "%s: Failed to get the entry for UID %lu\n"
-msgstr "lastlog:获取 UID %lu 的条目失败\n"
+msgstr "%s:获取 UID %lu 的条目失败\n"
 
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "登录        失败次数  最多   最近                     于\n"
@@ -817,30 +787,25 @@
 msgid " [%lds lock]"
 msgstr " [锁定 %lds]"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to reset fail count for UID %lu\n"
+#, c-format
 msgid "%s: Failed to reset fail count for UID %lu\n"
-msgstr "登录失败:为 UID %lu 重置失败计数失败\n"
+msgstr "%s:为 UID %lu 重置失败计数失败\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set max for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set max for UID %lu\n"
-msgstr "登录失败:为 UID %lu 设置最大值失败\n"
+msgstr "%s:为 UID %lu 设置最大值失败\n"
 
-#, fuzzy, c-format
-#| msgid "faillog: Failed to set locktime for UID %lu\n"
+#, c-format
 msgid "%s: Failed to set locktime for UID %lu\n"
-msgstr "登录失败:为 UID %lu 设置锁定时间失败\n"
+msgstr "%s:为 UID %lu 设置锁定时间失败\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Unknown user or range: %s\n"
+#, c-format
 msgid "%s: Unknown user or range: %s\n"
-msgstr "最近登录:未知用户或范围:%s\n"
+msgstr "%s:未知用户或范围:%s\n"
 
-#, fuzzy, c-format
-#| msgid "lastlog: Cannot get the size of %s: %s\n"
+#, c-format
 msgid "%s: Cannot get the size of %s: %s\n"
-msgstr "lastlog:无法获得 %s 的大小:%s\n"
+msgstr "%s:无法获得 %s 的大小:%s\n"
 
 #, c-format
 msgid ""
@@ -858,10 +823,8 @@
 msgid "  -d, --delete USER             remove USER from GROUP\n"
 msgstr "  -d, --delete USER             从组 GROUP 中添加或删除用户\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid "  -Q, --root CHROOT_DIR         directory to chroot into\n"
-msgstr "  -d, --home-dir HOME_DIR       新账户的主目录\n"
+msgstr ""
 
 msgid "  -r, --remove-password         remove the GROUP's password\n"
 msgstr "  -r, --remove-password         移除组 GROUP 的密码\n"
@@ -1092,47 +1055,33 @@
 msgid "%s: unknown user %s\n"
 msgstr "%s:未知用户 %s\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"用法:%s [选项] [动作]\n"
+"用法:%s [选项] [组 [gshadow]]\n"
 "\n"
 "选项:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [group]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"用法:%s [选项] [动作]\n"
+"用法:%s [选项] [组]\n"
 "\n"
 "选项:\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -r, --read-only               display errors and warnings\n"
 "                                but do not change files\n"
-msgstr "  -s, --sha-rounds\t\tSHA* 加密算法中的 SHA 旁边的数字\n"
+msgstr ""
 
-#, fuzzy
-#| msgid "  -l, --list                    list the members of the group\n"
 msgid "  -s, --sort                    sort entries by UID\n"
-msgstr "  -l, --list                    列出组中的所有成员\n"
+msgstr ""
 
 #, c-format
 msgid "%s: -s and -r are incompatible\n"
@@ -1216,26 +1165,21 @@
 msgid " groups="
 msgstr " 组="
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
-msgstr "  -t, --time DAYS\t\t显示 DAYS 天来的登陆失败记录\n"
+msgstr ""
+"  -b, --before DAYS             仅打印早于 DAYS 的最近登录记录\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -t, --time DAYS               display faillog records more recent than "
-#| "DAYS\n"
 msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
 "DAYS\n"
-msgstr "  -t, --time DAYS\t\t显示 DAYS 天来的登陆失败记录\n"
+msgstr ""
+"  -t, --time DAYS               仅打印晚于 DAYS 的最近登录记录\n"
 
 msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr ""
+"  -u, --user LOGIN              打印 LOGIN 用户的最近登录记录\n"
 
 msgid "Username         Port     From             Latest"
 msgstr "用户名           端口     来自             最后登陆时间"
@@ -1436,54 +1380,43 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s:第 %d 行:无法更新条目\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --all                     display faillog records for all users\n"
 msgid ""
 "  -a, --all                     report password status on all accounts\n"
-msgstr "  -a, --all\t\t\t为所有用户显示登陆失败记录\n"
+msgstr ""
+"  -a, --all                     报告所有帐户的密码状态\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -d, --delete                  delete the password for the named account\n"
-msgstr "  -r, --system                  创建一个系统账户\n"
+msgstr ""
+"  -d, --delete                  删除指定帐户的密码\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -e, --expire                  force expire the password for the named "
 "account\n"
-msgstr "  -r, --system                  创建一个系统账户\n"
+msgstr ""
+"  -e, --expire                  强制使指定帐户的密码过期\n"
 
-#, fuzzy
-#| msgid "  -e, --encrypted               supplied passwords are encrypted\n"
 msgid "  -k, --keep-tokens             change password only if expired\n"
-msgstr "  -e, --encrypted\t\t提供的密码已经加密\n"
+msgstr ""
+"  -k, --keep-tokens             仅在过期后修改密码\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-msgstr "  -p, --password PASSWORD\t将密码更改为(加密过的) PASSWORD\n"
+msgstr ""
+"  -i, --inactive INACTIVE       密码过期后设置密码不活动为 INACTIVE\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -l, --lock                    lock the password of the named account\n"
-msgstr "  -u, --uid UID\t\t\t新账户的用户 ID\n"
+msgstr ""
+"  -l, --lock                    锁定指定的帐户\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
-msgstr "  -s, --sha-rounds\t\tSHA* 加密算法中的 SHA 旁边的数字\n"
+msgstr ""
+"  -n, --mindays MIN_DAYS        设置到下次修改密码所须等待的最短天数\n"
+"                                为 MIN_DAYS\n"
 
 msgid "  -q, --quiet                   quiet mode\n"
 msgstr "  -q, --quiet                   安静模式\n"
@@ -1491,31 +1424,29 @@
 msgid ""
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 msgstr ""
+"  -r, --repository REPOSITORY   在 REPOSITORY 库中改变密码\n"
 
-#, fuzzy
-#| msgid "  -r, --system                  create a system account\n"
 msgid ""
 "  -S, --status                  report password status on the named account\n"
-msgstr "  -r, --system                  创建一个系统账户\n"
+msgstr ""
+"  -S, --status                  报告指定帐户密码的状态\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid ""
 "  -u, --unlock                  unlock the password of the named account\n"
-msgstr "  -u, --uid UID\t\t\t新账户的用户 ID\n"
+msgstr ""
+"  -u, --unlock                  解锁被指定帐户\n"
 
 msgid ""
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr ""
+"  -w, --warndays WARN_DAYS      设置过期警告天数为 WARN_DAYS\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
-msgstr "  -s, --sha-rounds\t\tSHA* 加密算法中的 SHA 旁边的数字\n"
+msgstr ""
+"  -x, --maxdays MAX_DAYS        设置到下次修改密码所须等待的最多天数\n"
+"                                为 MAX_DAYS\n"
 
 msgid "Old password: "
 msgstr "旧密码:"
@@ -1597,31 +1528,23 @@
 msgid "%s: password expiry information changed.\n"
 msgstr "%s:密码过期信息已更改。\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"用法:%s [选项] [动作]\n"
+"用法:%s [选项] [passwd]\n"
 "\n"
 "选项:\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] [action]\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] [passwd [shadow]]\n"
 "\n"
 "Options:\n"
 msgstr ""
-"用法:%s [选项] [动作]\n"
+"用法:%s [选项] [passwd [shadow]]\n"
 "\n"
 "选项:\n"
 
@@ -1813,10 +1736,9 @@
 msgid "%s: Cannot drop the controlling terminal\n"
 msgstr "%s:无法删除 %s 的内容:%s\n"
 
-#, fuzzy, c-format
-#| msgid "Cannot execute %s"
+#, c-format
 msgid "Cannot execute %s\n"
-msgstr "无法执行 %s"
+msgstr "无法执行 %s\n"
 
 msgid "No password file"
 msgstr "没有密码文件"
@@ -1859,10 +1781,9 @@
 msgid "%s: line too long in %s: %s..."
 msgstr "%s:%s 中行太长:%s..."
 
-#, fuzzy, c-format
-#| msgid "%s: rename: %s: %s"
+#, c-format
 msgid "%s: rename: %s: %s\n"
-msgstr "%s:改名:%s:%s"
+msgstr "%s:改名:%s:%s\n"
 
 #, c-format
 msgid "%s: group '%s' is a NIS group.\n"
@@ -1872,11 +1793,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s:指定了过多组(最多 %d)。\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: %s [options] LOGIN\n"
-#| "\n"
-#| "Options:\n"
+#, c-format
 msgid ""
 "Usage: %s [options] LOGIN\n"
 "       %s -D\n"
@@ -1885,6 +1802,8 @@
 "Options:\n"
 msgstr ""
 "用法:%s [选项] 登录\n"
+"      %s -D\n"
+"      %s -D [选项]\n"
 "\n"
 "选项:\n"
 
@@ -2059,23 +1978,15 @@
 "%s:警告:此主目录已经存在。\n"
 "不从 skel 目录里向其中复制任何文件。\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -f, --force                   exit successfully if the group already "
-#| "exists,\n"
-#| "                                and cancel -g if the GID is already used\n"
 msgid ""
 "  -f, --force                   force removal of files,\n"
 "                                even if not owned by user\n"
 msgstr ""
-"  -f, --force\t\t如果组已经存在则成功退出\n"
-"\t\t\t并且如果 GID 已经存在则取消 -g\n"
+"  -f, --force                   即使不属于此用户,也强制删除文件\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -r, --reset                   reset the counters of login failures\n"
 msgid "  -r, --remove                  remove home directory and mail spool\n"
-msgstr "  -r, --reset\t\t重置登陆失败计数\n"
+msgstr ""
+"  -r, --remove                  删除主目录和邮箱\n"
 
 #, fuzzy, c-format
 #| msgid "%s: cannot remove the primary group of user '%s'\n"
@@ -2136,91 +2047,73 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s:删除目录 %s 时出错\n"
 
-#, fuzzy
-#| msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
 msgid "  -c, --comment COMMENT         new value of the GECOS field\n"
-msgstr "  -c, --comment COMMENT         新账户的 GECOS 字段\n"
+msgstr ""
+"  -c, --comment 注释            GECOS 字段的新值\n"
 
-#, fuzzy
-#| msgid "  -d, --home-dir HOME_DIR       home directory of the new account\n"
 msgid ""
 "  -d, --home HOME_DIR           new home directory for the user account\n"
-msgstr "  -d, --home-dir HOME_DIR       新账户的主目录\n"
+msgstr ""
+"  -d, --home HOME_DIR           用户的新主目录\n"
 
-#, fuzzy
-#| msgid "  -e, --expiredate EXPIRE_DATE  expiration date of the new account\n"
 msgid ""
 "  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
-msgstr " -e, --expiredate EXPIRE_DATE  新账户的过期日期\n"
+msgstr ""
+"  -e, --expiredate EXPIRE_DATE  设定帐户过期的日期为 EXPIRE_DATE\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       change the password to this (encrypted)\n"
-#| "                                PASSWORD\n"
 msgid ""
 "  -f, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-msgstr "  -p, --password PASSWORD\t将密码更改为(加密过的) PASSWORD\n"
+msgstr ""
+"  -f, --inactive INACTIVE       过期 INACTIVE 天数后,设定密码为失效状态\n"
 
-#, fuzzy
-#| msgid "  -g, --gid GID                 use GID for the new group\n"
 msgid "  -g, --gid GROUP               force use GROUP as new primary group\n"
-msgstr "  -g, --gid GID                 为新组使用 GID\n"
+msgstr ""
+"  -g, --gid GROUP               强制使用 GROUP 为新主组\n"
 
-#, fuzzy
-#| msgid "  -M, --members USER,...        set the list of members of GROUP\n"
 msgid "  -G, --groups GROUPS           new list of supplementary GROUPS\n"
-msgstr "  -M, --members USER,...        设置组 GROUP 的成员列表\n"
+msgstr ""
+"  -G, --groups GROUPS           新的附加组列表 GROUPS\n"
 
 msgid ""
 "  -a, --append                  append the user to the supplemental GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                him/her from other groups\n"
 msgstr ""
+"  -a, --append GROUP            将用户追加至上边 -G 中提到的附加组中,\n"
+"                                并不从其它组中删除此用户\n"
 
 msgid "  -l, --login NEW_LOGIN         new value of the login name\n"
 msgstr ""
+"  -l, --login LOGIN             新的登录名称\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -L, --lock                    lock the user account\n"
-msgstr "  -u, --uid UID\t\t\t新账户的用户 ID\n"
+msgstr ""
+"  -L, --lock                    锁定用户帐号\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -b, --base-dir BASE_DIR       base directory for the home directory of "
-#| "the\n"
-#| "                                new account\n"
 msgid ""
 "  -m, --move-home               move contents of the home directory to the\n"
 "                                new location (use only with -d)\n"
-msgstr "  -b, --base-dir BASE_DIR\t新账户的主目录的基目录\n"
+msgstr ""
+"  -m, --move-home               将家目录内容移至新位置 (仅于 -d 一起使用)\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -o, --non-unique              allow to use a duplicate (non-unique) "
-#| "GID\n"
 msgid ""
 "  -o, --non-unique              allow using duplicate (non-unique) UID\n"
-msgstr "  -o, --non-unique              允许使用重复的 GID\n"
+msgstr ""
+"  -o, --non-unique              允许使用重复的(非唯一的) UID\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -p, --password PASSWORD       use this encrypted password for the new "
-#| "group\n"
 msgid ""
 "  -p, --password PASSWORD       use encrypted password for the new password\n"
-msgstr "  -p, --password PASSWORD       为新组使用此加密过的密码\n"
+msgstr ""
+"  -p, --password PASSWORD       将加密过的密码 (PASSWORD) 设为新密码\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -u, --uid UID                 new UID for the user account\n"
-msgstr "  -u, --uid UID\t\t\t新账户的用户 ID\n"
+msgstr ""
+"  -u, --uid UID                 用户帐号的新 UID\n"
 
-#, fuzzy
-#| msgid "  -u, --uid UID                 user ID of the new account\n"
 msgid "  -U, --unlock                  unlock the user account\n"
-msgstr "  -u, --uid UID\t\t\t新账户的用户 ID\n"
+msgstr ""
+"  -U, --unlock                  解锁用户帐号\n"
 
 msgid ""
 "  -Z, --selinux-user            new SELinux user mapping for the user "




More information about the Pkg-shadow-commits mailing list