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

nekral-guest at alioth.debian.org nekral-guest at alioth.debian.org
Sat Nov 24 14:02:11 UTC 2007


Author: nekral-guest
Date: 2007-11-24 14:02:10 +0000 (Sat, 24 Nov 2007)
New Revision: 1459

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/po/bs.po
   upstream/trunk/po/ca.po
   upstream/trunk/po/cs.po
   upstream/trunk/po/da.po
   upstream/trunk/po/de.po
   upstream/trunk/po/dz.po
   upstream/trunk/po/el.po
   upstream/trunk/po/es.po
   upstream/trunk/po/eu.po
   upstream/trunk/po/fi.po
   upstream/trunk/po/fr.po
   upstream/trunk/po/gl.po
   upstream/trunk/po/he.po
   upstream/trunk/po/hu.po
   upstream/trunk/po/id.po
   upstream/trunk/po/it.po
   upstream/trunk/po/ja.po
   upstream/trunk/po/km.po
   upstream/trunk/po/ko.po
   upstream/trunk/po/nb.po
   upstream/trunk/po/ne.po
   upstream/trunk/po/nl.po
   upstream/trunk/po/nn.po
   upstream/trunk/po/pl.po
   upstream/trunk/po/pt.po
   upstream/trunk/po/pt_BR.po
   upstream/trunk/po/ro.po
   upstream/trunk/po/ru.po
   upstream/trunk/po/sk.po
   upstream/trunk/po/sq.po
   upstream/trunk/po/sv.po
   upstream/trunk/po/tl.po
   upstream/trunk/po/tr.po
   upstream/trunk/po/uk.po
   upstream/trunk/po/vi.po
   upstream/trunk/po/zh_CN.po
   upstream/trunk/po/zh_TW.po
Log:
Run "make update-po" in the po directory.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/ChangeLog	2007-11-24 14:02:10 UTC (rev 1459)
@@ -1,5 +1,15 @@
 2007-11-24  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* po/ne.po, po/bs.po, po/cs.po, po/pt_BR.po, po/km.po, po/es.po,
+	po/eu.po, po/ko.po, po/hu.po, po/sk.po, po/vi.po, po/uk.po,
+	po/ro.po, po/sq.po, po/ru.po, po/id.po, po/nb.po, po/el.po,
+	po/gl.po, po/fr.po, po/nl.po, po/pl.po, po/nn.po, po/it.po,
+	po/dz.po, po/tl.po, po/pt.po, po/ca.po, po/da.po, po/tr.po,
+	po/sv.po, po/de.po, po/ja.po, po/zh_TW.po, po/he.po, po/fi.po,
+	po/zh_CN.po: Run "make update-po" in the po directory.
+
+2007-11-24  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* configure.in: New configure option: --with-sha-crypt enabled by
 	default. Keeping the feature enabled is safe. Disabling it permits
 	to disable the references to the SHA256 and SHA512 password

Modified: upstream/trunk/po/bs.po
===================================================================
--- upstream/trunk/po/bs.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/bs.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2004-05-09 12:03+0100\n"
 "Last-Translator: Safir Šećerović <sapphire at linux.org.ba>\n"
 "Language-Team: Bosnian <lokal at lugbih.org>\n"
@@ -17,6 +17,15 @@
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr ""
 
@@ -138,6 +147,12 @@
 msgstr "Mijenjam šifru za grupu %s\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr ""
 
@@ -421,17 +436,37 @@
 
 #, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr ""
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr ""
 
@@ -476,18 +511,6 @@
 msgstr ""
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr ""
 
@@ -598,10 +621,22 @@
 msgstr ""
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr ""
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "nepoznata grupa: %s\n"
 
 #, c-format
+msgid "%s: can't close file\n"
+msgstr ""
+
+#, c-format
+msgid "%s: can't close shadow file\n"
+msgstr ""
+
+#, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Dodajem korisnika %s grupi %s\n"
 
@@ -643,10 +678,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr ""
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr ""
 
@@ -726,10 +757,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr ""
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr ""
 
@@ -1100,17 +1127,25 @@
 msgstr "nepoznata grupa: %s\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Nova šifra:"
+msgid "Invalid password."
+msgstr "Stara šifra:"
 
 #, c-format
 msgid "too many groups\n"
 msgstr ""
 
 #, c-format
-msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
 msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr ""
@@ -1189,6 +1224,12 @@
 
 #, c-format
 msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+
+#, c-format
+msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
 "Please use a combination of upper and lower case letters and numbers.\n"
 msgstr ""
@@ -1225,6 +1266,12 @@
 msgstr ""
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr ""
 
@@ -1466,6 +1513,14 @@
 msgstr ""
 
 #, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr ""
+
+#, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr ""
 
@@ -1611,6 +1666,10 @@
 msgstr ""
 
 #, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr ""
+
+#, c-format
 msgid "%s: cannot open group file\n"
 msgstr ""
 
@@ -1683,14 +1742,10 @@
 msgstr ""
 
 #, c-format
-msgid "%s: out of memory in update_group\n"
+msgid "%s: error adding new shadow group entry\n"
 msgstr ""
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr ""
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr ""
 
@@ -1699,7 +1754,7 @@
 msgstr ""
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
 #, c-format
@@ -1777,5 +1832,9 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Nova šifra:"
+
 #~ msgid "Sorry."
 #~ msgstr "Žalim."

Modified: upstream/trunk/po/ca.po
===================================================================
--- upstream/trunk/po/ca.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/ca.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-07-19 04:40+0300\n"
 "Last-Translator: Guillem Jover <guillem at debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -15,6 +15,15 @@
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "No s'ha pogut reservar espai per a la informació de configuració.\n"
 
@@ -142,6 +151,12 @@
 msgstr "La contrasenya és incorrecta per a «%s».\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "No es pot canviar el directori a «%s»\n"
 
@@ -446,16 +461,16 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "No s'ha pogut desblocar el fitxer de contrasenyes.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
 "Forma d'ús: chpasswd [opcions]\n"
 "\n"
@@ -464,9 +479,28 @@
 "  -h, --help\t\tmostra aquest missatge d'ajuda i acaba\n"
 "  -m, --md5\t\tusa xifrat MD5 en comptes de DES quan les contrasenyes\n"
 "\t\t\tproveïdes no estan xifrades\n"
-"\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: l'argument numèric «%s» no és vàlid\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: el senyalador «-a» NOMÉS es permet amb el senyalador «-G»\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: no es pot blocar el fitxer de grups\n"
 
@@ -512,25 +546,6 @@
 msgstr "%s: s'ha produït un error en actualitzar el fitxer de contrasenyes\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Forma d'ús: chpasswd [opcions]\n"
-"\n"
-"Opcions:\n"
-"  -e, --encrypted\tles contrasenyes proveïdes estan xifrades\n"
-"  -h, --help\t\tmostra aquest missatge d'ajuda i acaba\n"
-"  -m, --md5\t\tusa xifrat MD5 en comptes de DES quan les contrasenyes\n"
-"\t\t\tproveïdes no estan xifrades\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: no es pot blocar el fitxer de contrasenyes\n"
 
@@ -662,9 +677,21 @@
 msgstr "Qui sou?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: no es pot obrir el fitxer\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "El grup és desconegut: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: no es pot obrir el fitxer\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: no s'ha pogut obrir el fitxer de contrasenyes ombra\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "S'està afegint l'usuari %s al grup %s\n"
@@ -707,10 +734,6 @@
 msgstr "%s: no es pot obtenir el bloqueig del fitxer de contrasenyes ombra\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: no es pot obrir el fitxer\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: no es pot actualitzar l'entrada\n"
 
@@ -802,10 +825,6 @@
 msgstr "%s: no es pot obrir el fitxer de grup ombra\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: l'argument numèric «%s» no és vàlid\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: «-K» requereix CLAU=VALOR\n"
 
@@ -1205,17 +1224,25 @@
 msgstr "El GID és desconegut: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "No hi ha fitxer de contrasenyes\n"
+msgid "Invalid password."
+msgstr "Contrasenya antiga: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "hi ha massa grups\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Forma d'ús: %s [entrada]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: no es pot blocar «/etc/passwd».\n"
@@ -1317,6 +1344,15 @@
 msgid "Old password: "
 msgstr "Contrasenya antiga: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Introduïu la nova contrasenya (un mínim de %d i un màxim de %d caràcters)\n"
+"Si us plau feu servir una combinació de lletres majúscules i minúscules i\n"
+"números.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1358,6 +1394,12 @@
 msgstr "%s: sense memòria\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: el repositori %s no està suportat\n"
 
@@ -1644,6 +1686,14 @@
 "  -u, --uid UID\t\t\tforça l'ús de UID per al nou compte d'usuari\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: sense memòria a update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: sense memòria a update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: el UID %u no és únic\n"
@@ -1808,6 +1858,10 @@
 "%s: no es pot eliminar el grup %s, que és el grup primari per un altre "
 "usuari.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: s'ha produït un error en actualitzar l'entrada de grup\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: no es pot obrir el fitxer de grups\n"
@@ -1908,15 +1962,11 @@
 "  -U, --unlock\t\t\tdesbloca el compte d'usuari\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: sense memòria a update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: s'ha produït un error en afegir la nova entrada de grup\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: sense memòria a update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: no s'han especificat senyaladors\n"
 
@@ -1925,8 +1975,8 @@
 msgstr "%s: les contrasenyes ombra són requerides per a «-e» i «-f»\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: el senyalador «-a» NOMÉS es permet amb el senyalador «-G»\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -2015,6 +2065,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: no es pot restaurar %s: %s (els seus canvis estan a %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Forma d'ús: chpasswd [opcions]\n"
+#~ "\n"
+#~ "Opcions:\n"
+#~ "  -e, --encrypted\tles contrasenyes proveïdes estan xifrades\n"
+#~ "  -h, --help\t\tmostra aquest missatge d'ajuda i acaba\n"
+#~ "  -m, --md5\t\tusa xifrat MD5 en comptes de DES quan les contrasenyes\n"
+#~ "\t\t\tproveïdes no estan xifrades\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "No hi ha fitxer de contrasenyes\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Forma d'ús: %s [entrada]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Disculpeu.\n"
 

Modified: upstream/trunk/po/cs.po
===================================================================
--- upstream/trunk/po/cs.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/cs.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-07-19 13:49+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -17,6 +17,15 @@
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Nemohu alokovat dostatek místa pro konfigurační údaje.\n"
 
@@ -146,6 +155,12 @@
 msgstr "Chybné heslo pro %s.\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Nelze přejít do \"%s\"\n"
 
@@ -447,18 +462,18 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Soubor s hesly nelze odemknout.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Použití: chgpasswd [volby]\n"
+"Použití: chpasswd [volby]\n"
 "\n"
 "Volby:\n"
 "  -e, --encrypted\tzadaná hesla jsou zašifrovaná\n"
@@ -467,7 +482,27 @@
 "\t\t\tpoužije místo DES algoritmus MD5\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: chybný numerický argument \"%s\"\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: přepínač -a je povolen POUZE s přepínačem -G\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: soubor se skupinami nelze zamknout\n"
 
@@ -512,26 +547,6 @@
 msgstr "%s: chyba při aktualizaci souboru s hesly\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Použití: chpasswd [volby]\n"
-"\n"
-"Volby:\n"
-"  -e, --encrypted\tzadaná hesla jsou zašifrovaná\n"
-"  -h, --help\t\tzobrazí tuto nápovědu a skončí\n"
-"  -m, --md5\t\tpokud zadaná hesla nejsou zašifrovaná,\n"
-"\t\t\tpoužije místo DES algoritmus MD5\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: soubor s hesly nelze zamknout\n"
 
@@ -661,9 +676,21 @@
 msgstr "Kdo jste?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: nelze otevřít soubor\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "neznámá skupina %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: nelze otevřít soubor\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: soubor se stínovými hesly nelze otevřít\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Přidávám uživatele %s do skupiny %s\n"
@@ -706,10 +733,6 @@
 msgstr "%s: nelze získat zámek pro soubor se stínovými hesly\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: nelze otevřít soubor\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: nelze aktualizovat položku\n"
 
@@ -800,10 +823,6 @@
 msgstr "%s: soubor se stínovými skupinami nelze otevřít\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: chybný numerický argument \"%s\"\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: parametr -K vyžaduje argument typu KLÍČ=HODNOTA\n"
 
@@ -1202,17 +1221,25 @@
 msgstr "neznámé GID: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Soubor s hesly neexistuje\n"
+msgid "Invalid password."
+msgstr "Staré heslo: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "příliš mnoho skupin\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Použití: %s [vstup]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: soubor /etc/passwd nelze zamknout.\n"
@@ -1311,6 +1338,14 @@
 msgid "Old password: "
 msgstr "Staré heslo: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Zadejte nové heslo (počet znaků v intervalu %d až %d).\n"
+"Použijte kombinaci velkých a malých písmen s číslicemi.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1351,6 +1386,12 @@
 msgstr "%s: došla paměť\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: úložna %s není podporována\n"
 
@@ -1634,6 +1675,14 @@
 "  -u, --uid UID\t\t\tvynutí použití tohoto UID pro nový účet\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s nedostatek paměti v update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: nedostatek paměti v update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u není jedinečné\n"
@@ -1794,6 +1843,10 @@
 "%s: Nemohu odstranit skupinu %s, která je primární skupinou jiného "
 "uživatele.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: položku souboru se skupinami nelze aktualizovat\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: soubor se skupinami nelze otevřít\n"
@@ -1890,15 +1943,11 @@
 "  -U, --unlock\t\t\todemkne uživatelský účet\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s nedostatek paměti v update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: chyba při přidávání položky souboru se skupinami\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: nedostatek paměti v update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: žádné přepínače\n"
 
@@ -1907,8 +1956,8 @@
 msgstr "%s: přepínače -e a -f vyžadují stínová hesla\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: přepínač -a je povolen POUZE s přepínačem -G\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -1996,6 +2045,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: %s nelze obnovit: %s (změny jsou v %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Použití: chgpasswd [volby]\n"
+#~ "\n"
+#~ "Volby:\n"
+#~ "  -e, --encrypted\tzadaná hesla jsou zašifrovaná\n"
+#~ "  -h, --help\t\tzobrazí tuto nápovědu a skončí\n"
+#~ "  -m, --md5\t\tpokud zadaná hesla nejsou zašifrovaná,\n"
+#~ "\t\t\tpoužije místo DES algoritmus MD5\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Soubor s hesly neexistuje\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Použití: %s [vstup]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Lituji.\n"
 

Modified: upstream/trunk/po/da.po
===================================================================
--- upstream/trunk/po/da.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/da.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-07-18 21:31+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
 "Language-Team: Danish\n"
@@ -19,6 +19,15 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Kunne ikke frigøre plads til opsætningsoplysninger.\n"
 
@@ -144,6 +153,12 @@
 msgstr "Ugyldig adgangskode for %s.\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Kunne ikke skifte mappe til '%s'\n"
 
@@ -444,18 +459,18 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Kan ikke låse adgangskodefilen op.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Brug: chgpasswd [tilvalg]\n"
+"Brug: chpasswd [tilvalg]\n"
 "\n"
 "Tilvalg:\n"
 "  -e, --encrypted\tde angivne adgangskoder er krypterede\n"
@@ -464,7 +479,27 @@
 "\t\t\tadgangskoder ikke er krypterede\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: ugyldigt numerisk parameter '%s'\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: flaget -a er KUN tilladt sammen med -G\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: kan ikke låse gruppefilen\n"
 
@@ -509,26 +544,6 @@
 msgstr "%s: fejl under opdatering af adgangskodefil\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Brug: chpasswd [tilvalg]\n"
-"\n"
-"Tilvalg:\n"
-"  -e, --encrypted\tde angivne adgangskoder er krypterede\n"
-"  -h, --help\t\tvis denne hjælpetekst og afslut\n"
-"  -m, --md5\t\tbrug MD5-kryptering i stedet for DES, når de angivne\n"
-"\t\t\tadgangskoder ikke er krypterede\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: kan ikke låse adgangskodefil\n"
 
@@ -661,9 +676,21 @@
 msgstr "Hvem er du?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: kan ikke åbne fil\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "ukendt gruppe: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: kan ikke åbne fil\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: Kan ikke åbne skyggefilen\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Tilføjer brugeren %s til gruppen %s\n"
@@ -706,10 +733,6 @@
 msgstr "%s: Kan ikke opnå skyggelås\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: kan ikke åbne fil\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: kan ikke opdatere linje\n"
 
@@ -800,10 +823,6 @@
 msgstr "%s: kan ikke åbne skyggegruppefil\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: ugyldigt numerisk parameter '%s'\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K kræver NAVN=VÆRDI\n"
 
@@ -1203,17 +1222,25 @@
 msgstr "ukendt GID: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Ingen adgangskodefil\n"
+msgid "Invalid password."
+msgstr "Gammel adgangskode: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "for mange grupper\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Brug: %s [inddata]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: kan ikke låse /etc/passwd.\n"
@@ -1311,6 +1338,14 @@
 msgid "Old password: "
 msgstr "Gammel adgangskode: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Angiv ny adgangskode (mindst %d, højst %d tegn)\n"
+"Brug en kombination af små og store bogstaver samt tal.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1351,6 +1386,12 @@
 msgstr "%s: hukommelse opbrugt\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: samlingen %s understøttes ikke\n"
 
@@ -1630,6 +1671,14 @@
 "\t\t\t\tbrugerkonto\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: løbet tør for hukommelse i update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: løbet tør for hukommelse i update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u er ikke unikt\n"
@@ -1790,6 +1839,10 @@
 msgstr ""
 "%s: Kan ikke fjerne gruppen %s, som er primærgruppe for en anden bruger.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: fejl under opdatering af gruppelinje\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: kan ikke åbne gruppefilen\n"
@@ -1886,15 +1939,11 @@
 "  -U, --unlock\t\t\tfjern lås fra brugerkontoen\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: løbet tør for hukommelse i update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: fejl under tilføjelse af gruppelinje\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: løbet tør for hukommelse i update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: ingen flag angivet\n"
 
@@ -1903,8 +1952,8 @@
 msgstr "%s: skyggeadgangskoder kræves for e og -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: flaget -a er KUN tilladt sammen med -G\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -1992,6 +2041,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: kunne ikke genskabe %s: %s (dine ændringer er i %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Brug: chgpasswd [tilvalg]\n"
+#~ "\n"
+#~ "Tilvalg:\n"
+#~ "  -e, --encrypted\tde angivne adgangskoder er krypterede\n"
+#~ "  -h, --help\t\tvis denne hjælpetekst og afslut\n"
+#~ "  -m, --md5\t\tbrug MD5-kryptering i stedet for DES, når de angivne\n"
+#~ "\t\t\tadgangskoder ikke er krypterede\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Ingen adgangskodefil\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Brug: %s [inddata]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Beklager.\n"
 

Modified: upstream/trunk/po/de.po
===================================================================
--- upstream/trunk/po/de.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/de.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-06-23 21:03+0200\n"
 "Last-Translator: Holger Wansing <linux at wansing-online.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -18,6 +18,15 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Kann keinen Speicherplatz für Konfigurationsinformationen zuweisen.\n"
 
@@ -144,6 +153,12 @@
 msgstr "Falsches Kennwort für %s.\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Kann nicht in das Verzeichnis »%s« wechseln\n"
 
@@ -446,18 +461,18 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Kann die Kennwortdatei nicht entsperren.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Aufruf: chgpasswd [Optionen]\n"
+"Aufruf: chpasswd [Optionen]\n"
 "\n"
 "Optionen:\n"
 "  -e, --encrypted\tAngegebene Kennwörter sind verschlüsselt\n"
@@ -466,7 +481,27 @@
 "\t\t\tdie angegebenen Kennwörter nicht verschlüsselt sind\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: Ungültiges numerisches Argument »%s«\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: -a ist NUR zusammen mit -G erlaubt\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: Kann group-Datei nicht sperren\n"
 
@@ -511,26 +546,6 @@
 msgstr "%s: Fehler beim Aktualisieren der Kennwortdatei\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Aufruf: chpasswd [Optionen]\n"
-"\n"
-"Optionen:\n"
-"  -e, --encrypted\tAngegebene Kennwörter sind verschlüsselt\n"
-"  -h, --help\t\tDiese Hilfe anzeigen, sonst nichts\n"
-"  -m, --md5\t\tMD5-Verschlüsselung statt DES verwenden, wenn\n"
-"\t\t\tdie angegebenen Kennwörter nicht verschlüsselt sind\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: kann Kennwortdatei nicht sperren\n"
 
@@ -664,9 +679,21 @@
 msgstr "Wer sind Sie?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: Kann Datei nicht öffnen\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "Unbekannte Gruppe: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: Kann Datei nicht öffnen\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: Kann die shadow-Datei nicht öffnen\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Füge Benutzer %s zu Gruppe %s hinzu\n"
@@ -709,10 +736,6 @@
 msgstr "%s: Sperre für shadow nicht möglich\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: Kann Datei nicht öffnen\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: Eintrag kann nicht aktualisiert werden\n"
 
@@ -802,10 +825,6 @@
 msgstr "%s: Kann Shadow-group-Datei nicht öffnen\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: Ungültiges numerisches Argument »%s«\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K benötigt KEY=WERT\n"
 
@@ -1204,17 +1223,25 @@
 msgstr "Unbekannte GID: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Keine Kennwortdatei\n"
+msgid "Invalid password."
+msgstr "Altes Kennwort: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "zu viele Gruppen\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Aufruf: %s [Eingabe]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: Kann /etc/passwd nicht sperren.\n"
@@ -1313,6 +1340,15 @@
 msgid "Old password: "
 msgstr "Altes Kennwort: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Geben Sie das neue Kennwort ein (mindestens %d, höchstens %d Zeichen).\n"
+"Bitte benutzen Sie eine Kombination aus Großbuchstaben, Kleinbuchstaben\n"
+"und Ziffern.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1355,6 +1391,12 @@
 msgstr "%s: Speicher erschöpft\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: Repository %s nicht unterstützt\n"
 
@@ -1637,6 +1679,14 @@
 "  -u, --uid UID\t\t\tLegt eine bestimmte UID fest\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: Zu wenig Speicher in update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: Zu wenig Speicher in update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u ist nicht einmalig\n"
@@ -1800,6 +1850,10 @@
 "%s: Kann Gruppe %s nicht entfernen; sie ist die primäre Gruppe eines anderen "
 "Benutzers.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: Fehler beim Aktualisieren des Gruppeneintrags\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: Kann group-Datei nicht öffnen\n"
@@ -1897,15 +1951,11 @@
 "  -U, --unlock\t\t\tDas Benutzerkonto entsperren\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: Zu wenig Speicher in update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: Fehler beim Hinzufügen eines neuen Gruppeneintrags\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: Zu wenig Speicher in update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: Keine Optionen angegeben\n"
 
@@ -1914,8 +1964,8 @@
 msgstr "%s: Shadow-Kennwörter für -e und -f erforderlich\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: -a ist NUR zusammen mit -G erlaubt\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -2005,6 +2055,32 @@
 "%s: Wiederherstellung von %s fehlgeschlagen: %s\n"
 "(Ihre Änderungen befinden sich in %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Aufruf: chgpasswd [Optionen]\n"
+#~ "\n"
+#~ "Optionen:\n"
+#~ "  -e, --encrypted\tAngegebene Kennwörter sind verschlüsselt\n"
+#~ "  -h, --help\t\tDiese Hilfe anzeigen, sonst nichts\n"
+#~ "  -m, --md5\t\tMD5-Verschlüsselung statt DES verwenden, wenn\n"
+#~ "\t\t\tdie angegebenen Kennwörter nicht verschlüsselt sind\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Keine Kennwortdatei\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Aufruf: %s [Eingabe]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr " \n"
 

Modified: upstream/trunk/po/dz.po
===================================================================
--- upstream/trunk/po/dz.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/dz.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-06-01 15:28+0530\n"
 "Last-Translator: Jurmey Rabgay <jur_gay at yahoo.com>\n"
 "Language-Team: dzongkha <pgeyleg at dit.gov.bt>\n"
@@ -20,6 +20,15 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "རིམ་སྒྲིག་བརྡ་དོན་གྱི་དོན་ལུ་ བར་སྟོང་སྤྲོད་མ་ཚུགས།\n"
 
@@ -147,6 +156,12 @@
 msgstr "%s གི་དོན་ལུ་ བདེན་མེད་ཀྱི་ཆོག་ཡིག\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "'%s'ལུ་ སི་ཌི་འབད་མ་ཚུགས་\n"
 
@@ -448,27 +463,47 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "ཆོག་ཡིག་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
+msgstr ""
+"ལག་ལེན་: chpasswd [གདམ་ཁ་ཚུ་]\n"
 "\n"
-msgstr ""
-"ལག་ལེན་:chgpasswd [གདམ་ཁ་ཚུ་]\n"
 "གདམ་ཁ་ཚུ་:\n"
-"  -e, --encrypted\t བཀྲམ་སྤེལ་འབད་ཡོད་པའི་ཆོག་ཡིག་ཚུ་ གསང་བ་བཟོ་ཡོདཔ།\n"
-"  -h, --help\t\t གྲོགས་རམ་འཕྲིན་དོན་འདི་ མཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
-"  -m, --md5\t\t བཀྲམ་སྟོན་\n"
-"འབད་ཡོད་པའི་\t\t\t ཆོག་ཡིག་ཚུ་གསང་བཟོས་མེན་པ་ཅིན་ ཌི་ཨི་ཨེསི་གི་ཚབ་ལུ་ ཨེམ་ཌི་ ༥ གསང་ ལག་ལེན་"
-"འཐབ།\n"
+"  -e, --encrypted\t བཀྲམ་སྤེལ་འབད་ཡོད་པའི་ཆོག་ཡིག་ཚུ་ གསང་བཟོས་མ་འབད་ཡོདཔ།\n"
+"  -h, --help\t\t གྲོགས་རམ་འཕྲིན་དོན་འདི་ བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
+"  -m, --md5\t\t བཀྲམ་སྤེལ་འབད་ཡོད་པའི་\t\t\tཆོག་ཡིག་ཚུ་ གསང་བཟོས་མ་ཡིན་པའི་སྐབས་ལུ་ ཌི་ཨི་"
+"ཨེསི་གི་ཚབ་ལུ་ ཨེབ་ཌི་ ༥ གསང་བཟོ་ ལག་ལེན་འཐབ།\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: ནུས་མེད་ཨང་གྲངས་སྒྲུབ་རྟགས་ '%s'\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: -a ཟུར་རྟགས་འདི་ -Gཟུར་རྟགས་དང་གཅིག་ཁར་རྐྱངམ་ཅིག་ཆོག\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
 
@@ -513,26 +548,6 @@
 msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་དུས་མཐུན་བཟོ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"ལག་ལེན་: chpasswd [གདམ་ཁ་ཚུ་]\n"
-"\n"
-"གདམ་ཁ་ཚུ་:\n"
-"  -e, --encrypted\t བཀྲམ་སྤེལ་འབད་ཡོད་པའི་ཆོག་ཡིག་ཚུ་ གསང་བཟོས་མ་འབད་ཡོདཔ།\n"
-"  -h, --help\t\t གྲོགས་རམ་འཕྲིན་དོན་འདི་ བཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
-"  -m, --md5\t\t བཀྲམ་སྤེལ་འབད་ཡོད་པའི་\t\t\tཆོག་ཡིག་ཚུ་ གསང་བཟོས་མ་ཡིན་པའི་སྐབས་ལུ་ ཌི་ཨི་"
-"ཨེསི་གི་ཚབ་ལུ་ ཨེབ་ཌི་ ༥ གསང་བཟོ་ ལག་ལེན་འཐབ།\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
 
@@ -666,9 +681,21 @@
 msgstr "ཁྱོད་ག་སྨོ?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: ཡིག་སྣོད་ཁ་ཕྱེ་མི་ཚུགས།\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "མ་ཤེས་པའི་སྡེ་ཚན་:%s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: ཡིག་སྣོད་ཁ་ཕྱེ་མི་ཚུགས།\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "སྡེ་ཚན་ %sལུ་ ལག་ལེན་པ་ %sཁ་སྐོང་འབད་དོ།\n"
@@ -711,10 +738,6 @@
 msgstr "%s: གྱིབ་མ་ལྡེ་མིག་ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: ཡིག་སྣོད་ཁ་ཕྱེ་མི་ཚུགས།\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: ཐོ་བཀོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
 
@@ -806,10 +829,6 @@
 msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: ནུས་མེད་ཨང་གྲངས་སྒྲུབ་རྟགས་ '%s'\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K གིས་ ལྡེ་མིག་=བེ་ལུ་ དགོཔ་ཨིན།\n"
 
@@ -1212,17 +1231,25 @@
 msgstr "མ་ཤེས་པའི་ ཇི་ཨའི་ཌི་:%lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "ཆོག་ཡིག་ཡིག་སྣོད་མེད།\n"
+msgid "Invalid password."
+msgstr "ཆོག་ཡིག་རྙིངམ་:"
 
 #, c-format
 msgid "too many groups\n"
 msgstr "སྡེ་ཚན་མང་དྲགས་པ།\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "ལག་ལེན་: %s [ཨིན་པུཊི་]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: /etc/passwd ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
@@ -1320,6 +1347,12 @@
 msgid "Old password: "
 msgstr "ཆོག་ཡིག་རྙིངམ་:"
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr "ཆོག་ཡིག་གསརཔ་བཙུགས་(%d གི་ཉུང་མཐའ་ %dཡིག་འབྲུའི་མང་མཐའ་)།\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1358,6 +1391,12 @@
 msgstr "%s: དྲན་ཚད་ལས་བརྒལ་བ།\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: མཛོད་གནས་ %sའདི་ རྒྱབ་སྐྱོར་མ་འབད་བས།\n"
 
@@ -1644,6 +1683,14 @@
 "འཐབ།\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: དུས་མཐུན་སྡེ་ཚན་ནང་ལུ་ དྲན་ཚད་ལས་བརྒལ་བ།\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: དུས་མཐུན་gshadowནང་ལུ་ དྲན་ཚད་ལས་བརྒལ་བ།\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: ཡུ་ཨའི་ཌི་ %uའདི་ ཐུན་མོང་མེན།\n"
@@ -1803,6 +1850,10 @@
 msgstr ""
 "%s: ལག་ལེན་པ་གཞན་གྱི་དོན་ལུ་ གཞི་རིམ་སྡེ་ཚན་ཅིག་ཨིན་མི་སྡེ་ཚན་ %sའདི་ རྩ་བསྐྲད་གཏང་མི་ཚུགས།\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: སྡེ་ཚན་ཐོ་བཀོད་དུས་མཐུན་བཟོ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
@@ -1899,15 +1950,11 @@
 "  -U, --unlock\t\t\t  ལག་ལེན་པའི་རྩིས་ཐོ་ ལྡེ་མིག་ཕྱེ།\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: དུས་མཐུན་སྡེ་ཚན་ནང་ལུ་ དྲན་ཚད་ལས་བརྒལ་བ།\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: སྡེ་ཚན་ཐོ་བཀོད་གསརཔ་ཁ་སྐོང་འབད་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: དུས་མཐུན་gshadowནང་ལུ་ དྲན་ཚད་ལས་བརྒལ་བ།\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: ཟུར་རྟགས་ཚུ་གྲ་སྒྲིག་མིན་འདུག\n"
 
@@ -1916,8 +1963,8 @@
 msgstr "%s: -e aདང་ -f གཉིས་ལུ་དངོས་མཁོ་ཡོད་པའི་གྱིབ་མའི་ཆོག་ཡིག་ཚུ།\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: -a ཟུར་རྟགས་འདི་ -Gཟུར་རྟགས་དང་གཅིག་ཁར་རྐྱངམ་ཅིག་ཆོག\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -2006,6 +2053,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: %sསོར་ཆུད་འབད་མ་ཚུགས་: %s (ཁྱོད་ཀྱི་བསྒྱུར་བཅོས་ཚུ་ %sནང་ཨིན་)།\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "ལག་ལེན་:chgpasswd [གདམ་ཁ་ཚུ་]\n"
+#~ "གདམ་ཁ་ཚུ་:\n"
+#~ "  -e, --encrypted\t བཀྲམ་སྤེལ་འབད་ཡོད་པའི་ཆོག་ཡིག་ཚུ་ གསང་བ་བཟོ་ཡོདཔ།\n"
+#~ "  -h, --help\t\t གྲོགས་རམ་འཕྲིན་དོན་འདི་ མཀྲམ་སྟོན་འབད་ཞིནམ་ལས་ ཕྱིར་འཐོན་འབད།\n"
+#~ "  -m, --md5\t\t བཀྲམ་སྟོན་\n"
+#~ "འབད་ཡོད་པའི་\t\t\t ཆོག་ཡིག་ཚུ་གསང་བཟོས་མེན་པ་ཅིན་ ཌི་ཨི་ཨེསི་གི་ཚབ་ལུ་ ཨེམ་ཌི་ ༥ གསང་ ལག་"
+#~ "ལེན་འཐབ།\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "ཆོག་ཡིག་ཡིག་སྣོད་མེད།\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "ལག་ལེན་: %s [ཨིན་པུཊི་]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "དགོངསམ་མ་ཁྲེལ།\n"
 

Modified: upstream/trunk/po/el.po
===================================================================
--- upstream/trunk/po/el.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/el.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: shadow_po_el\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-01-18 16:16+0200\n"
 "Last-Translator: Konstantinos Margaritis <markos at debian.org>\n"
 "Language-Team: Greek <debian-l10n-greek at lists.debian.org>\n"
@@ -20,6 +20,15 @@
 "X-Generator: KBabel 1.10.2\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Αδυναμία δέσμευσης χώρου για πληροφορίες διαμόρφωσης.\n"
 
@@ -145,6 +154,12 @@
 msgid "Incorrect password for %s.\n"
 msgstr "Εσφαλμένο συνθηματικό για %s.\n"
 
+#, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Αδυναμία αλλαγής καταλόγου στον \"%s\"\n"
@@ -453,14 +468,14 @@
 
 #, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
 "Χρήση: chpasswd [options]\n"
 "\n"
@@ -471,7 +486,27 @@
 "\t\t\tσυνθηματικά δεν είναι κρυπτογραφημένα\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: Μη έγκυρη αριθμητική παράμετρος `%s'\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: -επιτρέπεται ΜΟΝΟ μια σημαία με τη -G flag\n"
+
 #, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: αδυναμία κλειδώματος του αρχείου ομάδων\n"
 
@@ -517,26 +552,6 @@
 msgstr "%s: Σφάλμα κατά την ανανέωση καταχωρήσεων στο αρχείο συνθηματικών\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Χρήση: chpasswd [options]\n"
-"\n"
-"Επιλογές:\n"
-"  -e, --encrypted\tτα παρεχόμενα συνθηματικά είναι κρυπτογραφημένα\n"
-"  -h, --help\t\tπροβολή αυτού του μηνύματος βοήθειας και έξοδος\n"
-"  -m, --md5\t\tχρήση κρυπτογράφησης MD5 αντί για DES όταν τα παρεχόμενα\n"
-"\t\t\tσυνθηματικά δεν είναι κρυπτογραφημένα\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: αδυναμία κλειδώματος του αρχείου συνθηματικών\n"
 
@@ -665,9 +680,21 @@
 msgstr "Ποιος είσαι;\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: αδυναμία ανοίγματος του αρχείου\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "άγνωστη ομάδα: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: αδυναμία ανοίγματος του αρχείου\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: αδυναμία ανοίγματος του αρχείου σκιωδών συνθηματικών\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Προσθήκη του χρήστη %s στην ομάδα %s\n"
@@ -711,10 +738,6 @@
 "%s: Αδυναμία δημιουργίας κλειδώματος του αρχείου σκιωδών συνθηματικών\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: αδυναμία ανοίγματος του αρχείου\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: αδυναμία ανανέωσης καταχώρησης\n"
 
@@ -805,10 +828,6 @@
 msgid "%s: unable to open shadow group file\n"
 msgstr "%s: Αδυναμία ανοίγματος του αρχείου σκιωδών συνθηματικών ομάδων\n"
 
-#, fuzzy, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: Μη έγκυρη αριθμητική παράμετρος `%s'\n"
-
 #, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K απαιτεί KEY=VALUE\n"
@@ -1221,17 +1240,25 @@
 msgstr "άγνωστο GID: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Δεν υπάρχει αρχείο συνθηματικών\n"
+msgid "Invalid password."
+msgstr "Παλιό Συνθηματικό: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "πάρα πολλές ομάδες\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Χρήση: %s [είσοδος]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: αδυναμία κλειδώματος του /etc/passwd.\n"
@@ -1334,6 +1361,15 @@
 msgid "Old password: "
 msgstr "Παλιό Συνθηματικό: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Εισάγετε το νέο συνθηματικό (ελάχιστο %d, μέγιστο %d χαρακτήρες)\n"
+"Παρακαλώ χρησιμοποιήστε ένα συνδυασμό από κεφαλαία και μικρά γράμματα\n"
+"καθώς και αριθμούς.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1375,6 +1411,12 @@
 msgstr "%s: δεν υπάρχει ελεύθερη μνήμη\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: η αποθήκη %s δεν υποστηρίζεται\n"
 
@@ -1666,6 +1708,14 @@
 "\t\t\t\tχρήστη\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: δεν υπάρχει ελεύθερη μνήμη στο update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s:  στο update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: Το UID %u δεν είναι μοναδικό\n"
@@ -1822,6 +1872,10 @@
 "%s: Αδυναμία αφαίρεσης της ομάδας %s ή οποία είναι πρωταρχική ομάδα για άλλο "
 "χρήστη.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: Σφάλμα κατά την ανανέωση καταχώρισης ομάδας\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: αδυναμία ανοίγματος αρχείου ομάδων\n"
@@ -1924,15 +1978,11 @@
 "  -U, --unlock\t\t\tξεκλείδωμα του λογαριασμού χρήστη\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: δεν υπάρχει ελεύθερη μνήμη στο update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: Σφάλμα κατά την προσθήκη νέας καταχώρησης στο αρχείο ομάδων\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s:  στο update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: Δεν δόθηκαν ενδείξεις\n"
 
@@ -1941,8 +1991,8 @@
 msgstr "%s: σκιώδη συνθηματικά απαιτούνται για το -e και -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: -επιτρέπεται ΜΟΝΟ μια σημαία με τη -G flag\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -2033,6 +2083,33 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: αδυναμία επαναφοράς %s: %s (οι αλλαγές είναι στο %s)\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Χρήση: chpasswd [options]\n"
+#~ "\n"
+#~ "Επιλογές:\n"
+#~ "  -e, --encrypted\tτα παρεχόμενα συνθηματικά είναι κρυπτογραφημένα\n"
+#~ "  -h, --help\t\tπροβολή αυτού του μηνύματος βοήθειας και έξοδος\n"
+#~ "  -m, --md5\t\tχρήση κρυπτογράφησης MD5 αντί για DES όταν τα παρεχόμενα\n"
+#~ "\t\t\tσυνθηματικά δεν είναι κρυπτογραφημένα\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Δεν υπάρχει αρχείο συνθηματικών\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Χρήση: %s [είσοδος]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Λυπάμαι.\n"
 

Modified: upstream/trunk/po/es.po
===================================================================
--- upstream/trunk/po/es.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/es.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.16\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-06-04 19:59+0200\n"
 "Last-Translator: Rubén Porras Campo <nahoo at inicia.es>\n"
 "Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -16,6 +16,15 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "No pude reservar espacio para la información de configuración.\n"
 
@@ -143,6 +152,12 @@
 msgstr "Contraseña incorrecta para %s\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Incapaz de cambiar el directorio a «%s»\n"
 
@@ -446,27 +461,46 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "No se puede desbloquear el fichero de contraseñas.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Modo de uso: chgpasswd [opciones]\n"
+"Modo de uso: chpasswd [opciones]\n"
 "\n"
 "Opciones:\n"
 "  -e, --encrypted\tlas contraseñas proporcionadas están cifradas\n"
 "  -h, --help\t\tmuestra este mensaje de ayuda y termina\n"
 "  -m, --md5\t\tusa cifrado MD5 en vez de DES cuando las\n"
 "                        contraseñas proporcionadas no estén cifradas\n"
-"\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: argumento numérico inválido «%s»\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: SÓLO se puede usar la opción -a junto con la opción -G\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: no se puede bloquear el fichero de grupos\n"
 
@@ -511,25 +545,6 @@
 msgstr "%s: error actualizando el fichero de contraseñas\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Modo de uso: chpasswd [opciones]\n"
-"\n"
-"Opciones:\n"
-"  -e, --encrypted\tlas contraseñas proporcionadas están cifradas\n"
-"  -h, --help\t\tmuestra este mensaje de ayuda y termina\n"
-"  -m, --md5\t\tusa cifrado MD5 en vez de DES cuando las\n"
-"                        contraseñas proporcionadas no estén cifradas\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: no puedo bloquear el fichero de contraseñas\n"
 
@@ -666,9 +681,21 @@
 msgstr "¿Quién es?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: no se puede abrir el fichero\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "grupo desconocido: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: no se puede abrir el fichero\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: no se puede abrir el fichero de contraseñas ocultas (shadow)\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Añadiendo al usuario %s al grupo %s\n"
@@ -711,10 +738,6 @@
 msgstr "%s: no se puede obtener el bloqueo de shadow\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: no se puede abrir el fichero\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: no se puede actualizar la entrada\n"
 
@@ -806,10 +829,6 @@
 msgstr "%s: incapaz de abrir el fichero de grupos oculto (shadow)\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: argumento numérico inválido «%s»\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K requiere NOMBRE=VALOR\n"
 
@@ -1211,17 +1230,25 @@
 msgstr "GID desconocido: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "No hay fichero de contraseñas\n"
+msgid "Invalid password."
+msgstr "Contraseña antigua: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "demasiados grupos\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Modo de uso: %s [entrada]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: no se puede bloquear /etc/passwd.\n"
@@ -1322,6 +1349,14 @@
 msgid "Old password: "
 msgstr "Contraseña antigua: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Introduzca la nueva contraseña (mínimo de %d caracteres, máximo de %d)\n"
+"Por favor, use una combinación de letras mayúsculas, minúsculas y números.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1362,6 +1397,12 @@
 msgstr "%s: sin memoria\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: repositorio %s no soportado\n"
 
@@ -1649,6 +1690,14 @@
 "  -u, --uid UID\t\tforzar el uso del UID para la nueva cuenta de usuario\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: sin memoria en update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: sin memoria en update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: el UID %u no es único\n"
@@ -1811,6 +1860,10 @@
 "%s: no se puede eliminar el grupo %s, que es un prupo primario\n"
 "para otro usuario.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: error actualizando la entrada del grupo\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: no se puede abrir el fichero de grupos\n"
@@ -1914,15 +1967,11 @@
 "  -U, --unlock\t\t\tdesbloque la cuenta de usuario\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: sin memoria en update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: error añadiendo entrada nueva de grupo\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: sin memoria en update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: no se ha dado ninguna opción\n"
 
@@ -1931,8 +1980,8 @@
 msgstr "%s: se necesitan contraseñas ocultas (shadow) para -e y -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: SÓLO se puede usar la opción -a junto con la opción -G\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -2021,6 +2070,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: no se puede restaurar %s: %s (sus cambios están en %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Modo de uso: chgpasswd [opciones]\n"
+#~ "\n"
+#~ "Opciones:\n"
+#~ "  -e, --encrypted\tlas contraseñas proporcionadas están cifradas\n"
+#~ "  -h, --help\t\tmuestra este mensaje de ayuda y termina\n"
+#~ "  -m, --md5\t\tusa cifrado MD5 en vez de DES cuando las\n"
+#~ "                        contraseñas proporcionadas no estén cifradas\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "No hay fichero de contraseñas\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Modo de uso: %s [entrada]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Disculpe.\n"
 

Modified: upstream/trunk/po/eu.po
===================================================================
--- upstream/trunk/po/eu.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/eu.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-06-12 23:00+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: librezale <librezale at librezale.org>\n"
@@ -18,6 +18,15 @@
 "X-Generator: KBabel 1.11.2\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Ezin izan da lekua esleitu, konfigurazioaren informaziorako.\n"
 
@@ -145,6 +154,12 @@
 msgstr "%s(r)en pasahitz okerra.\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Ezin da '%s'-ra aldatu\n"
 
@@ -446,16 +461,16 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Ezin izan da pasahitzen fitxategia desblokeatu.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
 "Erabilera: chpasswd [aukerak]\n"
 "\n"
@@ -466,7 +481,27 @@
 "\t\t\tpasahitzak enkriptatuta ez daudenean\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s:baliogabeko zenbakizko '%s' argumentoa\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: -a bandera -G banderarekin batera bakarrik onartzen da\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: ezin da talde-fitxategia blokeatu\n"
 
@@ -511,26 +546,6 @@
 msgstr "%s: errorea pasahitzen fitxategia eguneratzean\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Erabilera: chpasswd [aukerak]\n"
-"\n"
-"Aukerak:\n"
-"  -e, .- encrypted\temandako pasahitzak enkripatzen dira\n"
-"  -h, --help\t\tlaguntzako mezu hau erakutsi eta irten egiten da\n"
-"  -m, --md5\t\terabili MD5 enkriptatze mota (DES-en ordez),\n"
-"\t\t\tpasahitzak enkriptatuta ez daudenean\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: ezin da pasahitzen fitxategia blokeatu\n"
 
@@ -665,9 +680,21 @@
 msgstr "Zer moduz zaude?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: ezin da fitxategia ireki\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "talde ezezaguna: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: ezin da fitxategia ireki\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s ezin da 'shadow' fitxategia ireki\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "%s erabiltzailea %s taldean gehitzen\n"
@@ -710,10 +737,6 @@
 msgstr "%s: ezin da 'shadow' blokeatu\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: ezin da fitxategia ireki\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: ezin da sarrera eguneratu\n"
 
@@ -804,10 +827,6 @@
 msgstr "%s: ezin da itzalpeko talde-fitxategia ireki\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s:baliogabeko zenbakizko '%s' argumentoa\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K KEY=BALIOA eskatzen du\n"
 
@@ -1212,17 +1231,25 @@
 msgstr "GID ezezaguna: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Ez dago pasahitz-fitxategirik\n"
+msgid "Invalid password."
+msgstr "Pasahitz zaharra: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "talde gehiegi\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Erabilera: %s [sarrera]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: ezin da '/etc/passwd' blokeatu.\n"
@@ -1321,6 +1348,14 @@
 msgid "Old password: "
 msgstr "Pasahitz zaharra: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Sartu pasahitz berria (gutxienez %d eta gehienez %d karaktere)\n"
+"Erabili maiuskulen, minuskulen eta zenbakien arteko konbinazioa.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1361,6 +1396,12 @@
 msgstr "%s: memoriarik ez\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: %s biltegia ez da onartzen\n"
 
@@ -1638,6 +1679,14 @@
 "\t\t\t\tsortu\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: memoriarik ez 'update_group'en\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: memoriarik ez 'update_gshadow'-en\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: %u UID-a ez da bakarra\n"
@@ -1798,6 +1847,10 @@
 "%s: ezin da %s taldea ezabatu beste erabiltzaile baten talde nagusia bait "
 "da.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: errorea taldearen sarrera eguneratzean\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: ezin da talde-fitxategia ireki\n"
@@ -1896,15 +1949,11 @@
 "  -U, --unlock\t\t\terabiltzaile kontua desblokeatu\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: memoriarik ez 'update_group'en\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: errorea talde sarrera berria gehitzean\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: memoriarik ez 'update_gshadow'-en\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: ez da banderarik eman\n"
 
@@ -1913,8 +1962,8 @@
 msgstr "%s:  -e eta -f aukerek itzalpeko pasahitzak eskatzen dute\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: -a bandera -G banderarekin batera bakarrik onartzen da\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -2002,6 +2051,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: ezin da %s leheneratu: %s (zure aldaketak %s(e)n daude)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Erabilera: chpasswd [aukerak]\n"
+#~ "\n"
+#~ "Aukerak:\n"
+#~ "  -e, .- encrypted\temandako pasahitzak enkripatzen dira\n"
+#~ "  -h, --help\t\tlaguntzako mezu hau erakutsi eta irten egiten da\n"
+#~ "  -m, --md5\t\terabili MD5 enkriptatze mota (DES-en ordez),\n"
+#~ "\t\t\tpasahitzak enkriptatuta ez daudenean\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Ez dago pasahitz-fitxategirik\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Erabilera: %s [sarrera]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Barkatu.\n"
 

Modified: upstream/trunk/po/fi.po
===================================================================
--- upstream/trunk/po/fi.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/fi.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2007-10-27 14:31+0300\n"
 "Last-Translator: Tommi Vainikainen <thv+debian at iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -16,6 +16,15 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Asetustiedoille ei voi varata tilaa.\n"
 
@@ -141,6 +150,12 @@
 msgstr "Väärä salasana käyttäjälle \"%s\".\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Ei voi vaihtaa hakemistoon \"%s\"\n"
 
@@ -440,27 +455,46 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Salasanatiedoston lukitusta ei voi avata.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Käyttö: chgpasswd [valitsimet]\n"
+"Käyttö: chpasswd [valitsimet]\n"
 "\n"
 "Valitsimet:\n"
 "  -e, --encrypted\tAnnetut salasanat ovat salakirjoitettuja\n"
 "  -h, --help\t\tNäytä tämä ohje ja lopeta\n"
 "  -m, --md5\t\tKäytä MD5:tä eikä DES:iä kun annetut salasanat\n"
 "\t\t\teivät ole salakirjoitettuja\n"
-"\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: virheellinen numeroargumentti \"%s\"\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: Valitsinta -a voi käyttää VAIN yhdessä valitsimen -G kanssa\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: ryhmätiedostoa ei voi lukita\n"
 
@@ -505,25 +539,6 @@
 msgstr "%s: virhe päivitettäessä salasanatiedostoa\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Käyttö: chpasswd [valitsimet]\n"
-"\n"
-"Valitsimet:\n"
-"  -e, --encrypted\tAnnetut salasanat ovat salakirjoitettuja\n"
-"  -h, --help\t\tNäytä tämä ohje ja lopeta\n"
-"  -m, --md5\t\tKäytä MD5:tä eikä DES:iä kun annetut salasanat\n"
-"\t\t\teivät ole salakirjoitettuja\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: salasanatiedostoa ei voi lukita\n"
 
@@ -656,9 +671,21 @@
 msgstr "Kuka olet?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: tiedosta ei voi avata\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "tuntematon ryhmä: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: tiedosta ei voi avata\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: varjotiedostoa ei voi avata\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Lisätään käyttäjä %s ryhmään %s\n"
@@ -701,10 +728,6 @@
 msgstr "%s: varjoa ei voi lukita\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: tiedosta ei voi avata\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: tietuetta ei voi päivittää\n"
 
@@ -795,10 +818,6 @@
 msgstr "%s: varjoryhmätiedostoa ei voi avata\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: virheellinen numeroargumentti \"%s\"\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K vaatii AVAIN=ARVO\n"
 
@@ -1196,17 +1215,25 @@
 msgstr "tuntematon GID: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Ei salasanatiedosto\n"
+msgid "Invalid password."
+msgstr "Vanha salasana: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "liian monta ryhmää\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Käyttö: %s [syöte]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: tiedostoa /etc/passwd ei voi lukita.\n"
@@ -1305,6 +1332,14 @@
 msgid "Old password: "
 msgstr "Vanha salasana: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Syötä uusi salasana (vähintään %d ja korkeintaan %d merkkiä)\n"
+"Käytäthän salasanassa numeroita sekä pien- ja suuraakkosia.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1345,6 +1380,12 @@
 msgstr "%s: muisti loppui\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: tietolähdettä %s ei tueta\n"
 
@@ -1627,6 +1668,14 @@
 "  -u, --uid UID\t\tValitse itse UID uudelle käyttäjätunnukselle\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: muisti loppui funktiossa update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: muisti loppui funktiossa update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u ei ole ainutkertainen\n"
@@ -1788,6 +1837,10 @@
 "%s: Ryhmää %s ei voi poistaa, koska se on toisen käyttäjän ensisijainen "
 "ryhmä.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: virhe päivitettäessä ryhmätietuetta\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: ryhmätiedostoa ei voi avata\n"
@@ -1884,15 +1937,11 @@
 "  -U, --unlock\t\t\tAvaa annetun tunnuksen lukitus\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: muisti loppui funktiossa update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: virhe lisättäessä uutta ryhmätietuetta\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: muisti loppui funktiossa update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: lippuja ei annettu\n"
 
@@ -1901,8 +1950,8 @@
 msgstr "%s: varjosalasanat vaaditaan valitsimille -e ja -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: Valitsinta -a voi käyttää VAIN yhdessä valitsimen -G kanssa\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -1992,6 +2041,32 @@
 msgstr ""
 "%s: tiedostoa %s ei voi palauttaa: %s (muutoksesi ovat tiedostossa %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Käyttö: chgpasswd [valitsimet]\n"
+#~ "\n"
+#~ "Valitsimet:\n"
+#~ "  -e, --encrypted\tAnnetut salasanat ovat salakirjoitettuja\n"
+#~ "  -h, --help\t\tNäytä tämä ohje ja lopeta\n"
+#~ "  -m, --md5\t\tKäytä MD5:tä eikä DES:iä kun annetut salasanat\n"
+#~ "\t\t\teivät ole salakirjoitettuja\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Ei salasanatiedosto\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Käyttö: %s [syöte]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Pahoittelen.\n"
 

Modified: upstream/trunk/po/fr.po
===================================================================
--- upstream/trunk/po/fr.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/fr.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-07-20 07:39+0200\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon at wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -19,6 +19,15 @@
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr ""
 "Impossible d'allouer l'espace pour l'information sur la configuration.\n"
@@ -147,6 +156,12 @@
 msgstr "Mot de passe incorrect pour %s.\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Impossible d'aller dans le répertoire « %s »\n"
 
@@ -469,18 +484,18 @@
 msgstr ""
 "Impossible de déverrouiller le fichier des mots de passe /etc/passwd.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Syntaxe : chgpasswd [options]\n"
+"Syntaxe : chpasswd [options]\n"
 "\n"
 "Options :\n"
 "  -e, --encrypted\tles mots de passe fournis sont chiffrés\n"
@@ -489,7 +504,27 @@
 "\t\t\tles mots de passe fournis ne sont pas chiffrés\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s : argument numérique « %s » incorrect\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s : l'indicateur -a n'est autorisé qu'avec l'indicateur -G\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s : impossible de verrouiller le fichier des groupes /etc/group\n"
 
@@ -540,26 +575,6 @@
 "%s : erreur lors de la mise à jour du fichier des mots de passe /etc/passwd\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Syntaxe : chpasswd [options]\n"
-"\n"
-"Options :\n"
-"  -e, --encrypted\tles mots de passe fournis sont chiffrés\n"
-"  -h, --help\t\tafficher ce message d'aide et quitter\n"
-"  -m, --md5\t\tutiliser le chiffrage MD5 à la place de DES lorsque\n"
-"\t\t\tles mots de passe fournis ne sont pas chiffrés\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr ""
 "%s : impossible de verrouiller le fichier des mots de passe /etc/passwd\n"
@@ -699,9 +714,22 @@
 msgstr "Qui êtes-vous ?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s : impossible d'ouvrir le fichier\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "groupe inconnu : %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s : impossible d'ouvrir le fichier\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr ""
+"%s : impossible d'ouvrir le fichier des mots de passe cachés /etc/shadow\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Ajout de l'utilisateur %s au groupe %s\n"
@@ -746,10 +774,6 @@
 "etc/shadow\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s : impossible d'ouvrir le fichier\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s : impossible de mettre à jour l'entrée\n"
 
@@ -849,10 +873,6 @@
 "%s : impossible d'ouvrir le fichier des mots de passe cachés /etc/gshadow\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s : argument numérique « %s » incorrect\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s : -K exige CLÉ=VALEUR\n"
 
@@ -1272,17 +1292,25 @@
 msgstr "L'identifiant de groupe (GID) %lu est inconnu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Pas de fichier des mots de passe\n"
+msgid "Invalid password."
+msgstr "Ancien mot de passe : "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "trop de groupes\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Syntaxe : %s [entrée]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s : impossible de verrouiller /etc/passwd.\n"
@@ -1385,6 +1413,15 @@
 msgid "Old password: "
 msgstr "Ancien mot de passe : "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Entrez le nouveau mot de passe (minimum de %d, maximum de %d\n"
+"caractères). Utilisez une combinaison de lettres majuscules, minuscules\n"
+"et de chiffres.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1427,6 +1464,12 @@
 msgstr "%s : plus de mémoire\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s : le dépôt %s n'est pas géré\n"
 
@@ -1732,6 +1775,14 @@
 "\t\t\t\tpour le compte du nouvel utilisateur\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s : plus de mémoire pour update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s : plus de mémoire pour update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s : l'identifiant d'utilisateur (UID) %u n'est pas unique\n"
@@ -1905,6 +1956,10 @@
 "%s : impossible d'enlever le groupe %s qui est un groupe primaire pour un "
 "autre utilisateur.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s : erreur lors de la mise à jour de l'entrée dans /etc/group\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s : impossible d'ouvrir le fichier des groupes /etc/group\n"
@@ -2013,15 +2068,11 @@
 "  -U, --unlock                 déverrouiller le compte de l'utilisateur\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s : plus de mémoire pour update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s : erreur lors de l'ajout du nouveau groupe\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s : plus de mémoire pour update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s : aucun indicateur n'a été précisé\n"
 
@@ -2030,8 +2081,8 @@
 msgstr "%s : les mots de passe cachés sont nécessaires pour avec -e ou -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s : l'indicateur -a n'est autorisé qu'avec l'indicateur -G\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -2124,6 +2175,32 @@
 msgstr ""
 "%s : impossible de restaurer %s : %s (vos modifications sont dans %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Syntaxe : chgpasswd [options]\n"
+#~ "\n"
+#~ "Options :\n"
+#~ "  -e, --encrypted\tles mots de passe fournis sont chiffrés\n"
+#~ "  -h, --help\t\tafficher ce message d'aide et quitter\n"
+#~ "  -m, --md5\t\tutiliser le chiffrage MD5 à la place de DES lorsque\n"
+#~ "\t\t\tles mots de passe fournis ne sont pas chiffrés\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Pas de fichier des mots de passe\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Syntaxe : %s [entrée]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr " \n"
 

Modified: upstream/trunk/po/gl.po
===================================================================
--- upstream/trunk/po/gl.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/gl.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-07-18 23:27+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <trasno at ceu.fi.udc.es>\n"
@@ -16,6 +16,15 @@
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Non se puido reservar espacio para a información de configuración.\n"
 
@@ -143,6 +152,12 @@
 msgstr "Contrasinal incorrecto para %s.\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Non se puido cambiar a \"%s\"\n"
 
@@ -447,18 +462,18 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Non se pode desbloquear o ficheiro de contrasinais.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Emprego: chgpasswd [opcións]\n"
+"Emprego: chpasswd [opcións]\n"
 "\n"
 "Opcións:\n"
 "  -e, --encrypted\tos contrasinais fornecidos xa están cifrados\n"
@@ -467,7 +482,27 @@
 "\t\t\tcontrasinais fornecidos non están cifrados\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: argumento numérico \"%s\" non válido\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: o modificador -a SÓ se admite co modificador -G\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: non se pode bloquear o ficheiro de grupos\n"
 
@@ -512,26 +547,6 @@
 msgstr "%s: erro ao actualizar o ficheiro de contrasinais\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Emprego: chpasswd [opcións]\n"
-"\n"
-"Opcións:\n"
-"  -e, --encrypted\tos contrasinais fornecidos xa están cifrados\n"
-"  -h, --help\t\tamosa esta mensaxe de axuda e sae\n"
-"  -m, --md5\t\tempregar cifrado MD5 no canto de DES se os\n"
-"\t\t\tcontrasinais fornecidos non están cifrados\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: non se pode bloquear o ficheiro de contrasinais\n"
 
@@ -664,9 +679,21 @@
 msgstr "¿Quen é vostede?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: non se pode abrir o ficheiro\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "grupo descoñecido: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: non se pode abrir o ficheiro\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: non se pode abrir o ficheiro shadow\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "A engadir o usuario %s ao grupo %s\n"
@@ -709,10 +736,6 @@
 msgstr "%s: non se pode obter o bloqueo de shadow\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: non se pode abrir o ficheiro\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: non se pode actualizar a entrada\n"
 
@@ -801,10 +824,6 @@
 msgstr "%s: non se pode abrir o ficheiro de grupos shadow\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: argumento numérico \"%s\" non válido\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K precisa de CLAVE=VALOR\n"
 
@@ -1203,17 +1222,25 @@
 msgstr "GID descoñecido: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Non é un ficheiro de contrasinais\n"
+msgid "Invalid password."
+msgstr "Contrasinal antigo: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "hai grupos de máis\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Emprego: %s [entrada]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: non se pode bloquear /etc/passwd.\n"
@@ -1312,6 +1339,14 @@
 msgid "Old password: "
 msgstr "Contrasinal antigo: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Introduza o novo contrasinal (mínimo de %d, máximo de %d caracteres)\n"
+"Empregue unha combinación de maiúsculas, minúsculas e números.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1352,6 +1387,12 @@
 msgstr "%s: memoria esgotada\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: non se soporta o repositorio %s\n"
 
@@ -1634,6 +1675,14 @@
 "  -u, --uid UID\t\t\tusa o UID para a nova conta de usuario\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: esgotouse a memoria en update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: esgotouse a memoria en update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: o UID %u non é único\n"
@@ -1794,6 +1843,10 @@
 "%s: Non se pode eliminar o grupo %s, que é o grupo primario de outro "
 "usuario.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: erro ao actualizar a entrada do grupo\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: non se pode abrir o ficheiro de grupos\n"
@@ -1892,15 +1945,11 @@
 "  -U, --unlock\t\t\tdesbloquea a conta do usuario\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: esgotouse a memoria en update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: erro ao engadir a entrada do novo grupo\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: esgotouse a memoria en update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: non se forneceu ningún modificador\n"
 
@@ -1909,8 +1958,8 @@
 msgstr "%s: precísase de contrasinais de shadow para -e e -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: o modificador -a SÓ se admite co modificador -G\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -1999,6 +2048,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: non se pode restaurar %s: %s (os seus cambios están en %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Emprego: chgpasswd [opcións]\n"
+#~ "\n"
+#~ "Opcións:\n"
+#~ "  -e, --encrypted\tos contrasinais fornecidos xa están cifrados\n"
+#~ "  -h, --help\t\tamosa esta mensaxe de axuda e sae\n"
+#~ "  -m, --md5\t\tempregar cifrado MD5 no canto de DES se os\n"
+#~ "\t\t\tcontrasinais fornecidos non están cifrados\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Non é un ficheiro de contrasinais\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Emprego: %s [entrada]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Perdón.\n"
 

Modified: upstream/trunk/po/he.po
===================================================================
--- upstream/trunk/po/he.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/he.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2004-07-21 23:59+0300\n"
 "Last-Translator: Lior Kaplan <webmaster at guides.co.il>\n"
 "Language-Team: Hebrew <en at li.org>\n"
@@ -18,6 +18,15 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "לא יכול להקצות מקום בשביל מידע על הקונפיגורציה.\n"
 
@@ -138,6 +147,12 @@
 msgid "Incorrect password for %s.\n"
 msgstr ""
 
+#, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "לא יכול לבצע cd ל-\"%s\"\n"
@@ -423,17 +438,37 @@
 
 #, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: שם לא חוקי: \"%s\"\n"
+
 #, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr ""
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr ""
 
@@ -478,18 +513,6 @@
 msgstr "%s: שגיאה בעדכון קובץ סיסמאות\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: לא יכול לנעול קובץ סיסמאות\n"
 
@@ -600,9 +623,21 @@
 msgstr ""
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr ""
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: לא יכול לנעול קובץ צל\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: לא יכול לפתוח קובץ צל\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr ""
@@ -645,10 +680,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr ""
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr ""
 
@@ -727,10 +758,6 @@
 msgid "%s: unable to open shadow group file\n"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: שם לא חוקי: \"%s\"\n"
-
 #, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr ""
@@ -1102,17 +1129,25 @@
 msgstr ""
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "  בחר סיסמה חדשה.\n"
+msgid "Invalid password."
+msgstr "סיסמה לא טובה: %s.  "
 
 #, c-format
 msgid "too many groups\n"
 msgstr ""
 
 #, c-format
-msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
 msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr ""
@@ -1191,6 +1226,12 @@
 
 #, c-format
 msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+
+#, c-format
+msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
 "Please use a combination of upper and lower case letters and numbers.\n"
 msgstr ""
@@ -1225,6 +1266,12 @@
 msgstr ""
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr ""
 
@@ -1464,6 +1511,14 @@
 "\n"
 msgstr ""
 
+#, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr ""
+
+#, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
@@ -1609,6 +1664,10 @@
 msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: שגיאה בעדכון קובץ צל\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr ""
@@ -1681,15 +1740,11 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: שגיאה בעדכון קובץ צל\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr ""
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr ""
 
@@ -1698,7 +1753,7 @@
 msgstr ""
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
 #, c-format
@@ -1775,3 +1830,7 @@
 #, c-format
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr ""
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "  בחר סיסמה חדשה.\n"

Modified: upstream/trunk/po/hu.po
===================================================================
--- upstream/trunk/po/hu.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/hu.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-07-18 21:33+0100\n"
 "Last-Translator: SZERVÁC Attila <sas at 321.hu>\n"
 "Language-Team: Hungarian <gnome at gnome.hu>\n"
@@ -16,6 +16,15 @@
 "X-Generator: KBabel 1.11.2\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Sikertelen helyfoglalás a beállítási infónak.\n"
 
@@ -138,6 +147,12 @@
 msgstr "Hibás jelszó ehhez: %s.\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "nem lehet könyvtárat váltani ide: \"%s\"\n"
 
@@ -443,18 +458,18 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Nem tudom feloldani a jelszófájl zárolását.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Használat: chgpasswd [kapcsolók]\n"
+"Használat: chpasswd [kapcsolók]\n"
 "\n"
 "Kapcsolók:\n"
 "  -e, --encrypted\ta megadott jelszavak titkosítottak\n"
@@ -463,7 +478,27 @@
 "\t\t\tjelszavak nem titkosítottak\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: érvénytelen numerikus argumentum: \"%s\"\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: -a kapcsoló CSAK -G-vel megy\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: nem tudom lezárni a 'group' fájlt\n"
 
@@ -508,26 +543,6 @@
 msgstr "%s: hiba a jelszófájl frissítésekor\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Használat: chpasswd [kapcsolók]\n"
-"\n"
-"Kapcsolók:\n"
-"  -e, --encrypted\ta megadott jelszavak titkosítottak\n"
-"  -h, --help\t\tezen súgó megjelenítése és kilépés\n"
-"  -m, --md5\t\tMD5 titkosítás használata DES helyett,ha a megadott\n"
-"\t\t\tjelszavak nem titkosítottak\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: nem tudom zárolni a jelszófájlt\n"
 
@@ -662,9 +677,21 @@
 msgstr "Ki vagy?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: nem tudom megnyitni a fájlt\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "ismeretlen csoport: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: nem tudom megnyitni a fájlt\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: nem tudom megnyitni a 'gshadow' fájlt\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "%s felhasználó hozzáadása %s csoporthoz\n"
@@ -707,10 +734,6 @@
 msgstr "%s: nem szerezhető árnyékzár\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: nem tudom megnyitni a fájlt\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: nem tudom frissíteni a bejegyzést\n"
 
@@ -802,10 +825,6 @@
 msgstr "%s: nem tudom megnyitni az árnyék csoport fájlt\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: érvénytelen numerikus argumentum: \"%s\"\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K KULCS=ÉRTÉK párost kíván\n"
 
@@ -1206,17 +1225,25 @@
 msgstr "ismeretlen GID: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Nincs jelszófájl\n"
+msgid "Invalid password."
+msgstr "Régi jelszó: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "túl sok csoport\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Használat: %s [bemenet]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: nem tudom zárolni a /etc/passwd fájlt.\n"
@@ -1314,6 +1341,14 @@
 msgid "Old password: "
 msgstr "Régi jelszó: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Add meg az új jelszót (minimum %d, maximum %d karakter)\n"
+"Biztonság: kérlek használj vegyesen Nagy és kisbetűket és számokat.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1354,6 +1389,12 @@
 msgstr "%s: a memória elfogyott\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: %s tár nem támogatott\n"
 
@@ -1643,6 +1684,14 @@
 "\t\t\t\tfelhasználói fiókhoz\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: elfogyott a memória az update_group során\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: elfogyott a memória az update_gshadow során\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u nem egyedi\n"
@@ -1805,6 +1854,10 @@
 "%s: Nem tudom %s csoportot törölni, ami egy másik felhasználó elsődleges "
 "csoportja.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: Hiba a csoport bejegyzés frissítésekor\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: nem tudom megnyitni a csoport fájlt\n"
@@ -1906,15 +1959,11 @@
 "  -U, --unlock\t\t\ta felhasználói fiók zárolásának feloldása\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: elfogyott a memória az update_group során\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: hiba az új csoport bejegyzés hozzáadásakor\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: elfogyott a memória az update_gshadow során\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: nincs kapcsoló megadva\n"
 
@@ -1923,8 +1972,8 @@
 msgstr "%s: -e és -f árnyék jelszavakat vár\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: -a kapcsoló CSAK -G-vel megy\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -2012,6 +2061,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: nem tudom visszaállítani %s-t: %s (módosításaid itt vannak: %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Használat: chgpasswd [kapcsolók]\n"
+#~ "\n"
+#~ "Kapcsolók:\n"
+#~ "  -e, --encrypted\ta megadott jelszavak titkosítottak\n"
+#~ "  -h, --help\t\tezen súgó megjelenítése és kilépés\n"
+#~ "  -m, --md5\t\tMD5 titkosítás használata DES helyett,ha a megadott\n"
+#~ "\t\t\tjelszavak nem titkosítottak\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Nincs jelszófájl\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Használat: %s [bemenet]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Bocs.\n"
 

Modified: upstream/trunk/po/id.po
===================================================================
--- upstream/trunk/po/id.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/id.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.15\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-04-07 11:45+0700\n"
 "Last-Translator: Parlin Imanuel Toh <parlin_i at yahoo.com>\n"
 "Language-Team: Debian Indonesia <debid at yahoogroups.com>\n"
@@ -15,6 +15,15 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Tidak dapat mengalokasikan ruang untuk informasi konfigurasi.\n"
 
@@ -137,6 +146,12 @@
 msgid "Incorrect password for %s.\n"
 msgstr "Kata sandi tidak tepat untuk %s\n"
 
+#, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Tidak dapat cd ke \"%s\"\n"
@@ -440,27 +455,46 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Tidak dapat membuka kunci berkas kata sandi.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Penggunaan: chgpasswd [pilihan-pilihan]\n"
+"Penggunaan: chpasswd [pilihan-pilihan]\n"
 "\n"
 "Pilihan-pilihan:\n"
 "  -e, --encrypted\tkata sandi yang diberikan telah terenkripsi\n"
 "  -h, --help\t\ttampilkan pesan bantuan ini dan keluar\n"
 "  -m, --md5\t\tgunakan enkripsi MD5 daripada DES bila kata sandi\n"
 "\t\t\tyang diberikan tak terenkripsi\n"
-"\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: argumen numerik tak sah `%s'\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: -a hanya diperbolehkan dengan -G\n"
+
 #, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: tidak dapat mengunci berkas grup\n"
 
@@ -505,25 +539,6 @@
 msgstr "%s: kesalahan saat memperbaharui berkas kata sandi\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Penggunaan: chpasswd [pilihan-pilihan]\n"
-"\n"
-"Pilihan-pilihan:\n"
-"  -e, --encrypted\tkata sandi yang diberikan telah terenkripsi\n"
-"  -h, --help\t\ttampilkan pesan bantuan ini dan keluar\n"
-"  -m, --md5\t\tgunakan enkripsi MD5 daripada DES bila kata sandi\n"
-"\t\t\tyang diberikan tak terenkripsi\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: tidak dapat mengunci berkas kata sandi\n"
 
@@ -647,9 +662,21 @@
 msgstr "Anda siapa?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: tidak dapat membuka berkas\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "grup tak dikenal: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: tidak dapat membuka berkas\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: tidak dapat membuka berkas kata sandi bayangan\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Menambahkan pengguna %s ke grup %s\n"
@@ -692,10 +719,6 @@
 msgstr "%s: tidak mendapatkan kunci untuk berkas bayangan\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: tidak dapat membuka berkas\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: tidak dapat memperbaharui entri\n"
 
@@ -784,10 +807,6 @@
 msgid "%s: unable to open shadow group file\n"
 msgstr "%s: tidak dapat membuka berkas grup bayangan\n"
 
-#, fuzzy, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: argumen numerik tak sah `%s'\n"
-
 #, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K memerlukan NAMA=NILAI\n"
@@ -1187,17 +1206,25 @@
 msgstr "GID tidak dikenal: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Tak ada berkas kata sandi\n"
+msgid "Invalid password."
+msgstr "Kata sandi lama: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "terlalu banyak grup\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Penggunaan: %s [input]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: tidak dapat mengunci /etc/passwd.\n"
@@ -1295,6 +1322,14 @@
 msgid "Old password: "
 msgstr "Kata sandi lama: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Masukkan password baru (minimim %d, maksimum %d karakter)\n"
+"Mohon gunakan kombinasi huruf besar, huruf kecil dan angka.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1335,6 +1370,12 @@
 msgstr "%s: kehabisan memori\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: repositori %s tidak didukung\n"
 
@@ -1616,6 +1657,14 @@
 "  -u, --uid UID\t\t\tpaksakan uid UID untuk pengguna baru\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: kehabisan memori saat update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: kehabisan memori saat update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u tidak unik\n"
@@ -1766,6 +1815,10 @@
 "%s: tidak dapat menghapus grup %s yg merupakan grup utama dari pengguna "
 "lain.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: errot memperbaharui entri grup\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: tak dapat membuka berkas grup\n"
@@ -1859,15 +1912,11 @@
 "  -U, --unlock\t\t\tbuka bloking pengguna\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: kehabisan memori saat update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: kesalahan saat menambahkan entri grup yang baru\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: kehabisan memori saat update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: tak diberikan tanda-tanda/bendera\n"
 
@@ -1876,8 +1925,8 @@
 msgstr "%s: diperlukan kata sandi bayangan untuk -e dan -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: -a hanya diperbolehkan dengan -G\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -1965,6 +2014,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: tidak dapat mengembalikan %s: %s (perubahan ada dalam %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Penggunaan: chgpasswd [pilihan-pilihan]\n"
+#~ "\n"
+#~ "Pilihan-pilihan:\n"
+#~ "  -e, --encrypted\tkata sandi yang diberikan telah terenkripsi\n"
+#~ "  -h, --help\t\ttampilkan pesan bantuan ini dan keluar\n"
+#~ "  -m, --md5\t\tgunakan enkripsi MD5 daripada DES bila kata sandi\n"
+#~ "\t\t\tyang diberikan tak terenkripsi\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Tak ada berkas kata sandi\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Penggunaan: %s [input]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Maaf.\n"
 

Modified: upstream/trunk/po/it.po
===================================================================
--- upstream/trunk/po/it.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/it.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -25,7 +25,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.15\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-03-06 21:13+0100\n"
 "Last-Translator: Danilo Piazzalunga <danilopiazza at gmail.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -35,6 +35,15 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Impossibile allocare spazio per le informazioni di configurazione.\n"
 
@@ -162,6 +171,12 @@
 msgid "Incorrect password for %s.\n"
 msgstr "Password sbagliata per %s\n"
 
+#, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Impossibile spostarsi nella directory «%s»\n"
@@ -467,27 +482,46 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Impossibile togliere il lock dal file delle password.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Uso: chgpasswd [OPZIONI]\n"
+"Uso: chpasswd [OPZIONI]\n"
 "\n"
 "Opzioni:\n"
 "  -e, --encrypted\tle password fornite sono cifrate\n"
 "  -h, --help\t\tmostra questo messaggio di aiuto ed esce\n"
 "  -m, --md5\t\tusa la cifratura MD5 anziché DES quando le\n"
 "\t\t\tpassword fornite non sono cifrate\n"
-"\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: argomento numerico «%s» non valido\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: è permesso usare il flag -a solo con il flag -G\n"
+
 #, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: impossibile fare il lock del file dei gruppi\n"
 
@@ -532,25 +566,6 @@
 msgstr "%s: errore nell'aggiornare il file delle password\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Uso: chpasswd [OPZIONI]\n"
-"\n"
-"Opzioni:\n"
-"  -e, --encrypted\tle password fornite sono cifrate\n"
-"  -h, --help\t\tmostra questo messaggio di aiuto ed esce\n"
-"  -m, --md5\t\tusa la cifratura MD5 anziché DES quando le\n"
-"\t\t\tpassword fornite non sono cifrate\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: impossibile fare il lock del file delle password\n"
 
@@ -683,9 +698,21 @@
 msgstr "Chi sei?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: impossibile aprire il file\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "gruppo «%s» sconosciuto\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: impossibile aprire il file\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: impossibile aprire il file shadow\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Aggiunta dell'utente %s al gruppo %s\n"
@@ -728,10 +755,6 @@
 msgstr "%s: impossibile fare il lock del file shadow\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: impossibile aprire il file\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: impossibile aggiornare la voce\n"
 
@@ -822,10 +845,6 @@
 msgid "%s: unable to open shadow group file\n"
 msgstr "%s: impossibile aprire il file dei gruppi shadow\n"
 
-#, fuzzy, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: argomento numerico «%s» non valido\n"
-
 #, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K richiede NOME=VALORE\n"
@@ -1232,17 +1251,25 @@
 msgstr "GID %lu sconosciuto\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Manca il file delle password\n"
+msgid "Invalid password."
+msgstr "Vecchia password: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "troppi gruppi\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Uso: %s [INPUT]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: impossibile fare il lock di /etc/passwd.\n"
@@ -1345,6 +1372,14 @@
 msgid "Old password: "
 msgstr "Vecchia password: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Inserire la nuova password (minimo %d caratteri, massimo %d)\n"
+"Utilizzare una combinazione di lettere maiuscole, minuscole e numeri.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1386,6 +1421,12 @@
 msgstr "%s: memoria esaurita\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: repository %s non supportato\n"
 
@@ -1670,6 +1711,14 @@
 "  -u, --uid UID\t\t\timpone l'uso di UID per il nuovo account\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: memoria esaurita in update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: memoria esaurita in update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u non univoco\n"
@@ -1822,6 +1871,10 @@
 "%s: impossibile rimuovere il gruppo «%s» in quanto gruppo principale di un "
 "altro utente.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: errore nell'aggiornare la voce nel file dei gruppi\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: impossibile aprire il file dei gruppi\n"
@@ -1919,15 +1972,11 @@
 "  -U, --unlock\t\t\tsblocca l'account dell'utente\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: memoria esaurita in update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: errore nell'aggiungere la nuova voce al file dei gruppi\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: memoria esaurita in update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: non è stata fornita nessuna opzione\n"
 
@@ -1936,8 +1985,8 @@
 msgstr "%s: le shadow password sono necessarie per le opzioni -e e -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: è permesso usare il flag -a solo con il flag -G\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -2028,6 +2077,32 @@
 msgstr ""
 "%s: impossibile ripristinare %s: %s (le modifiche effettuate sono in %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: chgpasswd [OPZIONI]\n"
+#~ "\n"
+#~ "Opzioni:\n"
+#~ "  -e, --encrypted\tle password fornite sono cifrate\n"
+#~ "  -h, --help\t\tmostra questo messaggio di aiuto ed esce\n"
+#~ "  -m, --md5\t\tusa la cifratura MD5 anziché DES quando le\n"
+#~ "\t\t\tpassword fornite non sono cifrate\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Manca il file delle password\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Uso: %s [INPUT]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Spiacente.\n"
 

Modified: upstream/trunk/po/ja.po
===================================================================
--- upstream/trunk/po/ja.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/ja.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-08-07 23:22+0900\n"
 "Last-Translator: NAKANO Takeo <nakano at webmasters.gr.jp>\n"
 "Language-Team: Japanese\n"
@@ -17,6 +17,15 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "設定情報用の空き容量が確保できませんでした。\n"
 
@@ -139,6 +148,12 @@
 msgstr "%s のパスワードが正しくありません。\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "'%s' へディレクトリを変更できません\n"
 
@@ -440,27 +455,47 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "パスワードファイルのロックを解除できません。\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"使い方: chgpasswd [オプション]\n"
+"使い方: chpasswd [オプション]\n"
 "\n"
 "オプション:\n"
-"  -e, --encrypted\t与えたパスワードは暗号化済みである\n"
-"  -h, --help\t\tこのヘルプを表示して終了する\n"
-"  -m, --md5\t\t与えたパスワードが暗号化されていないとき、\n"
+"  -e, --encrypted\tパスワードを暗号化した状態で渡す\n"
+"  -h, --help\t\tこのヘルプメッセージを表示して終了する\n"
+"  -m, --md5\t\t与えたパスワードが暗号化されていない場合、\n"
 "\t\t\tDES の代わりに MD5 を用いる\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: 数値引数 '%s' が正しくありません\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: -a フラグは -G フラグと共に指定する必要があります\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: グループファイルをロックできません\n"
 
@@ -505,26 +540,6 @@
 msgstr "%s: パスワードファイル更新の際にエラーが起きました\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"使い方: chpasswd [オプション]\n"
-"\n"
-"オプション:\n"
-"  -e, --encrypted\tパスワードを暗号化した状態で渡す\n"
-"  -h, --help\t\tこのヘルプメッセージを表示して終了する\n"
-"  -m, --md5\t\t与えたパスワードが暗号化されていない場合、\n"
-"\t\t\tDES の代わりに MD5 を用いる\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: パスワードファイルをロックできません\n"
 
@@ -654,9 +669,21 @@
 msgstr "あなたは誰?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: ファイルを開けません\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "不明なグループです: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: ファイルを開けません\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: shadow ファイルを開けません\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "ユーザ %s をグループ %s に追加\n"
@@ -699,10 +726,6 @@
 msgstr "%s: シャドウをロックできません\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: ファイルを開けません\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: エントリを更新できません\n"
 
@@ -793,10 +816,6 @@
 msgstr "%s: シャドウグループファイルを開けません\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: 数値引数 '%s' が正しくありません\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K には KEY=VALUE が必要です\n"
 
@@ -1196,17 +1215,25 @@
 msgstr "不明なグループ ID: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "パスワードファイルがありません\n"
+msgid "Invalid password."
+msgstr "古いパスワード: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "グループが多すぎます\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "使用法: %s [入力]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: /etc/passwd をロックできません。\n"
@@ -1304,6 +1331,14 @@
 msgid "Old password: "
 msgstr "古いパスワード: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"新しいパスワードを入れてください (最低 %d 文字、最高 %d 文字)\n"
+"大文字・小文字・数字を混ぜて使うようにしてください。\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1344,6 +1379,12 @@
 msgstr "%s: メモリが足りません\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: レポジトリ %s はサポートしていません\n"
 
@@ -1625,6 +1666,14 @@
 "  -u, --uid UID\t\t\t新ユーザアカウントのユーザ ID を指定する\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: update_group 中にメモリが不足しました\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: update_gshadow 中にメモリが不足しました\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: ユーザ ID %u は重複しています\n"
@@ -1785,6 +1834,10 @@
 msgstr ""
 "%s: グループ %s は他のユーザのプライマリグループなので削除できません。\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: グループエントリ更新の際にエラーが起きました\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: グループファイルを開けません\n"
@@ -1883,15 +1936,11 @@
 "  -U, --unlock\t\t\tこのユーザアカウントのロックを解除する\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: update_group 中にメモリが不足しました\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: 新規グループエントリ追加の際にエラーが起きました\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: update_gshadow 中にメモリが不足しました\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: ひとつもフラグが指定されていません\n"
 
@@ -1900,8 +1949,8 @@
 msgstr "%s: -e および -f にはシャドウパスワードが必要です\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: -a フラグは -G フラグと共に指定する必要があります\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -1989,6 +2038,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: %s を復旧できませんでした: %s (あなたの変更は %s にあります)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "使い方: chgpasswd [オプション]\n"
+#~ "\n"
+#~ "オプション:\n"
+#~ "  -e, --encrypted\t与えたパスワードは暗号化済みである\n"
+#~ "  -h, --help\t\tこのヘルプを表示して終了する\n"
+#~ "  -m, --md5\t\t与えたパスワードが暗号化されていないとき、\n"
+#~ "\t\t\tDES の代わりに MD5 を用いる\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "パスワードファイルがありません\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "使用法: %s [入力]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "ごめんなさい。\n"
 

Modified: upstream/trunk/po/km.po
===================================================================
--- upstream/trunk/po/km.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/km.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: shadow_po_km\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-06-28 10:08+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem at khmeros.info>\n"
 "Language-Team: Khmer <support at khmeros.info>\n"
@@ -22,6 +22,15 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "មិន​អាច​បម្រុង​ទុក​ទំហំ​សម្រាប់​ព័ត៌មាន​​កំណត់​រចនាសម្ព័ន្ធទេ​ ។\n"
 
@@ -147,6 +156,12 @@
 msgstr "ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ​សម្រាប់​ %s ។\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "មិន​អាច​​ cd ចូលទៅ​ '%s' បានទេ\n"
 
@@ -445,27 +460,47 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "មិន​អាច​ដោះសោ​ឯកសារ​ពាក្យ​សម្ងាត់បានឡើយ​ ។\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"របៀបប្រើ ៖ chgpasswd [ជម្រើស]\n"
+"របៀបប្រើ ៖ chpasswd [ជម្រើស]\n"
 "\n"
 "ជម្រើស ៖\n"
-"  -e, --encrypted\tពាក្យ​សម្ងាត់​ដែល​បាន​ផ្ដល់​ត្រូវ​បាន​អ៊ិនគ្រីប\n"
-"  -h, --help\t\tបង្ហា​ញសារ​ជំនួយ​នេះ និង​ចេញ\n"
-"  -m, --md5\t\tប្រើ​ការ​អ៊ិនគ្រីប MD5 ជំនួស​ឲ្យ DES នៅ​ពេល​បាន​ផ្ដល់​ឲ្យ\n"
-"\t\t\tពាក្យសម្ងាត់​មិន​ត្រូវបាន​អ៊ិនគ្រីប\n"
+"  -e, --encrypted\tពាក្យសម្ងាត់​ដែល​បាន​ផ្ដល់​ត្រូវ​បាន​អ៊ិនគ្រីប\n"
+"  -h, --help\t\tបង្ហាញ​សារ​ជំនួយ​​នេះ និង​ចេញ\n"
+"  -m, --md5\t\tប្រើ​ការ​អ៊ិនគ្រីប MD5 ជំនួស​ឲ្យ DES នៅ​ពេល​ដែល​ពាក្យសម្ងាត់\n"
+"\t\t\tដែល​បាន​ផ្ដល់​មិន​ត្រូវបាន​អ៊ិនគ្រីប​ទេ\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s ៖ អាគុយម៉ង់​ជាលេខ​មិន​ត្រឹមត្រូវ​ '%s'\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: ទង់ -a គឺត្រូវបានអនុញ្ញាត​បានតែជាមួយទង់ -G ប៉ុណ្ណោះ\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s ៖ មិន​អាច​ចាក់​សោ​​​ឯកសារជា​​ក្រុម​បាន​ទេ\n"
 
@@ -510,26 +545,6 @@
 msgstr "%s ៖ កំហុស​ក្នុងការធ្វើឲ្យ​ឯកសារពាក្យសម្ងាត់ទាន់សម័យ\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"របៀបប្រើ ៖ chpasswd [ជម្រើស]\n"
-"\n"
-"ជម្រើស ៖\n"
-"  -e, --encrypted\tពាក្យសម្ងាត់​ដែល​បាន​ផ្ដល់​ត្រូវ​បាន​អ៊ិនគ្រីប\n"
-"  -h, --help\t\tបង្ហាញ​សារ​ជំនួយ​​នេះ និង​ចេញ\n"
-"  -m, --md5\t\tប្រើ​ការ​អ៊ិនគ្រីប MD5 ជំនួស​ឲ្យ DES នៅ​ពេល​ដែល​ពាក្យសម្ងាត់\n"
-"\t\t\tដែល​បាន​ផ្ដល់​មិន​ត្រូវបាន​អ៊ិនគ្រីប​ទេ\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s ៖ មិនអាច​ចាក់សោ​ឯកសារ​ពាក្យ​សម្ងាត់​បានទេ​\n"
 
@@ -660,9 +675,21 @@
 msgstr "តើអ្នក​ជា​នណា​ ?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s ៖ មិន​អាច​បើក​​ឯកសារ​បានទេ\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "មិន​ស្គាល់​ក្រុម​ ​ ៖ %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s ៖ មិន​អាច​បើក​​ឯកសារ​បានទេ\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s ៖ មិន​អាច​បើក​ឯកសារ​ស្រមោល​បានទេ\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "កំពុង​បន្ថែម​អ្នកប្រើ​ %s ទៅក្រុម​ %s\n"
@@ -705,10 +732,6 @@
 msgstr "%s ៖ មិនអាច​ចាក់សោ​ស្រមោល​បានឡើយ​\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s ៖ មិន​អាច​បើក​​ឯកសារ​បានទេ\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s ៖ មិន​អាចធ្វើ​ឲ្យ​ធាតុបញ្ចូល​​ទាន់សម័យ​បានទេ​\n"
 
@@ -799,10 +822,6 @@
 msgstr "%s ៖ មិនអាច​បើក​ឯកសារក្រុម​ស្រមោល​បានទេ​\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s ៖ អាគុយម៉ង់​ជាលេខ​មិន​ត្រឹមត្រូវ​ '%s'\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K ទាមទារ​ KEY=VALUE\n"
 
@@ -1203,17 +1222,25 @@
 msgstr "មិន​ស្គាល់​ GID ៖ %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "គ្មាន​ឯកសារ​ពាក្យ​សម្ងាត់ឡើយ​\n"
+msgid "Invalid password."
+msgstr "ពាក្យ​សម្ងាត់​ចាស់ ៖ "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "ច្រើន​ក្រុមពេក​\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "របៀបប្រើ ៖ %s [input]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s ៖ មិន​អាច​ចាក់​សោ​ /etc/passwd បានឡើយ ។\n"
@@ -1311,6 +1338,14 @@
 msgid "Old password: "
 msgstr "ពាក្យ​សម្ងាត់​ចាស់ ៖ "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"បញ្ចូល​ពាក្យ​សម្ងាត់​ថ្មី​ (តួអក្សរ​​អប្បបរមានៃ​ %d អតិបរមានៃ %d)\n"
+"សូម​ប្រើ​អក្សរ​ធំ​ អក្សរ​តូច​ ​និង លេខ​ចូល​គ្នា​ ។\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1351,6 +1386,12 @@
 msgstr "%s ៖ អស់​សតិ​\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s ៖ ឃ្លាំង​ %s មិន​បាន​គាំទ្រឡើយ​\n"
 
@@ -1633,6 +1674,14 @@
 "  -u, --uid UID\t\t\tបង្ខំឲ្យប្រើ UID សម្រាប់​គណនី​អ្នកប្រើ​ថ្មី\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: អស់​សតិ​ក្នុង​ក្នុងការធ្វើឲ្យ​ក្រុមទាន់សម័យ\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s ៖ អស់​សតិ​ក្នុងការធ្វើឲ្យ gshadow ទាន់សម័៧\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s ៖ UID %u មិន​មែន​មាន​តែមួយទេ​\n"
@@ -1787,6 +1836,10 @@
 msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgstr "%s ៖ មិនអាច​យកក្រុម %s ដែលជា​ក្រុម​ចម្បង​សម្រាប់​អ្នកប្រើដទៃទៀតចេញបានទេ ។\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s  ៖ មានកំហុស​ក្នុងការ​ធ្វើឲ្យ​ធាតុ​បញ្ចូល​ក្រុម​​ទាន់សម័យ\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s ៖ មិនអាចបើក​ឯកសារក្រុម​បានឡើយ​\n"
@@ -1881,15 +1934,11 @@
 "  -U, --unlock\t\t\tដោះសោ​គណនី​អ្នកប្រើ\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: អស់​សតិ​ក្នុង​ក្នុងការធ្វើឲ្យ​ក្រុមទាន់សម័យ\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s ៖ កំហុស​ក្នុងការ​បន្ថែម​ធាតុបញ្ចូល​​ក្រុម​ថ្មី​\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s ៖ អស់​សតិ​ក្នុងការធ្វើឲ្យ gshadow ទាន់សម័៧\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s ៖ មិន​ផ្តល់​ទង់​ឲ្យឡើយ​\n"
 
@@ -1898,8 +1947,8 @@
 msgstr "%s ៖ ពាក្យ​សម្ងាត់​ស្រមោល​បានត្រូវការ​​ -e និង -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: ទង់ -a គឺត្រូវបានអនុញ្ញាត​បានតែជាមួយទង់ -G ប៉ុណ្ណោះ\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -1987,6 +2036,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s ៖ មិន​អាច​ស្តារ %s ៖ %s (ការប្ដូរ​របស់អ្នក​គឺនៅក្នុង​ %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "របៀបប្រើ ៖ chgpasswd [ជម្រើស]\n"
+#~ "\n"
+#~ "ជម្រើស ៖\n"
+#~ "  -e, --encrypted\tពាក្យ​សម្ងាត់​ដែល​បាន​ផ្ដល់​ត្រូវ​បាន​អ៊ិនគ្រីប\n"
+#~ "  -h, --help\t\tបង្ហា​ញសារ​ជំនួយ​នេះ និង​ចេញ\n"
+#~ "  -m, --md5\t\tប្រើ​ការ​អ៊ិនគ្រីប MD5 ជំនួស​ឲ្យ DES នៅ​ពេល​បាន​ផ្ដល់​ឲ្យ\n"
+#~ "\t\t\tពាក្យសម្ងាត់​មិន​ត្រូវបាន​អ៊ិនគ្រីប\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "គ្មាន​ឯកសារ​ពាក្យ​សម្ងាត់ឡើយ​\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "របៀបប្រើ ៖ %s [input]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "សូមអភ័យទោស ។\n"
 

Modified: upstream/trunk/po/ko.po
===================================================================
--- upstream/trunk/po/ko.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/ko.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-07-22 00:05+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu at debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean at lists.debian.org>\n"
@@ -17,6 +17,15 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "설정 정보를 위한 공간을 확보할 수 없습니다.\n"
 
@@ -139,6 +148,12 @@
 msgstr "'%s'의 열쇠글이 맞지 않습니다.\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "'%s' 디렉토리로 이동할 수 없습니다\n"
 
@@ -440,27 +455,47 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "열쇠글 파일의 잠금상태를 해제할 수 없습니다.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
 "사용법: chpasswd [옵션]\n"
 "\n"
 "옵션:\n"
 "  -e, --encrypted\t입력하는 열쇠글이 암호화되어 있습니다\n"
 "  -h, --help\t\t이 도움말 메세지를 표시하고 끝냅니다\n"
-"  -m, --md5\t\t입력하는 열쇠글이 암호화되어 있지 않으면 \n"
+"  -m, --md5\t\t입력하는 열쇠글이 암호화되어 있지 않으면\n"
 "\t\t\tDES 대신 MD5 암호화를 사용합니다\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: 잘못된 숫자 인자 '%s'\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: -a 플래그는 -G 플래그와 함께 사용해야 합니다\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: 그룹 파일을 잠글 수 없습니다\n"
 
@@ -505,26 +540,6 @@
 msgstr "%s: 열쇠글 파일을 업데이트하는 데 오류 발생\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"사용법: chpasswd [옵션]\n"
-"\n"
-"옵션:\n"
-"  -e, --encrypted\t입력하는 열쇠글이 암호화되어 있습니다\n"
-"  -h, --help\t\t이 도움말 메세지를 표시하고 끝냅니다\n"
-"  -m, --md5\t\t입력하는 열쇠글이 암호화되어 있지 않으면\n"
-"\t\t\tDES 대신 MD5 암호화를 사용합니다\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: 열쇠글 파일을 잠글 수 없습니다\n"
 
@@ -654,9 +669,21 @@
 msgstr "누구십니까?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: 파일을 열 수 없습니다\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "알 수 없는 그룹: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: 파일을 열 수 없습니다\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: 셰도우 파일을 열 수 없습니다\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "사용자 %s을(를) %s 그룹에 등록 중\n"
@@ -699,10 +726,6 @@
 msgstr "%s: 셰도우 잠금을 할 수 없습니다\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: 파일을 열 수 없습니다\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: 입력값을 업데이트 할 수 없습니다\n"
 
@@ -793,10 +816,6 @@
 msgstr "%s: 셰도우 그룹 파일을 열 수 없습니다\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: 잘못된 숫자 인자 '%s'\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K 옵션에는 <키>=<값> 형태의 입력이 필요합니다\n"
 
@@ -1196,17 +1215,25 @@
 msgstr "알 수 없는 GID: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "열쇠글 파일 없음\n"
+msgid "Invalid password."
+msgstr "예전 열쇠글: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "그룹이 너무 많습니다\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "사용법: %s [입력값]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: /etc/passwd를 잠글 수 없습니다.\n"
@@ -1304,6 +1331,14 @@
 msgid "Old password: "
 msgstr "예전 열쇠글: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"새 열쇠글을 입력하십시오(최소 %d, 최대 %d 글자)\n"
+"영어 대소문자와 숫자를 조합하여 사용하십시오.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1344,6 +1379,12 @@
 msgstr "%s: 메모리 부족\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: %s 저장소는 지원하지 않습니다\n"
 
@@ -1621,6 +1662,14 @@
 "  -u, --uid <UID>\t\t\t지정된 사용자 계정의 새 <UID> 값을 지정합니다\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: 업데이트_그룹에서 메모리 부족\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: 업데이트_그룹셰도우에서 메모리 부족\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u번은 유일하지 않습니다\n"
@@ -1778,6 +1827,10 @@
 msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgstr "%s: %s 그룹은 다른 사용자의 주요 그룹이므로 지울 수 없습니다.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: 그룹 입력값을 업데이트하는 데 오류가 발생했습니다\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: 그룹 파일을 열 수 없습니다\n"
@@ -1876,15 +1929,11 @@
 "  -U, --unlock\t\t\t사용자 계정의 잠금을 해제합니다\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: 업데이트_그룹에서 메모리 부족\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: 새 그룹을 더하는 데 오류가 발생했습니다\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: 업데이트_그룹셰도우에서 메모리 부족\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: 주어진 플래그가 없습니다\n"
 
@@ -1893,8 +1942,8 @@
 msgstr "%s:  -e 옵션과 -f 옵션은 셰도우 열쇠글을 요구합니다\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: -a 플래그는 -G 플래그와 함께 사용해야 합니다\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -1983,6 +2032,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: %s을(를) 복구시킬 수 없습니다: %s (바뀐 사항은 %s에 있습니다)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "사용법: chpasswd [옵션]\n"
+#~ "\n"
+#~ "옵션:\n"
+#~ "  -e, --encrypted\t입력하는 열쇠글이 암호화되어 있습니다\n"
+#~ "  -h, --help\t\t이 도움말 메세지를 표시하고 끝냅니다\n"
+#~ "  -m, --md5\t\t입력하는 열쇠글이 암호화되어 있지 않으면 \n"
+#~ "\t\t\tDES 대신 MD5 암호화를 사용합니다\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "열쇠글 파일 없음\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "사용법: %s [입력값]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "죄송합니다.\n"
 

Modified: upstream/trunk/po/nb.po
===================================================================
--- upstream/trunk/po/nb.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/nb.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-06-23 09:01+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst at powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -21,6 +21,15 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Fant ikke plass til config-info.\n"
 
@@ -146,6 +155,12 @@
 msgstr "Feil passord for «%s».\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Klarte ikke endre katalog til «%s»\n"
 
@@ -445,18 +460,18 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Kan ikke låse opp passordfila.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Bruk: chgpasswd [valg]\n"
+"Bruk: chpasswd [valg]\n"
 "\n"
 "Valg:\n"
 "  -e, --encrypted\toppgitte passord er krypterte\n"
@@ -464,7 +479,27 @@
 "  -m, --md5\t\tbruk MD5-kryptering i stedet for DES når de oppgitte\n"
 "\t\t\tpassordene ikke er krypterte\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: ugyldig numerisk argument «%s»\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: -a er BARE tillatt sammen med -G\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: klarer ikke å låse gruppefila\n"
 
@@ -509,25 +544,6 @@
 msgstr "%s: feil ved oppdatering av passordfila\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Bruk: chpasswd [valg]\n"
-"\n"
-"Valg:\n"
-"  -e, --encrypted\toppgitte passord er krypterte\n"
-"  h, --help\t\tvis denne hjelpeteksten og avslutt\n"
-"  -m, --md5\t\tbruk MD5-kryptering i stedet for DES når de oppgitte\n"
-"\t\t\tpassordene ikke er krypterte\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: kan ikke låse passordfila\n"
 
@@ -658,9 +674,21 @@
 msgstr "Hvem er du?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: kan ikke åpne fila\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "ukjent gruppe: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: kan ikke åpne fila\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: kan ikke åpne shadow-fila\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Legger til brukere i  %s gruppen %s\n"
@@ -703,10 +731,6 @@
 msgstr "%s: klarer ikke å låse shadow-fila\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: kan ikke åpne fila\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: klarer ikke å oppdatere oppføringen\n"
 
@@ -798,10 +822,6 @@
 msgstr "%s: klarer ikke å åpne shadow-gruppefila\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: ugyldig numerisk argument «%s»\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K krever KEY=VALUE\n"
 
@@ -1202,17 +1222,25 @@
 msgstr "ukjent GID: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Ingen passordfil.\n"
+msgid "Invalid password."
+msgstr "Gammelt passord: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "for mange grupper\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Bruk: %s [input]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: kan ikke låse /etc/passwd.\n"
@@ -1308,6 +1336,14 @@
 msgid "Old password: "
 msgstr "Gammelt passord: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Skriv inn det nye passordet (minst %d, høyst %d tegn)\n"
+"Bruk en kombinasjon av store og små bokstaver, og tall.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1348,6 +1384,12 @@
 msgstr "%s: slapp opp for minne\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: ikke støtte for lager %s\n"
 
@@ -1626,6 +1668,14 @@
 "  -u, --uid UID\t\t\tbruk UID for den nye brukerkontoen\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: slapp opp for minne i update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: slapp opp for minne i update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u er ikke entydig\n"
@@ -1785,6 +1835,10 @@
 msgstr ""
 "%s: kan ikke fjerne gruppe %s som er en primærgruppe for en annen bruker.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: feil ved oppdatering av gruppe-oppføring\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: kan ikke åpne gruppefila\n"
@@ -1867,15 +1921,11 @@
 "  -f, --inactive INAKTIV\tpassordet settes inaktivt etter utløp\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: slapp opp for minne i update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: feil ved oppretting av ny gruppeoppføring\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: slapp opp for minne i update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: ingen flagg oppgitt\n"
 
@@ -1884,8 +1934,8 @@
 msgstr "%s: shadow-passord kreves for -e og -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: -a er BARE tillatt sammen med -G\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -1974,6 +2024,31 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: kan ikke gjenopprette %s: %s (dine endringer befinner seg i %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Bruk: chgpasswd [valg]\n"
+#~ "\n"
+#~ "Valg:\n"
+#~ "  -e, --encrypted\toppgitte passord er krypterte\n"
+#~ "  h, --help\t\tvis denne hjelpeteksten og avslutt\n"
+#~ "  -m, --md5\t\tbruk MD5-kryptering i stedet for DES når de oppgitte\n"
+#~ "\t\t\tpassordene ikke er krypterte\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Ingen passordfil.\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Bruk: %s [input]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Beklager.\n"
 

Modified: upstream/trunk/po/ne.po
===================================================================
--- upstream/trunk/po/ne.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/ne.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-06-16 14:30+0545\n"
 "Last-Translator: Shiva Pokharel <pokharelshiva at hotmail.com>\n"
 "Language-Team: Nepali <info at mpp.org.np>\n"
@@ -19,6 +19,15 @@
 "X-Generator: KBabel 1.10.2\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "कनफिगरेसन सूचनाको लागि खाली ठाऊँ बाँड्न सकिदैन ।\n"
 
@@ -144,6 +153,12 @@
 msgstr " %s को लागि गलत पासवर्ड ।\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "'%s' मा सि डि गर्न असफल\n"
 
@@ -446,16 +461,16 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "पासवर्ड फाइलबाट ताल्चा हटाउन सकिदैन ।\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
 "उपयोग: पासवर्ड परिवर्तन गर्नुहोस् [options]\n"
 "\n"
@@ -466,7 +481,27 @@
 "\t\t\tपासवर्डहरू गुप्तिकृत भएको हुदैन\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: अवैध संख्यात्मक तर्क '%s'\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: -a फ्ल्याग -G फ्ल्याग संग मात्र अनुमति छ\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: समूह फाइल ताल्चा मार्न सकिदैन\n"
 
@@ -511,26 +546,6 @@
 msgstr "%s: पासवर्ड फाइल अद्यावधिक गर्दा त्रुटि\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"उपयोग: पासवर्ड परिवर्तन गर्नुहोस् [options]\n"
-"\n"
-"विकल्पहरू:\n"
-"  -e, --गुप्तिकृत\tआपूर्ति भएका पासवर्डहरू गुप्तिकृत छन\n"
-"  -h, --मद्दत\t\tले यो मद्दत संदेशलाई प्रदर्शित र बन्द गर्छ\n"
-"  -m, --md5\t\tले DES को सट्टामा MD5 प्रयोग गर्छ जब आपूर्ति भएको\n"
-"\t\t\tपासवर्डहरू गुप्तिकृत भएको हुदैन\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: पासवर्ड फाइलमा ताल्चा मार्न सकिदैन\n"
 
@@ -661,9 +676,21 @@
 msgstr "तपाईँ को हो ?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: फाइल खोल्न सकिएन\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "अज्ञात समूह: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: फाइल खोल्न सकिएन\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: स्याडो फाइल खोल्न सकिएन\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "समूह %s मा प्रयोगकर्ता %s थप गरिदैछ\n"
@@ -706,10 +733,6 @@
 msgstr "%s: स्याडो ताल्चा प्राप्त गर्न सकिएन\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: फाइल खोल्न सकिएन\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: प्रविष्टि अद्यावधिक गर्न सकिएन\n"
 
@@ -800,10 +823,6 @@
 msgstr "%s: स्याडो समूह फाइल खोल्न असक्षम भयो\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: अवैध संख्यात्मक तर्क '%s'\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K लाई KEY=VALUE को आवश्यक पर्दछ\n"
 
@@ -1203,17 +1222,25 @@
 msgstr "अज्ञात GID: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "पासवर्ड फाइल होइन\n"
+msgid "Invalid password."
+msgstr "पुरानो पासवर्ड: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "अति धेरै समूहहरू\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "उपयोग: %s [आगत]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: /etc/passwd ताल्चा मार्न सकिएन ।\n"
@@ -1311,6 +1338,14 @@
 msgid "Old password: "
 msgstr "पुरानो पासवर्ड: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"नयाँ पासवर्ड प्रविष्ट गर्नुहोस् (%d को न्युनतम, %d को अधिक्तम क्यारेक्टरहरू)\n"
+"कृपया सानो र ठूलो अक्षरहरू र नम्बरहरुको मिलान प्रयोग गर्नुहोस् ।\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1351,6 +1386,12 @@
 msgstr "%s: स्मृति भन्दा बाहिर\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: रेपोजिटरी %s समर्थित छैन\n"
 
@@ -1633,6 +1674,14 @@
 "  -u, --uid UID\t\t\t नयाँ प्रयोगकर्ता खाताको लागि UID प्रयोग गर्न जोड दिन्छ\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: update_group मा स्मृति भन्दा बाहिर\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: gshadow_group मा स्मृति भन्दा बाहिर\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u अद्वितिय होइन\n"
@@ -1789,6 +1838,10 @@
 msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgstr "%s: समूह %s हटाउन सकिदैन जुन अर्को प्रयोगकर्ताको लागि प्राथमिक समूह हो ।\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: समूह प्रविष्टि अद्यावधिक गर्दा त्रुटि\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: समूह फाइल खोल्न सकिदैन\n"
@@ -1884,15 +1937,11 @@
 "  -U, --unlock\t\t\tप्रयोगकर्ता खाताको ताल्चा खोल्नुहोस्\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: update_group मा स्मृति भन्दा बाहिर\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: नयाँ समूह प्रविष्टि थप गर्दा त्रुटि\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: gshadow_group मा स्मृति भन्दा बाहिर\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: झण्डाहरू दिएको छैन\n"
 
@@ -1901,8 +1950,8 @@
 msgstr "%s: -e र -f को लागि स्याडो पासवर्डहरुको आवश्यक छ\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: -a फ्ल्याग -G फ्ल्याग संग मात्र अनुमति छ\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -1990,6 +2039,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: पुन:भण्डारण गर्न सकिदैन %s: %s (तपाईँको परिवर्तनहरू %s मा छ)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "उपयोग: पासवर्ड परिवर्तन गर्नुहोस् [options]\n"
+#~ "\n"
+#~ "विकल्पहरू:\n"
+#~ "  -e, --गुप्तिकृत\tआपूर्ति भएका पासवर्डहरू गुप्तिकृत छन\n"
+#~ "  -h, --मद्दत\t\tले यो मद्दत संदेशलाई प्रदर्शित र बन्द गर्छ\n"
+#~ "  -m, --md5\t\tले DES को सट्टामा MD5 प्रयोग गर्छ जब आपूर्ति भएको\n"
+#~ "\t\t\tपासवर्डहरू गुप्तिकृत भएको हुदैन\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "पासवर्ड फाइल होइन\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "उपयोग: %s [आगत]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "माफ दिनुहोस् ।\n"
 

Modified: upstream/trunk/po/nl.po
===================================================================
--- upstream/trunk/po/nl.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/nl.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-11-03 12:21+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -17,6 +17,15 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Kon geen ruimte toewijzen voor de configuratie-info.\n"
 
@@ -143,6 +152,12 @@
 msgstr "Onjuist wachtwoord voor '%s'.\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Kan niet van map veranderen (cd) naar '%s'\n"
 
@@ -447,27 +462,46 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Kan het wachtwoordbestand niet ontgrendelen.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
 "Gebruik: chpasswd [opties]\n"
 "\n"
 "Opties:\n"
 "  -e, --encrypted\topgegeven wachtwoorden zijn versleuteld\n"
 "  -h, --help\t\ttoon dit bericht en sluit af\n"
-"  -m, --md5\t\tmaak gebruik van MD5-versleuteling wanneer\n"
-"\t\t\tde opgegeven wachtwoorden niet versleuteld zijn\n"
-"\n"
+"  -m, --md5\t\tmaak gebruik van MD5-versleuteling i.p.v. DES wanneer\n"
+"\t\t\topgegeven wachtwoorden niet versleuteld zijn\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: ongeldig numeriek argument '%s'\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: optie -a is ENKEL toegestaan in combinatie met optie -G\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: kan groepbestand niet vergrendelen\n"
 
@@ -512,25 +546,6 @@
 msgstr "%s: fout tijdens bijwerken van wachtwoordbestand\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Gebruik: chpasswd [opties]\n"
-"\n"
-"Opties:\n"
-"  -e, --encrypted\topgegeven wachtwoorden zijn versleuteld\n"
-"  -h, --help\t\ttoon dit bericht en sluit af\n"
-"  -m, --md5\t\tmaak gebruik van MD5-versleuteling i.p.v. DES wanneer\n"
-"\t\t\topgegeven wachtwoorden niet versleuteld zijn\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: kan wachtwoordbestand niet vergrendelen\n"
 
@@ -662,9 +677,21 @@
 msgstr "Wie bent u?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: kan bestand niet openen\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "onbekende groep: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: kan bestand niet openen\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: kan het schaduwbestand niet openen\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Gebruiker %s wordt toegevoegd aan groep %s\n"
@@ -707,10 +734,6 @@
 msgstr "%s: kan geen schaduwvergrendeling verkrijgen\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: kan bestand niet openen\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: kan ingang niet bijwerken\n"
 
@@ -802,10 +825,6 @@
 msgstr "%s: kan schaduwgroepbestand niet openen\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: ongeldig numeriek argument '%s'\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K vereist SLEUTEL=WAARDE\n"
 
@@ -1207,17 +1226,25 @@
 msgstr "onbekende GID: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Geen wachtwoordbestand\n"
+msgid "Invalid password."
+msgstr "Oud wachtwoord: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "te veel groepen\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Gebruik: %s [invoer]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: kan /etc/passwd niet vergrendelen.\n"
@@ -1317,6 +1344,15 @@
 msgid "Old password: "
 msgstr "Oud wachtwoord: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Wat is het nieuwe wachtwoord (minimaal %d en maximaal %d tekens)?\n"
+"Dit dient te bestaan uit een combinatie van grote letters, kleine letters en "
+"cijfers.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1359,6 +1395,12 @@
 msgstr "%s: onvoldoende geheugen\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: opslagplaats %s wordt niet ondersteund\n"
 
@@ -1645,6 +1687,14 @@
 "\t\t\t\tgebruikersaccount\n"
 "  -u, --uid UID\t\t\tgebruik UID voor de nieuwe gebruikersaccount\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: onvoldoende geheugen in update_group()\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: onvoldoende geheugen in update_gshadow()\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u is niet uniek\n"
@@ -1808,6 +1858,10 @@
 "%s: kan de groep %s niet verwijderen, daar deze de primaire groep van een "
 "andere gebruiker is.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr ":%s: fout tijdens bijwerken groepingang\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: kan groepbestand niet openen\n"
@@ -1906,15 +1960,11 @@
 "  -U, --unlock\t\t\tontgrendel de gebruikersaccount\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: onvoldoende geheugen in update_group()\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: fout tijdens toevoegen nieuwe groepingang\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: onvoldoende geheugen in update_gshadow()\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: geen opties gegeven\n"
 
@@ -1923,8 +1973,8 @@
 msgstr "%s: schaduwwachtwoorden zijn vereist voor opties -e en -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: optie -a is ENKEL toegestaan in combinatie met optie -G\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -2012,6 +2062,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: kan %s niet herstellen: %s (uw aanpassingen staan in %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Gebruik: chpasswd [opties]\n"
+#~ "\n"
+#~ "Opties:\n"
+#~ "  -e, --encrypted\topgegeven wachtwoorden zijn versleuteld\n"
+#~ "  -h, --help\t\ttoon dit bericht en sluit af\n"
+#~ "  -m, --md5\t\tmaak gebruik van MD5-versleuteling wanneer\n"
+#~ "\t\t\tde opgegeven wachtwoorden niet versleuteld zijn\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Geen wachtwoordbestand\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Gebruik: %s [invoer]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Sorry.\n"
 

Modified: upstream/trunk/po/nn.po
===================================================================
--- upstream/trunk/po/nn.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/nn.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2004-06-03 21:41+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll at skulelinux.no>\n"
 "Language-Team: Norwegian (Nynorsk) <i18n-nn at lister.ping.uio.no>\n"
@@ -17,6 +17,15 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Klarte ikkje finna plass for oppsettsinformasjon.\n"
 
@@ -138,6 +147,12 @@
 msgid "Incorrect password for %s.\n"
 msgstr "Feil passord for «%s»\n"
 
+#, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Klarer ikkje cd til «%s»\n"
@@ -425,17 +440,37 @@
 
 #, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: ugyldig nummerisk argument «%s»\n"
+
 #, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr ""
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: klarer ikkje låsa gruppefil\n"
 
@@ -480,18 +515,6 @@
 msgstr "%s: feil ved oppdatering av passordfila\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: klarer ikkje låsa passordfil\n"
 
@@ -602,9 +625,21 @@
 msgstr "Kven er du?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: klarer ikkje opna fil\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "ukjent gruppe: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: klarer ikkje opna fil\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: klarer ikkje opna skuggepassordfila\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Legg brukaren %s til gruppa %s\n"
@@ -647,10 +682,6 @@
 msgstr "%s: klarer ikkje få lås på skuggefil\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: klarer ikkje opna fil\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: klarer ikkje oppdatere oppføring\n"
 
@@ -730,10 +761,6 @@
 msgstr "%s: klarer ikkje opna skuggegruppefil\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: ugyldig nummerisk argument «%s»\n"
-
-#, fuzzy, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -O krev NAME=VERDI\n"
 
@@ -1117,17 +1144,25 @@
 msgstr "ukjent GID: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Inga passordfil\n"
+msgid "Invalid password."
+msgstr "Gamalt passord:"
 
 #, c-format
 msgid "too many groups\n"
 msgstr "for mange grupper\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Bruk: %s [inndata]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: klarer ikkje låsa /etc/passwd.\n"
@@ -1204,6 +1239,14 @@
 msgid "Old password: "
 msgstr "Gamalt passord:"
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Skriv inn det nye passordet (minimum %d, maksimum %d teikn)\n"
+"Bruk ein kombinasjon av store og små bokstavar og tal.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1245,6 +1288,12 @@
 msgstr "%s: tomt for minne\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: arkiv %s er ikkje støtta\n"
 
@@ -1490,6 +1539,14 @@
 msgstr ""
 
 #, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: slapp opp for minne i update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: slapp opp for minne i update_gshadow\n"
+
+#, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: gid %u er ikkje unikt\n"
 
@@ -1636,6 +1693,10 @@
 msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgstr "%s: klarer ikkje fjerna primærgruppa til brukaren.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: feil ved oppdatering av gruppeoppføring\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: klarer ikkje opna gruppefila\n"
@@ -1709,15 +1770,11 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: slapp opp for minne i update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: feil ved oppretting av ny gruppeoppføring\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: slapp opp for minne i update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: ingen flagg oppgjeve\n"
 
@@ -1726,7 +1783,7 @@
 msgstr "%s: skuggepassord krevst for -e og -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
 #, c-format
@@ -1806,6 +1863,13 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: klarer ikkje gjenoppretta %s: %s (endringane dine er i %s)\n"
 
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Inga passordfil\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Bruk: %s [inndata]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Årsak.\n"
 

Modified: upstream/trunk/po/pl.po
===================================================================
--- upstream/trunk/po/pl.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/pl.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2005-09-05 13:05+0200\n"
 "Last-Translator: Tomasz Kłoczko <kloczek at pld.org.pl>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@ -19,6 +19,15 @@
 "|| n%100>=20) ? 1 : 2);\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Nie można przydzielić miejsca dla informacji o konfiguracji.\n"
 
@@ -148,6 +157,12 @@
 msgstr "Nieprawidłowe hasło %s.\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Nie można zmienić katalogu na '%s'\n"
 
@@ -450,28 +465,47 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Nie można usunąć blokady z pliku z hasłami.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Użycie: chgpasswd [opcje]\n"
+"Użycie: chpasswd [opcje]\n"
 "\n"
 "Opcje:\n"
 "  -e, --encrypted\tprzekazywane hasła są w postaci zakodowane\n"
 "  -h, --help\t\twyświetlenie tego opisu i zakończenie działania\n"
-"  -m, --md5\t\tużyj kodowania MD5 zamiast DES w przypadku kiedy "
-"przekazywane\n"
-"\t\t\thasła nie są zakodowane\n"
+"  -m, --md5\t\tużyj kodowania MD5 zamiast DES w przypadku kiedy\n"
+"\t\t\tprzekazywane hasła nie są zakodowane\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: nieprawidłowy argument numeryczny '%s'\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: opcja -a można użyć TYLKO z pcją -G\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: nie można zablokować pliku z grupami\n"
 
@@ -516,26 +550,6 @@
 msgstr "%s: błąd podczas aktualizacji pliku z hasłami\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Użycie: chpasswd [opcje]\n"
-"\n"
-"Opcje:\n"
-"  -e, --encrypted\tprzekazywane hasła są w postaci zakodowane\n"
-"  -h, --help\t\twyświetlenie tego opisu i zakończenie działania\n"
-"  -m, --md5\t\tużyj kodowania MD5 zamiast DES w przypadku kiedy\n"
-"\t\t\tprzekazywane hasła nie są zakodowane\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: nie można zablokować pliku z hasłami\n"
 
@@ -666,9 +680,21 @@
 msgstr "Kim jesteś?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: nie można otworzyć pliku\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "nieznana grupa: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: nie można otworzyć pliku\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Dodaję nowego użytkownika %s do grupy %s\n"
@@ -711,10 +737,6 @@
 msgstr "%s: nie można zablokować pliku z ukrytymi hasłami\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: nie można otworzyć pliku\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: nie można zaktualizować wpisu\n"
 
@@ -804,10 +826,6 @@
 msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami grup\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: nieprawidłowy argument numeryczny '%s'\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K wymaga KLUCZ=WARTOŚĆ\n"
 
@@ -1208,17 +1226,25 @@
 msgstr "nieznany GID: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Brak pliku z hasłami\n"
+msgid "Invalid password."
+msgstr "Stare hasło: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "zbyt wiele grup\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Użycie: %s [wejście]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: nie można zablokować /etc/passwd.\n"
@@ -1320,6 +1346,14 @@
 msgid "Old password: "
 msgstr "Stare hasło: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Wpisz nowe hasło (minimum %d, maksimum %d znaków)\n"
+"Proszę użyj kombinacji wielkich i małych znaków oraz cyfr.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1360,6 +1394,12 @@
 msgstr "%s: brak pamięci\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: repozytorium %s nie jest obsługiwane\n"
 
@@ -1641,6 +1681,14 @@
 "  -u, --uid UID\t\t\twymuś użycie konkretnego UID dla nowo tworzonego konta\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: zabrakło pamięci w update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: zabrakło pamięci w update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u nie jest niepowtarzalny\n"
@@ -1801,6 +1849,10 @@
 "%s: nie można usunąć grupy %s która jest grupą podstawową\n"
 "dla innego użytkownika.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: błąd podczas aktualizacji wpisu grupy\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: nie można otworzyć pliku z grupami\n"
@@ -1896,15 +1948,11 @@
 "  -U, --unlock\t\t\todblokuj konto użytkownika\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: zabrakło pamięci w update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: błąd podczas dodawania nowej grupy\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: zabrakło pamięci w update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: nie podano flag\n"
 
@@ -1913,8 +1961,8 @@
 msgstr "%s: ukryte hasła wymagane dla -e i -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: opcja -a można użyć TYLKO z pcją -G\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -2003,6 +2051,33 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: nie można odzyskać %s: %s (twoje zmiany są w %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Użycie: chgpasswd [opcje]\n"
+#~ "\n"
+#~ "Opcje:\n"
+#~ "  -e, --encrypted\tprzekazywane hasła są w postaci zakodowane\n"
+#~ "  -h, --help\t\twyświetlenie tego opisu i zakończenie działania\n"
+#~ "  -m, --md5\t\tużyj kodowania MD5 zamiast DES w przypadku kiedy "
+#~ "przekazywane\n"
+#~ "\t\t\thasła nie są zakodowane\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Brak pliku z hasłami\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Użycie: %s [wejście]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Wybacz.\n"
 

Modified: upstream/trunk/po/pt.po
===================================================================
--- upstream/trunk/po/pt.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/pt.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-06-22 18:56+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -16,6 +16,15 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Não foi possível alocar o espaço para a informação de configuração.\n"
 
@@ -138,6 +147,12 @@
 msgstr "Password incorrecta para %s.\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Não foi possível mudar para o directório '%s'\n"
 
@@ -447,27 +462,47 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Não é possível libertar o ficheiro de passwords.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Utilização: chgpasswd [opções]\n"
+"Utilização: chpasswd [opções]\n"
 "\n"
 "Opções:\n"
 "  -e, --encrypted\tas passwords fornecidas são encriptadas\n"
-"  -h, --help\t\tmostrar esta mensagem de ajuda e sair\n"
+"  -h, --help\t\tmostra esta mensagem de ajuda e sai\n"
 "  -m, --md5\t\tutilizar encriptação MD5 em vez de DES quando as passwords\n"
-"\t\t\tfornecidas não forem encriptadas\n"
+"\t\t\tfornecidas não são encriptadas\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: argumento numérico inválido '%s'\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: -a flag é permitida APENAS com a flag -G\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: não é possível obter acesso exclusivo ao ficheiro dos grupos\n"
 
@@ -512,26 +547,6 @@
 msgstr "%s: erro a actualizar o ficheiro de passwords\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Utilização: chpasswd [opções]\n"
-"\n"
-"Opções:\n"
-"  -e, --encrypted\tas passwords fornecidas são encriptadas\n"
-"  -h, --help\t\tmostra esta mensagem de ajuda e sai\n"
-"  -m, --md5\t\tutilizar encriptação MD5 em vez de DES quando as passwords\n"
-"\t\t\tfornecidas não são encriptadas\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: não é possível obter acesso exclusivo ao ficheiro de passwords\n"
 
@@ -662,9 +677,21 @@
 msgstr "Quem é você?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: não é possível abrir o ficheiro\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "grupo desconhecido: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: não é possível abrir o ficheiro\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: não é possível abrir o ficheiro shadow\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "A adicionar o utilizador %s ao grupo %s\n"
@@ -707,10 +734,6 @@
 msgstr "%s: não é possível obter acesso exclusivo a shadow\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: não é possível abrir o ficheiro\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: não é possível actualizar o registo\n"
 
@@ -801,10 +824,6 @@
 msgstr "%s: não é possível abrir o ficheiro de shadow dos grupos\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: argumento numérico inválido '%s'\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K necessita de KEY=VALOR\n"
 
@@ -1207,17 +1226,25 @@
 msgstr "GID desconhecido: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Ficheiro de passwords não existe\n"
+msgid "Invalid password."
+msgstr "Password antiga: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "demasiados grupos\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Utilização: %s [input]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: não é possível obter acesso exclusivo a /etc/passwd.\n"
@@ -1317,6 +1344,15 @@
 msgid "Old password: "
 msgstr "Password antiga: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Introduza a nova password (minimo de %d, máximo de %d caracteres)\n"
+"Por favor utilize um combinação de letras maiúsculas e minúsculas e de "
+"números.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1358,6 +1394,12 @@
 msgstr "%s: falta de memória\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: o repositório %s não é suportado\n"
 
@@ -1644,6 +1686,14 @@
 "\t\t\t\tutilizador\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: falta de memória em update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: falta de memória em update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u não é único\n"
@@ -1808,6 +1858,10 @@
 msgstr ""
 "%s: não é possível remover %s que é o grupo primário para outro utilizador.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: erro ao actualizar o registo do grupo\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: não é possível abrir o ficheiro dos grupos\n"
@@ -1907,15 +1961,11 @@
 "  -U, --unlock\t\t\tdesbloquear a conta do utilizador\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: falta de memória em update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: erro ao adicionar o registo do novo grupo\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: falta de memória em update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: não foram especificadas flags\n"
 
@@ -1924,8 +1974,8 @@
 msgstr "%s: é necessária passwords shadow para -e e -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: -a flag é permitida APENAS com a flag -G\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -2012,6 +2062,33 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: não é possível restaurar %s: %s (a suas alterações estão em %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Utilização: chgpasswd [opções]\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -e, --encrypted\tas passwords fornecidas são encriptadas\n"
+#~ "  -h, --help\t\tmostrar esta mensagem de ajuda e sair\n"
+#~ "  -m, --md5\t\tutilizar encriptação MD5 em vez de DES quando as "
+#~ "passwords\n"
+#~ "\t\t\tfornecidas não forem encriptadas\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Ficheiro de passwords não existe\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Utilização: %s [input]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Desculpe.\n"
 

Modified: upstream/trunk/po/pt_BR.po
===================================================================
--- upstream/trunk/po/pt_BR.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/pt_BR.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.15\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-03-12 12:33-0300\n"
 "Last-Translator: André Luís Lopes <andrelop at debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -16,6 +16,15 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Não foi possível alocar espaço para a informação de configuração.\n"
 
@@ -141,6 +150,12 @@
 msgid "Incorrect password for %s.\n"
 msgstr "Senha incorreta para %s.\n"
 
+#, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Não foi possível entrar em \"%s\"\n"
@@ -448,27 +463,47 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Não foi possível remover o locak do arquivo de senhas.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Uso: chgpasswd [opções]\n"
+"Uso: chpasswd [opções]\n"
 "\n"
 "Opções:\n"
 "  -e, --encrypted\tsenhas fornecidas estão encriptadas\n"
 "  -h, --help\t\texibir esta mensagem de ajuda e finalizar\n"
-"  -m, --md5\t\tutilizar encriptação MD5 ao invés de DES quando as\n"
+"  -m, --md5\t\tutilizar ecriptação MD5 ao invés de DES quando as\n"
 "\t\t\tsenhas fornecidas não estiverem encriptadas\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s : argumento numérico `%s' inválido\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: flag -a é permitida SOMENTE com a flag -G\n"
+
 #, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s : não foi possível obter lock no arquivo de grupo\n"
 
@@ -513,26 +548,6 @@
 msgstr "%s : erro atualizando arquivo de senhas\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Uso: chpasswd [opções]\n"
-"\n"
-"Opções:\n"
-"  -e, --encrypted\tsenhas fornecidas estão encriptadas\n"
-"  -h, --help\t\texibir esta mensagem de ajuda e finalizar\n"
-"  -m, --md5\t\tutilizar ecriptação MD5 ao invés de DES quando as\n"
-"\t\t\tsenhas fornecidas não estiverem encriptadas\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s : não foi possível obter lock em arquivo de senhas\n"
 
@@ -656,9 +671,21 @@
 msgstr "Quem é você ?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s : não foi possível abrir arquivo\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "grupo desconhecido : %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s : não foi possível abrir arquivo\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s : não foi possível abrir arquivo shadow\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Adicionando usuário %s ao grupo %s\n"
@@ -701,10 +728,6 @@
 msgstr "%s : nõ foi possível obter lock shadow\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s : não foi possível abrir arquivo\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s : não foi possível atualizar entrada\n"
 
@@ -794,10 +817,6 @@
 msgid "%s: unable to open shadow group file\n"
 msgstr "%s : não foi possível abrir arquivo de grupo shadow\n"
 
-#, fuzzy, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s : argumento numérico `%s' inválido\n"
-
 #, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s : -K requer CHAVE=VALOR\n"
@@ -1200,17 +1219,25 @@
 msgstr "GID desconhecido : %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Sem arquivo de senhas\n"
+msgid "Invalid password."
+msgstr "Senha antiga : "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "muitos grupos\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Uso : %s [entrada]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s : não foi possível obter de /etc/passwd.\n"
@@ -1310,6 +1337,15 @@
 msgid "Old password: "
 msgstr "Senha antiga : "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Informe a nova senha (mínimo de %d, máximo de %d caracteres)\n"
+"Por favor, use uma combinação de letras em maiúsculas e minúsculas\n"
+"e de números.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1351,6 +1387,12 @@
 msgstr "%s : sem memória\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s : repositório %s não suportado\n"
 
@@ -1637,6 +1679,14 @@
 "  -u, --uid UID\t\t\tforça o uso de UID para a nova conta de usuário\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s : sem memória em update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s : sem memória em update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s : UID %u não é único\n"
@@ -1788,6 +1838,10 @@
 "%s : Não foi possível remover grupo %s, o qual é um grupo primário de outro "
 "usuário.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s : erro atualizando entrada de grupo\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s : não foi possível abrir arquivo de grupo\n"
@@ -1884,15 +1938,11 @@
 "  -U, --unlock\t\t\tdestravar a conta de usuário\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s : sem memória em update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s : erro adicionando nova entrada de grupo\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s : sem memória em update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s : nenhuma flag informada\n"
 
@@ -1901,8 +1951,8 @@
 msgstr "%s : senhas shadow necessárias para -e e -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: flag -a é permitida SOMENTE com a flag -G\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -1990,6 +2040,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s : não foi possível restaurar %s : %s (suas mudanças estão em %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: chgpasswd [opções]\n"
+#~ "\n"
+#~ "Opções:\n"
+#~ "  -e, --encrypted\tsenhas fornecidas estão encriptadas\n"
+#~ "  -h, --help\t\texibir esta mensagem de ajuda e finalizar\n"
+#~ "  -m, --md5\t\tutilizar encriptação MD5 ao invés de DES quando as\n"
+#~ "\t\t\tsenhas fornecidas não estiverem encriptadas\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Sem arquivo de senhas\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Uso : %s [entrada]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Desculpe.\n"
 

Modified: upstream/trunk/po/ro.po
===================================================================
--- upstream/trunk/po/ro.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/ro.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-06-25 12:36+0300\n"
 "Last-Translator: Sorin Batariuc <sorin at bonbon.net>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
@@ -18,6 +18,15 @@
 "X-Generator: KBabel 1.10.2\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Nu pot aloca spaţiu pentru informaţiile despre configurare.\n"
 
@@ -144,6 +153,12 @@
 msgstr "Parolă incorectă pentru %s.\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Nu pot schimba directorul către'%s'\n"
 
@@ -448,27 +463,46 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Nu pot debloca fişierul passwd.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Folosire: chgpasswd [opţiuni]\n"
+"Folosire: chpasswd [opţiuni]\n"
 "\n"
 "Opţiuni:\n"
 "  -e, --encrypted\tparolele oferite sunt criptate\n"
 "  -h, --help\t\tafişează acest mesaj de ajutor şi ieşi\n"
 "  -m, --md5\t\tfoloseşte criptarea MD5 în loc de DES atunci când parolele\n"
 "\t\t\toferite nu sunt criptate\n"
-"\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: argument numeric nevalid '%s'\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: semnalizatorul -a este permis DOAR împreună cu semnalizatorul -G\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: nu pot încuia fişierul de grupuri\n"
 
@@ -513,25 +547,6 @@
 msgstr "%s: eroare la actualizarea fişierului passwd\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Folosire: chpasswd [opţiuni]\n"
-"\n"
-"Opţiuni:\n"
-"  -e, --encrypted\tparolele oferite sunt criptate\n"
-"  -h, --help\t\tafişează acest mesaj de ajutor şi ieşi\n"
-"  -m, --md5\t\tfoloseşte criptarea MD5 în loc de DES atunci când parolele\n"
-"\t\t\toferite nu sunt criptate\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: nu pot închide fişierul passwd\n"
 
@@ -666,9 +681,21 @@
 msgstr "Cine sunteţi?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: nu pot deschide fişierul\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "grup necunoscut: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: nu pot deschide fişierul\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: nu pot deschide fişierul shadow\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Adaug utilizatorul %s la grupul %s\n"
@@ -711,10 +738,6 @@
 msgstr "%s: nu pot obţine închiderea shadow\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: nu pot deschide fişierul\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: nu pot actualiza intrarea\n"
 
@@ -805,10 +828,6 @@
 msgstr "%s: nu pot deschide fişierul gshadow\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: argument numeric nevalid '%s'\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K cere KEY=VALUE\n"
 
@@ -1212,17 +1231,25 @@
 msgstr "GID necunoscut: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Fără fişier passwd\n"
+msgid "Invalid password."
+msgstr "Parola veche: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "prea multe grupuri\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Utilizare: %s [input]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: nu pot încuia /etc/passwd.\n"
@@ -1321,6 +1348,14 @@
 msgid "Old password: "
 msgstr "Parola veche: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Introduceţi noua parolă (minimum %d, maximum %d caractere)\n"
+"Vă rog utilizaţi o combinaţie de litere mari şi mici şi numere.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1362,6 +1397,12 @@
 msgstr "%s: nu mai este memorie\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: depozitul %s nu este suportat\n"
 
@@ -1647,6 +1688,14 @@
 "  -u, --uid UID\t\t\tforţează utilizarea UID pentru noul cont utilizator\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: nu mai este memorie pentru update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: nu mai este memorie pentru update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u nu este unic\n"
@@ -1807,6 +1856,10 @@
 msgstr ""
 "%s: Nu pot şterge grupul %s care este un grup primar pentru alt utilizator.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: eroare la actualizarea intrărilor de grupuri\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: nu pot deschide fişierul de grupuri\n"
@@ -1904,15 +1957,11 @@
 "  -U, --unlock\t\t\tdeblochează contul utilizator\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: nu mai este memorie pentru update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: eroare la adăugarea unei noi intrări de grup\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: nu mai este memorie pentru update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: nu s-au atribuit semnalizatoare\n"
 
@@ -1921,8 +1970,8 @@
 msgstr "%s: sunt necesare parole criptate pentru -e şi -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: semnalizatorul -a este permis DOAR împreună cu semnalizatorul -G\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -2011,6 +2060,33 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: nu pot reface %s: %s (schimbările dvs. sunt în %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Folosire: chgpasswd [opţiuni]\n"
+#~ "\n"
+#~ "Opţiuni:\n"
+#~ "  -e, --encrypted\tparolele oferite sunt criptate\n"
+#~ "  -h, --help\t\tafişează acest mesaj de ajutor şi ieşi\n"
+#~ "  -m, --md5\t\tfoloseşte criptarea MD5 în loc de DES atunci când "
+#~ "parolele\n"
+#~ "\t\t\toferite nu sunt criptate\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Fără fişier passwd\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Utilizare: %s [input]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Scuze.\n"
 

Modified: upstream/trunk/po/ru.po
===================================================================
--- upstream/trunk/po/ru.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/ru.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: 1:4.0.18.2-1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2007-11-21 21:02+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -16,15 +16,26 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Не удалось выделить память для загрузки конфигурации.\n"
 
 #, c-format
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
-msgstr "Ошибка конфигурации: неизвестный элемент '%s' (сообщите администратору)\n"
+msgstr ""
+"Ошибка конфигурации: неизвестный элемент '%s' (сообщите администратору)\n"
 
 #, c-format
 msgid "Warning: unknown group %s\n"
@@ -145,11 +156,18 @@
 msgstr "Неверный пароль для %s.\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Невозможно перейти в каталог '%s'\n"
 
 msgid "No directory, logging in with HOME=/"
-msgstr "Каталог отсутствует или недоступен, вход в систему выполняется с HOME=/"
+msgstr ""
+"Каталог отсутствует или недоступен, вход в систему выполняется с HOME=/"
 
 #, c-format
 msgid "Cannot execute %s"
@@ -164,7 +182,8 @@
 msgstr "Не удалось изменить корневой каталог на '%s'\n"
 
 msgid "No utmp entry.  You must exec \"login\" from the lowest level \"sh\""
-msgstr "Нет записи в utmp. Вы запускать \"login\" из самого первого уровня \"sh\""
+msgstr ""
+"Нет записи в utmp. Вы запускать \"login\" из самого первого уровня \"sh\""
 
 msgid "Unable to determine your tty name."
 msgstr "Не удалось определить название вашего tty."
@@ -218,7 +237,8 @@
 
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
-msgstr "Введите новое значение или нажмите ВВОД для выбора значения по умолчанию\n"
+msgstr ""
+"Введите новое значение или нажмите ВВОД для выбора значения по умолчанию\n"
 
 msgid "Minimum Password Age"
 msgstr "Минимальный срок действия пароля (дней)"
@@ -272,7 +292,8 @@
 
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
-msgstr "Количество дней с предупреждением перед деактивированием пароля\t: %ld\n"
+msgstr ""
+"Количество дней с предупреждением перед деактивированием пароля\t: %ld\n"
 
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
@@ -447,16 +468,16 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Не удалось разблокировать файл паролей.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
 "Использование: chpasswd [параметры]\n"
 "\n"
@@ -464,10 +485,30 @@
 "  -e, --encrypted\tвводится уже шифрованный пароль\n"
 "  -h, --help\t\tпоказать это сообщение и завершить работу программы\n"
 "  -m, --md5\t\tиспользовать шифрование MD5 вместо DES, если пароль\n"
-"\t\t\tвводится нешифрованным\n"
+"\t\t\tвводится не шифрованным\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: неверный числовой параметр '%s'\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: флаг -a используется ТОЛЬКО вместе с флагом -G\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: не удалось заблокировать файл групп\n"
 
@@ -512,26 +553,6 @@
 msgstr "%s: не удалось обновить файл паролей\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Использование: chpasswd [параметры]\n"
-"\n"
-"Параметры:\n"
-"  -e, --encrypted\tвводится уже шифрованный пароль\n"
-"  -h, --help\t\tпоказать это сообщение и завершить работу программы\n"
-"  -m, --md5\t\tиспользовать шифрование MD5 вместо DES, если пароль\n"
-"\t\t\tвводится не шифрованным\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: не удалось заблокировать файл паролей\n"
 
@@ -665,9 +686,21 @@
 msgstr "Вы кто?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: не удалось открыть файл\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "неизвестная группа: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: не удалось открыть файл\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: не удалось открыть теневой файл паролей\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Добавление пользователя %s в группу %s\n"
@@ -710,10 +743,6 @@
 msgstr "%s: не удалось осуществить файла shadow\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: не удалось открыть файл\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: не удалось обновить файл\n"
 
@@ -804,10 +833,6 @@
 msgstr "%s: не удалось открыть теневой файл групп\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: неверный числовой параметр '%s'\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: для -К необходимо ИМЯ=ЗНАЧЕНИЕ\n"
 
@@ -1206,17 +1231,26 @@
 msgid "unknown GID: %lu\n"
 msgstr "неизвестный GID: %lu\n"
 
-msgid "No password.\n"
-msgstr "Нет пароля.\n"
+#, fuzzy
+msgid "Invalid password."
+msgstr "Старый пароль: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "слишком много групп\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Использование: %s [файл]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: не удалось заблокировать /etc/passwd.\n"
@@ -1315,6 +1349,14 @@
 msgid "Old password: "
 msgstr "Старый пароль: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Введите новый пароль (минимальная длина %d, максимальная длина %d символов)\n"
+" Используйте комбинацию из символов в верхнем и нижнем регистре и цифр.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1356,6 +1398,12 @@
 msgstr "%s: нехватка памяти\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: хранилище %s не поддерживается\n"
 
@@ -1381,7 +1429,8 @@
 
 #, c-format
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
-msgstr "Использование: %s [-q] [-r] [-s] [файл паролей [теневой файл паролей]]\n"
+msgstr ""
+"Использование: %s [-q] [-r] [-s] [файл паролей [теневой файл паролей]]\n"
 
 #, c-format
 msgid "invalid password file entry\n"
@@ -1644,6 +1693,14 @@
 "\t\t\t\tучётной записи\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: недостаточно памяти в update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: недостаточно памяти в update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u уже существует\n"
@@ -1744,7 +1801,8 @@
 msgstr "Создание почтового ящика"
 
 #, c-format
-msgid "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
+msgid ""
+"Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
 "Не найдена группа 'mail'. Создаётся пользовательский почтовый ящик с правами "
 "0600.\n"
@@ -1757,7 +1815,8 @@
 msgstr "%s: пользователь %s существует\n"
 
 #, c-format
-msgid "%s: group %s exists - if you want to add this user to that group, use -g.\n"
+msgid ""
+"%s: group %s exists - if you want to add this user to that group, use -g.\n"
 msgstr ""
 "%s: группа %s существует -- для добавления в неё этого пользователя, "
 "используйте -g.\n"
@@ -1802,6 +1861,10 @@
 "%s: невозможно удалить группу %s, так как она является первичной для другого "
 "пользователя.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: не удалось обновить запись в файле групп\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: не удалось открыть файл групп\n"
@@ -1840,7 +1903,8 @@
 
 #, c-format
 msgid "%s: not removing directory %s (would remove home of user %s)\n"
-msgstr "%s: каталог %s не удалён (является домашним каталогом пользователя %s)\n"
+msgstr ""
+"%s: каталог %s не удалён (является домашним каталогом пользователя %s)\n"
 
 #, c-format
 msgid "%s: error removing directory %s\n"
@@ -1902,15 +1966,11 @@
 "  -U, --unlock\t\t\tразблокировать учётную запись\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: недостаточно памяти в update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: не удалось добавить новую группу\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: недостаточно памяти в update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: на заданы ключи\n"
 
@@ -1919,8 +1979,8 @@
 msgstr "%s: для -e и -f требуется поддержка теневых файлов паролей\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: флаг -a используется ТОЛЬКО вместе с флагом -G\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -2009,3 +2069,27 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: не удалось восстановить %s: %s (ваши изменения в %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Использование: chpasswd [параметры]\n"
+#~ "\n"
+#~ "Параметры:\n"
+#~ "  -e, --encrypted\tвводится уже шифрованный пароль\n"
+#~ "  -h, --help\t\tпоказать это сообщение и завершить работу программы\n"
+#~ "  -m, --md5\t\tиспользовать шифрование MD5 вместо DES, если пароль\n"
+#~ "\t\t\tвводится нешифрованным\n"
+#~ "\n"
+
+#~ msgid "No password.\n"
+#~ msgstr "Нет пароля.\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Использование: %s [файл]\n"

Modified: upstream/trunk/po/sk.po
===================================================================
--- upstream/trunk/po/sk.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/sk.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-06-23 11:05+0200\n"
 "Last-Translator: Peter Mann <Peter.Mann at tuke.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -14,6 +14,15 @@
 "Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Na konfiguračné údaje sa nedá vyhradiť dostatok miesta.\n"
 
@@ -143,6 +152,12 @@
 msgstr "Chybné heslo pre %s.\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Aktuálny adresár sa nedá nastaviť na '%s'\n"
 
@@ -449,27 +464,46 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Súbor s heslami sa nedá odomknúť.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Použitie: chgpasswd [voľby]\n"
+"Použitie: chpasswd [voľby]\n"
 "\n"
 "Voľby:\n"
 "  -e, --encrypted\tzadané heslá sú zakódované\n"
 "  -h, --help\t\tvypíše túto nápovedu a ukončí sa\n"
 "  -m, --md5\t\tpoužije MD5 kódovanie namiesto DES, ak zadané\n"
 "\t\t\theslá nie sú zakódované\n"
-"\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: chybný číselný parameter '%s'\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: prepínač -a je dovolený IBA s prepínačom -G\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: súbor so skupinami sa nedá zamknúť\n"
 
@@ -514,25 +548,6 @@
 msgstr "%s: chyba pri aktualizácii súboru s heslami\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Použitie: chpasswd [voľby]\n"
-"\n"
-"Voľby:\n"
-"  -e, --encrypted\tzadané heslá sú zakódované\n"
-"  -h, --help\t\tvypíše túto nápovedu a ukončí sa\n"
-"  -m, --md5\t\tpoužije MD5 kódovanie namiesto DES, ak zadané\n"
-"\t\t\theslá nie sú zakódované\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: súbor s heslami sa nedá zamknúť\n"
 
@@ -664,9 +679,21 @@
 msgstr "Kto ste?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: nedá sa otvoriť súbor\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "skupina %s je neznáma\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: nedá sa otvoriť súbor\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: súbor s tieňovými heslami sa nedá otvoriť\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Pridávam používateľa %s do skupiny %s.\n"
@@ -709,10 +736,6 @@
 msgstr "%s: nedá sa získať zámok pre súbor s tieňovými heslami\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: nedá sa otvoriť súbor\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: položka sa nedá aktualizovať\n"
 
@@ -803,10 +826,6 @@
 msgstr "%s: súbor s tieňovými skupinami sa nedá otvoriť\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: chybný číselný parameter '%s'\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: prepínač -K vyžaduje argument typu MENO=HODNOTA\n"
 
@@ -1208,17 +1227,25 @@
 msgstr "neznámy GID %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Súbor s heslami neexistuje\n"
+msgid "Invalid password."
+msgstr "Staré heslo: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "príliš mnoho skupín\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Použitie: %s [vstup]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: súbor /etc/passwd sa nedá zamknúť\n"
@@ -1318,6 +1345,14 @@
 msgid "Old password: "
 msgstr "Staré heslo: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Zadajte nové heslo (počet znakov v intervale %d až %d).\n"
+"Použijte kombináciu veľkých a malých písmen s číslicami.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1358,6 +1393,12 @@
 msgstr "%s: nedostatok pamäti\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: skladisko %s nie je podporované\n"
 
@@ -1640,6 +1681,14 @@
 "  -u, --uid UID\t\t\tvynúti použitie tohto UID pre nový účet\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s nedostatok pamäti v update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: nedostatok pamäti v update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u nie je jedinečný\n"
@@ -1801,6 +1850,10 @@
 "%s: skupina %s sa nedá odstrániť, pretože je primárnou skupinou iného "
 "používateľa.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: položka súboru so skupinami sa nedá aktualizovať\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: súbor so skupinami sa nedá otvoriť\n"
@@ -1898,15 +1951,11 @@
 "  -U, --unlock\t\t\todblokuje používateľský účet\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s nedostatok pamäti v update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: chyba pri pridávaní položky do súboru so skupinami\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: nedostatok pamäti v update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: žiadne prepínače\n"
 
@@ -1915,8 +1964,8 @@
 msgstr "%s: prepínače -e a -f vyžadujú tieňové heslá\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: prepínač -a je dovolený IBA s prepínačom -G\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -2005,6 +2054,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: %s sa nedá obnoviť: %s (zmeny sú v %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Použitie: chgpasswd [voľby]\n"
+#~ "\n"
+#~ "Voľby:\n"
+#~ "  -e, --encrypted\tzadané heslá sú zakódované\n"
+#~ "  -h, --help\t\tvypíše túto nápovedu a ukončí sa\n"
+#~ "  -m, --md5\t\tpoužije MD5 kódovanie namiesto DES, ak zadané\n"
+#~ "\t\t\theslá nie sú zakódované\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Súbor s heslami neexistuje\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Použitie: %s [vstup]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Ľutujem.\n"
 

Modified: upstream/trunk/po/sq.po
===================================================================
--- upstream/trunk/po/sq.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/sq.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.3\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2004-11-20 03:28+0100\n"
 "Last-Translator: Elian Myftiu <pinguini AT fastwebnet DOT it>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit at lists.sourceforge.net>\n"
@@ -18,6 +18,15 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr ""
 
@@ -139,6 +148,12 @@
 msgstr ""
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr ""
 
@@ -422,17 +437,37 @@
 
 #, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr ""
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr ""
 
@@ -477,18 +512,6 @@
 msgstr ""
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr ""
 
@@ -599,10 +622,22 @@
 msgstr ""
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr ""
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr ""
 
 #, c-format
+msgid "%s: can't close file\n"
+msgstr ""
+
+#, c-format
+msgid "%s: can't close shadow file\n"
+msgstr ""
+
+#, c-format
 msgid "Adding user %s to group %s\n"
 msgstr ""
 
@@ -644,10 +679,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr ""
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr ""
 
@@ -727,10 +758,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr ""
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr ""
 
@@ -1101,7 +1128,7 @@
 msgstr ""
 
 #, fuzzy
-msgid "No password.\n"
+msgid "Invalid password."
 msgstr "   Zgjidh një fjalëkalim të ri.\n"
 
 #, c-format
@@ -1109,9 +1136,17 @@
 msgstr ""
 
 #, c-format
-msgid "Usage: %s [input]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
 msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr ""
@@ -1190,6 +1225,12 @@
 
 #, c-format
 msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+
+#, c-format
+msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
 "Please use a combination of upper and lower case letters and numbers.\n"
 msgstr ""
@@ -1224,6 +1265,12 @@
 msgstr ""
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr ""
 
@@ -1464,6 +1511,14 @@
 msgstr ""
 
 #, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr ""
+
+#, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr ""
 
@@ -1609,6 +1664,10 @@
 msgstr ""
 
 #, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr ""
+
+#, c-format
 msgid "%s: cannot open group file\n"
 msgstr ""
 
@@ -1681,14 +1740,10 @@
 msgstr ""
 
 #, c-format
-msgid "%s: out of memory in update_group\n"
+msgid "%s: error adding new shadow group entry\n"
 msgstr ""
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr ""
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr ""
 
@@ -1697,7 +1752,7 @@
 msgstr ""
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
 #, c-format

Modified: upstream/trunk/po/sv.po
===================================================================
--- upstream/trunk/po/sv.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/sv.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-07-19 12:18+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -17,6 +17,15 @@
 "Plural-Forms: nplurals=2; plural=n != 1\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Kunde inte allokera plats för konfigurationsinformationen.\n"
 
@@ -142,6 +151,12 @@
 msgstr "Felaktigt lösenord för %s.\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Kunde inte byta katalog till \"%s\"\n"
 
@@ -442,27 +457,47 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Kan inte låsa upp lösenordsfilen.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Användning: chgpasswd [flaggor]\n"
+"Användning: chpasswd [flaggor]\n"
 "\n"
 "Flaggor:\n"
 "  -e, --encrypted\tangivna lösenord är krypterade\n"
-"  -h, --help\t\tvisa detta hjälpmeddelande och avsluta\n"
+"  -h, --help\t\tvisa detta hjälpmeddelande och avsluta.\n"
 "  -m, --md5\t\tanvänd MD5-kryptering istället för DES när de\n"
 "\t\t\tangivna lösenorden inte är krypterade\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: ogiltigt numeriskt argument \"%s\"\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: -a flaggan är BARA tillåten med -G flaggan\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: kan inte låsa gruppfilen\n"
 
@@ -507,26 +542,6 @@
 msgstr "%s: fel vid uppdatering av lösenordsfil\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Användning: chpasswd [flaggor]\n"
-"\n"
-"Flaggor:\n"
-"  -e, --encrypted\tangivna lösenord är krypterade\n"
-"  -h, --help\t\tvisa detta hjälpmeddelande och avsluta.\n"
-"  -m, --md5\t\tanvänd MD5-kryptering istället för DES när de\n"
-"\t\t\tangivna lösenorden inte är krypterade\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: kan inte låsa lösenordsfilen\n"
 
@@ -658,9 +673,21 @@
 msgstr "Vem är du?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: kan inte öppna fil\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "okänd grupp: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: kan inte öppna fil\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: kan inte öppna skuggfilen\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Lägger till användaren %s till gruppen %s\n"
@@ -703,10 +730,6 @@
 msgstr "%s: kan inte få skugglås\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: kan inte öppna fil\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: kan inte uppdatera post\n"
 
@@ -797,10 +820,6 @@
 msgstr "%s: kunde inte öppna skuggruppfilen\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: ogiltigt numeriskt argument \"%s\"\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K kräver KEY=VÄRDE\n"
 
@@ -1201,17 +1220,25 @@
 msgstr "okänt GID: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Ingen lösenordsfil\n"
+msgid "Invalid password."
+msgstr "Gammalt lösenord: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "för många grupper\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Användning: %s [inmatning]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: kan inte låsa /etc/passwd.\n"
@@ -1309,6 +1336,14 @@
 msgid "Old password: "
 msgstr "Gammalt lösenord: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Ange det nya lösenordet (minimum %d, maximum %d tecken)\n"
+"Använd en kombination av gemener, versaler och siffror.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1349,6 +1384,12 @@
 msgstr "%s: slut på minne\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: repository %s stöds inte\n"
 
@@ -1630,6 +1671,14 @@
 "  -u, --uid UID\t\t\ttvinga använda UID för det nya användarkontot\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: slut på minne i update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: slut på minne i update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u är inte unikt\n"
@@ -1791,6 +1840,10 @@
 "%s: Kan inte ta bort gruppen %s som är en primär grupp för en annan "
 "användare.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: fel vid uppdatering av grupp-post\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: kan inte öppna gruppfilen\n"
@@ -1889,15 +1942,11 @@
 "  -U, --unlock\t\t\tlås upp användarkontot\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: slut på minne i update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: fel vid tilläggning av ny grupp-post\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: slut på minne i update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: inga flaggor angivna\n"
 
@@ -1906,8 +1955,8 @@
 msgstr "%s: skugglösenord krävs för -e och -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: -a flaggan är BARA tillåten med -G flaggan\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -1996,6 +2045,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: kan inte återställa %s: %s (dina ändringar finns i %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Användning: chgpasswd [flaggor]\n"
+#~ "\n"
+#~ "Flaggor:\n"
+#~ "  -e, --encrypted\tangivna lösenord är krypterade\n"
+#~ "  -h, --help\t\tvisa detta hjälpmeddelande och avsluta\n"
+#~ "  -m, --md5\t\tanvänd MD5-kryptering istället för DES när de\n"
+#~ "\t\t\tangivna lösenorden inte är krypterade\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Ingen lösenordsfil\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Användning: %s [inmatning]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Tyvärr.\n"
 

Modified: upstream/trunk/po/tl.po
===================================================================
--- upstream/trunk/po/tl.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/tl.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-08-14 08:27+0800\n"
 "Last-Translator: Eric Pareja <xenos at upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl at banwa.upm.edu.ph>\n"
@@ -20,6 +20,15 @@
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Hindi makapaglaan ng lugar para sa impormasyong pagsasaayos.\n"
 
@@ -151,6 +160,12 @@
 msgstr "Maling kontrasenyas para kay %s.\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Hindi makalipat sa '%s'\n"
 
@@ -457,27 +472,47 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Hindi maalis ang aldaba sa talaksang password.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
 "Pag-gamit: chpasswd [mga opsiyon]\n"
 "\n"
 "Mga opsiyon:\n"
-"  -e, --encrypted\tang mga bigay na mga password ay naka-encrypt\n"
+"  -e, --encrypted\tang mga bigay na mga kontrasenyas ay naka-encrypt\n"
 "  -h, --help\t\tipakita itong payo na ito at lumabas\n"
 "  -m, --md5\t\tgamitin ang MD5 encryption imbes na DES kapag ang\n"
-"\t\t\tmga ibinigay na mga password ay hindi naka-encrypt\n"
+"\t\t\tmga ibinigay na mga kontrasenyas ay hindi naka-encrypt\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: hindi tanggap na argumentong numero '%s'\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: ang flag na -a ay pinapayagan LAMANG kung kasama ang flag na -G\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: hindi maaldaba ang talaksang grupo\n"
 
@@ -522,26 +557,6 @@
 msgstr "%s: error sa pag-apdeyt ng talaksang password\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Pag-gamit: chpasswd [mga opsiyon]\n"
-"\n"
-"Mga opsiyon:\n"
-"  -e, --encrypted\tang mga bigay na mga kontrasenyas ay naka-encrypt\n"
-"  -h, --help\t\tipakita itong payo na ito at lumabas\n"
-"  -m, --md5\t\tgamitin ang MD5 encryption imbes na DES kapag ang\n"
-"\t\t\tmga ibinigay na mga kontrasenyas ay hindi naka-encrypt\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: hindi maaldaba ang talaksan ng mga kontrasenyas\n"
 
@@ -673,9 +688,21 @@
 msgstr "Sino ka?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: hindi mabuksan ang talaksan\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "di kilalang grupo: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: hindi mabuksan ang talaksan\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: hindi mabuksan ang talaksang shadow\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Dinadagdag ang gumagamit na si %s sa grupong %s\n"
@@ -718,10 +745,6 @@
 msgstr "%s: hindi makuha ang aldaba ng shadow\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: hindi mabuksan ang talaksan\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: hindi ma-apdeyt ang entry\n"
 
@@ -811,10 +834,6 @@
 msgstr "%s: hindi mabuksan ang talaksang grupo ng shadow\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: hindi tanggap na argumentong numero '%s'\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: kinakailangan ng -O ang PANGALAN=HALAGA\n"
 
@@ -1213,17 +1232,25 @@
 msgstr "di kilalang GID: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Walang talaksang password\n"
+msgid "Invalid password."
+msgstr "Lumang kontrasenyas:"
 
 #, c-format
 msgid "too many groups\n"
 msgstr "labis ang dami ng mga grupo\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Pag-gamit: %s [input]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: hindi maaldaba ang /etc/passwd.\n"
@@ -1322,6 +1349,14 @@
 msgid "Old password: "
 msgstr "Lumang kontrasenyas:"
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Ibigay ang bagong kontrasenyas (minimum na %d, maximum na %d karakter)\n"
+"Gumamit ng kombinasyon ng malaki at maliit na titik at mga numero.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1362,6 +1397,12 @@
 msgstr "%s: nagkulang ng memory\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: hindi suportado ang repositoryong %s\n"
 
@@ -1648,6 +1689,14 @@
 "  -u, --uid UID\t\t\tgamitin ang UID para sa bagong account\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: naubos ang memory sa update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: naubos ang memory sa update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: hindi kakaiba ang UID %u\n"
@@ -1811,6 +1860,10 @@
 "%s: hindi matanggal ang grupong %s dahil ito'y pangunahing grupo ng ibang "
 "gumagamit.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: error sa pag-apdeyt ng ipinasok sa grupo\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: hindi mabuksan ang talaksang grupo\n"
@@ -1909,15 +1962,11 @@
 "  -U, --unlock\t\t\ttanggalin ang pagkaaldaba ng account ng gumagamit\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: naubos ang memory sa update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: error sa pagdagdag ng entry ng bagong grupo\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: naubos ang memory sa update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: walang binigay na mga flag\n"
 
@@ -1926,8 +1975,8 @@
 msgstr "%s: kailangan ang shadow password para sa -e at -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: ang flag na -a ay pinapayagan LAMANG kung kasama ang flag na -G\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -2016,6 +2065,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: hindi maibalik ang %s: %s (ang mga pagbabago ay nasa %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Pag-gamit: chpasswd [mga opsiyon]\n"
+#~ "\n"
+#~ "Mga opsiyon:\n"
+#~ "  -e, --encrypted\tang mga bigay na mga password ay naka-encrypt\n"
+#~ "  -h, --help\t\tipakita itong payo na ito at lumabas\n"
+#~ "  -m, --md5\t\tgamitin ang MD5 encryption imbes na DES kapag ang\n"
+#~ "\t\t\tmga ibinigay na mga password ay hindi naka-encrypt\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Walang talaksang password\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Pag-gamit: %s [input]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Ipagpaumanhin.\n"
 

Modified: upstream/trunk/po/tr.po
===================================================================
--- upstream/trunk/po/tr.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/tr.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-07-20 15:58+0200\n"
 "Last-Translator: Mehmet Türker <mturker at innova.com.tr>\n"
 "Language-Team: Türkçe <tr at li.org>\n"
@@ -19,6 +19,15 @@
 "X-Generator: KBabel 1.11.1\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Yapılandırma bilgileri için yer ayrılamadı.\n"
 
@@ -141,6 +150,12 @@
 msgstr "`%s' için yanlış parola\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "\"%s\" dizinine geçilemiyor\n"
 
@@ -444,27 +459,47 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Parola dosyası kilidi açılamıyor.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Kullanım: chgpasswd [seçenekler]\n"
+"Kullanım: chpasswd [seçenekler]\n"
 "\n"
 "Seçenekler:\n"
 "  -e, --encrypted\tverilen parolalar, şifrelendirilir\n"
 "  -h, --help\t\tbu yardım dosyasını gösterir ve çıkar\n"
-"  -m, --md5\t\tgirilen parolalar şifrelenmediğinde, DES yerine MD5\n"
-"\t\t\t\tşifrelemesi kullanır\n"
+"  -m, --md5\t\tgirilen şifreler şifrelenmediğinde, DES yerine MD5\n"
+"\t\t\tşifrelemesi kullanır\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: geçersiz sayısal argüman '%s'\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: -a bayrağına sadece -g bayrağı ile kullanıldığında izin verilir\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: grup dosyası kilitlenemiyor\n"
 
@@ -509,26 +544,6 @@
 msgstr "%s: parola dosyası güncellenmesinde hata\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Kullanım: chpasswd [seçenekler]\n"
-"\n"
-"Seçenekler:\n"
-"  -e, --encrypted\tverilen parolalar, şifrelendirilir\n"
-"  -h, --help\t\tbu yardım dosyasını gösterir ve çıkar\n"
-"  -m, --md5\t\tgirilen şifreler şifrelenmediğinde, DES yerine MD5\n"
-"\t\t\tşifrelemesi kullanır\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: parola dosyası kilitlenemedi\n"
 
@@ -661,9 +676,21 @@
 msgstr "Siz kimsiniz?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: dosya açılamıyor\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "bilinmeyen grup: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: dosya açılamıyor\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: gölge dosyası açılamıyor\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "%s kullanıcısı %s grubuna ekleniyor\n"
@@ -706,10 +733,6 @@
 msgstr "%s: gölge kilidi koyulamıyor\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: dosya açılamıyor\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: kayıt güncellenemiyor\n"
 
@@ -800,10 +823,6 @@
 msgstr "%s: gölge grup dosyası açılamıyor\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: geçersiz sayısal argüman '%s'\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K seçeneği ANAHTAR=DEĞER gerektirir\n"
 
@@ -1205,17 +1224,25 @@
 msgstr "bilinmeyen GID: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Parola dosyası yok\n"
+msgid "Invalid password."
+msgstr "Eski parola: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "çok fazla grup\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Kullanım: %s [girdi]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: /etc/passwd kilitlenemiyor.\n"
@@ -1315,6 +1342,14 @@
 msgid "Old password: "
 msgstr "Eski parola: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Yeni parolayı girin (asgari %d, azami %d karakter)\n"
+"Lütfen büyük, küçük harf ve rakamların bir kombinasyonunu kullanın.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1355,6 +1390,12 @@
 msgstr "%s: yetersiz bellek\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: depo %s desteklenmiyor\n"
 
@@ -1639,6 +1680,14 @@
 "  -u, --uid UID\t\t\tyeni kullanıcı hesabı için UID kullanıını zorla\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: update_group için bellek yetersiz\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: update_gshadow için bellek yetersiz\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: GID %u tek değil\n"
@@ -1799,6 +1848,10 @@
 msgstr ""
 "%s: Başka bir kullanıcı için birincil grub olan %s grubu kaldırılamıyor.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: grup kaydı güncellenirken hata oluştu\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: grup dosyası açılamıyor\n"
@@ -1897,15 +1950,11 @@
 "  -U, --unlock\t\t\tkullanıcı hesabı kilidini aç\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: update_group için bellek yetersiz\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: yeni grup kaydı eklenirken hata oluştu\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: update_gshadow için bellek yetersiz\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: herhangi bir bayrak verilmedi\n"
 
@@ -1914,8 +1963,8 @@
 msgstr "%s: -e ve -f için gölge parolalar gerekli\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: -a bayrağına sadece -g bayrağı ile kullanıldığında izin verilir\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -2003,6 +2052,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: %s geri yüklenemiyor: %s (değişiklikleriniz %s içinde)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Kullanım: chgpasswd [seçenekler]\n"
+#~ "\n"
+#~ "Seçenekler:\n"
+#~ "  -e, --encrypted\tverilen parolalar, şifrelendirilir\n"
+#~ "  -h, --help\t\tbu yardım dosyasını gösterir ve çıkar\n"
+#~ "  -m, --md5\t\tgirilen parolalar şifrelenmediğinde, DES yerine MD5\n"
+#~ "\t\t\t\tşifrelemesi kullanır\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Parola dosyası yok\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Kullanım: %s [girdi]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Üzgünüm.\n"
 

Modified: upstream/trunk/po/uk.po
===================================================================
--- upstream/trunk/po/uk.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/uk.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-07-24 10:42+0200\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen at univ.kiev.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -20,6 +20,15 @@
 "X-Generator: KBabel 1.11.2\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Не можу виділити ресурси для конфігураційних даних.\n"
 
@@ -145,6 +154,12 @@
 msgstr "Невірний пароль для %s.\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Неможливо перейти до теки \"%s\"\n"
 
@@ -449,27 +464,47 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Не можу розблокувати файл паролів.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
 "Використання: chpasswd [опції]\n"
 "\n"
 "Опції:\n"
-"  -e, --encrypted\tвказані паролі зашифровано\n"
+"  -e, --encrypted\tвказаний пароль зашифровано\n"
 "  -h, --help\t\tпоказати цю допомогу та вийти\n"
 "  -m, --md5\t\tвикористовувати MD5 шифрування замість DES, якщо вказані\n"
 "\t\t\tпаролі не зашифровано\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: невірний числовий аргумент \"%s\"\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: прапорець -a можна використовувати ТІЛЬКИ з прапорцем -G\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: не можу блокувати файл груп\n"
 
@@ -514,26 +549,6 @@
 msgstr "%s: помилка оновлення файлу з паролями\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Використання: chpasswd [опції]\n"
-"\n"
-"Опції:\n"
-"  -e, --encrypted\tвказаний пароль зашифровано\n"
-"  -h, --help\t\tпоказати цю допомогу та вийти\n"
-"  -m, --md5\t\tвикористовувати MD5 шифрування замість DES, якщо вказані\n"
-"\t\t\tпаролі не зашифровано\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: не можу заблокувати файл паролів\n"
 
@@ -665,9 +680,21 @@
 msgstr "Ви хто?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: не можу відкрити файл\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "невідома група: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: не можу відкрити файл\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: не можу відкрити файл з прихованими паролями\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Додано нового користувача %s до групи %s\n"
@@ -710,10 +737,6 @@
 msgstr "%s: не можу заблокувати базу прихований паролів\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: не можу відкрити файл\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: не можу оновити запис\n"
 
@@ -804,10 +827,6 @@
 msgstr "%s: не можу відкрити файл прихованих груп\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: невірний числовий аргумент \"%s\"\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K вимагає ЗМІННА=ЗНАЧЕННЯ\n"
 
@@ -1206,17 +1225,25 @@
 msgstr "невідомий GID: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Немає файлу паролів\n"
+msgid "Invalid password."
+msgstr "Старий пароль: "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "занадто багато груп\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Використання: %s [вхідні_данні]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: не можу блокувати /etc/passwd.\n"
@@ -1314,6 +1341,14 @@
 msgid "Old password: "
 msgstr "Старий пароль: "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Введіть новий пароль (від %d до %d знаків)\n"
+"Змішуйте великі та малі літери та цифри.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1355,6 +1390,12 @@
 msgstr "%s: брак пам'яті\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: сховище %s не підтримується\n"
 
@@ -1635,6 +1676,14 @@
 "  -u, --uid UID\t\t\tвикористовувати UID для нового запису користувача\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: бракує пам'яті у update_group\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: бракує пам'яті у update_gshadow\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u не є унікальним\n"
@@ -1795,6 +1844,10 @@
 msgstr ""
 "%s: не можу видалити групу %s яка є первинною групою іншого користувача.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: помилка оновлення запису у базі груп\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: не можу відкрити файл груп\n"
@@ -1893,15 +1946,11 @@
 "  -U, --unlock\t\t\tрозблокувати обліковий запис користувача\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: бракує пам'яті у update_group\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: помилка додання нового запису у файл груп\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: бракує пам'яті у update_gshadow\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: не подано прапорців\n"
 
@@ -1910,8 +1959,8 @@
 msgstr "%s: приховані паролі потрібні для -e і -f\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: прапорець -a можна використовувати ТІЛЬКИ з прапорцем -G\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -1999,6 +2048,32 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: не можу відновити %s: %s (ваші зміни у %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Використання: chpasswd [опції]\n"
+#~ "\n"
+#~ "Опції:\n"
+#~ "  -e, --encrypted\tвказані паролі зашифровано\n"
+#~ "  -h, --help\t\tпоказати цю допомогу та вийти\n"
+#~ "  -m, --md5\t\tвикористовувати MD5 шифрування замість DES, якщо вказані\n"
+#~ "\t\t\tпаролі не зашифровано\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Немає файлу паролів\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Використання: %s [вхідні_данні]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Вибачте.\n"
 

Modified: upstream/trunk/po/vi.po
===================================================================
--- upstream/trunk/po/vi.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/vi.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2006-07-19 22:14+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -17,6 +17,15 @@
 "X-Generator: LocFactoryEditor 1.6b4\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Không thể phân chia chỗ cho thông tin cấu hình.\n"
 
@@ -139,6 +148,12 @@
 msgstr "Mật khẩu không đúng cho « %s ».\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "Không thể cd (lệnh chuyển đổi thư mục) sang « %s ».\n"
 
@@ -443,20 +458,20 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "Không thể bỏ khóa tập tin mật khẩu.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
-"Cách sử dụng: chgpasswd [tùy_chọn...]\n"
+"Cách sử dụng: chpasswd [tùy_chọn...]\n"
 "\n"
-"[chgpasswd: thay đổi mật khẩu]\n"
+"[chpasswd: thay đổi mật khẩu]\n"
 "\n"
 "Tùy chọn:\n"
 "  -e, --encrypted\tmọi mật khẩu đã cung cấp cũng đã _được mật mã_\n"
@@ -465,7 +480,27 @@
 "\t\t\tmật khẩu đã cung cấp chưa được mật mã\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s: đối số thuộc số không hợp lệ « %s »\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s: cho phép cờ CHỈ với cờ « -G » thôi\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s: không thể khóa tập tin nhóm\n"
 
@@ -510,28 +545,6 @@
 msgstr "%s: gặp lỗi khi cập nhật tập tin mật khẩu\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"Cách sử dụng: chpasswd [tùy_chọn...]\n"
-"\n"
-"[chpasswd: thay đổi mật khẩu]\n"
-"\n"
-"Tùy chọn:\n"
-"  -e, --encrypted\tmọi mật khẩu đã cung cấp cũng đã _được mật mã_\n"
-"  -h, --help\t\thiển thị _trợ giúp_ này rồi thoát\n"
-"  -m, --md5\t\tsử dụng mật mã MD5 thay vào DES khi các\n"
-"\t\t\tmật khẩu đã cung cấp chưa được mật mã\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: không thể khóa tập tin mật khẩu\n"
 
@@ -668,9 +681,21 @@
 msgstr "Ai đó?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s: không thể mở tập tin\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "không biết nhóm: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s: không thể mở tập tin\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s: không thể mở tập tin bóng\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Đang thêm người dung %s vào nhóm %s\n"
@@ -713,10 +738,6 @@
 msgstr "%s: không thể lấy khóa bóng\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: không thể mở tập tin\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s: không thể cập nhật mục nhập\n"
 
@@ -809,10 +830,6 @@
 msgstr "%s: không thể mở tập tin nhóm bóng\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s: đối số thuộc số không hợp lệ « %s »\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K cần đến KHÓA=GIÁ_TRỊ\n"
 
@@ -1224,17 +1241,25 @@
 msgstr "không biết GID: %lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "Không có tập tin mật khẩu\n"
+msgid "Invalid password."
+msgstr "Mật khẩu cũ : "
 
 #, c-format
 msgid "too many groups\n"
 msgstr "quá nhiều nhóm\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "Cách sử dụng: %s [nhập_thứ]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: không thể khóa </etc/passwd>.\n"
@@ -1332,6 +1357,14 @@
 msgid "Old password: "
 msgstr "Mật khẩu cũ : "
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"Hãy gõ mật khẩu mới (ký tự tối thiểu %d, tối đa %d).\n"
+"Cần phải gõ phối hợp chữ thường/hoa và số.\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1372,6 +1405,12 @@
 msgstr "%s: hết bộ nhớ\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s chưa hỗ trợ kho %s\n"
 
@@ -1661,6 +1700,14 @@
 "  -u, --uid UID\t\t\tbuộc sử dụng UID này cho tài khoản người dùng mới\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s: hết bộ nhớ trong « update_group » (cập nhật nhóm)\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s: hết bộ nhớ trong « update_shadow » (cập nhật bóng)\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u không phải độc nhất\n"
@@ -1822,6 +1869,10 @@
 msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgstr "%s: không thể gỡ bỏ %s mà là nhóm chính cho người dùng khác.\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s: gặp lỗi khi cập nhật mục nhập nhóm.\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s: không thể mở tập tin nhóm\n"
@@ -1924,15 +1975,11 @@
 "  -U, --unlock\t\t\t_mở khóa_ tài khoản người dùng\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s: hết bộ nhớ trong « update_group » (cập nhật nhóm)\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s: gặp lỗi khi thêm mục nhập nhóm mới\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s: hết bộ nhớ trong « update_shadow » (cập nhật bóng)\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: chưa gõ cờ nào\n"
 
@@ -1941,8 +1988,8 @@
 msgstr "%s: mật khẩu bóng cần thiết cho hai tùy chọn « -e » và « -f »\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s: cho phép cờ CHỈ với cờ « -G » thôi\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -2030,6 +2077,34 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: không thể phục hồi %s: %s (các thay đổi của bạn ở trong %s)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Cách sử dụng: chgpasswd [tùy_chọn...]\n"
+#~ "\n"
+#~ "[chgpasswd: thay đổi mật khẩu]\n"
+#~ "\n"
+#~ "Tùy chọn:\n"
+#~ "  -e, --encrypted\tmọi mật khẩu đã cung cấp cũng đã _được mật mã_\n"
+#~ "  -h, --help\t\thiển thị _trợ giúp_ này rồi thoát\n"
+#~ "  -m, --md5\t\tsử dụng mật mã MD5 thay vào DES khi các\n"
+#~ "\t\t\tmật khẩu đã cung cấp chưa được mật mã\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "Không có tập tin mật khẩu\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "Cách sử dụng: %s [nhập_thứ]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "Rất tiếc.\n"
 

Modified: upstream/trunk/po/zh_CN.po
===================================================================
--- upstream/trunk/po/zh_CN.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/zh_CN.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.15\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2007-07-01 06:36-0500\n"
 "Last-Translator: Ming Hua <minghua at ubuntu.com>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb at lists.debian.org>\n"
@@ -18,6 +18,15 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "无法为配置信息分配空间。\n"
 
@@ -140,6 +149,12 @@
 msgstr "%s 的密码不正确。\n"
 
 #, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
+#, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "无法 cd 进入“%s”\n"
 
@@ -437,26 +452,46 @@
 msgid "Cannot unlock the password file.\n"
 msgstr "无法解锁密码文件。\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
 "用法:chpasswd [选项]\n"
 "\n"
 "选项:\n"
 "  -e, --encrypted\t所提供的密码是加密过的\n"
 "  -h, --help\t\t显示此帮助信息并退出\n"
-"  -m, --md5\t\t如果所提供的密码尚未被加密,使用 MD5 而非 DES 进行加密\n"
+"  -m, --md5\t\t如果所提供的密码没有加密过,使用 MD5 而非 DES 进行加密\n"
 "\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s:无效的数字参数“%s”\n"
+
+#, fuzzy, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr "%s:-a 标志只允许和 -G 标志一起使用\n"
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s:无法锁定组文件\n"
 
@@ -501,25 +536,6 @@
 msgstr "%s:更新密码文件时出错。\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"用法:chpasswd [选项]\n"
-"\n"
-"选项:\n"
-"  -e, --encrypted\t所提供的密码是加密过的\n"
-"  -h, --help\t\t显示此帮助信息并退出\n"
-"  -m, --md5\t\t如果所提供的密码没有加密过,使用 MD5 而非 DES 进行加密\n"
-"\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s:无法锁定密码文件\n"
 
@@ -648,9 +664,21 @@
 msgstr "你是谁?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s:无法打开文件\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "未知组:%s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s:无法打开文件\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s:无法打开影子文件\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "正在将用户“%s”加入到“%s”组中\n"
@@ -693,10 +721,6 @@
 msgstr "%s:无法获得影子锁\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s:无法打开文件\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s:无法更新条目\n"
 
@@ -785,10 +809,6 @@
 msgstr "%s:无法打开影子组文件\n"
 
 #, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s:无效的数字参数“%s”\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s:-K 需要 KEY=VALUE\n"
 
@@ -1186,17 +1206,25 @@
 msgstr "未知的 GID:%lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "没有密码文件\n"
+msgid "Invalid password."
+msgstr "旧密码:"
 
 #, c-format
 msgid "too many groups\n"
 msgstr "用户组过多\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "用法:%s [输入]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s:无法锁定 /etc/passwd。\n"
@@ -1293,6 +1321,14 @@
 msgid "Old password: "
 msgstr "旧密码:"
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"请输入新密码(最少 %d 最多 %d 个字符)\n"
+"请混合使用大小写字母和数字。\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1333,6 +1369,12 @@
 msgstr "%s:内存溢出\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s:不支持 %s 存储。\n"
 
@@ -1607,6 +1649,14 @@
 "  -u, --uid UID\t\t\t强制将新用户帐号的 id 设为 UID\n"
 "\n"
 
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s:update_group 内存溢出\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s:update_gshadow 内存溢出\n"
+
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s:UID %u 并不唯一\n"
@@ -1754,6 +1804,10 @@
 msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgstr "%s:不能删除 %s 组,因为它是另外一个用户的主组。\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s:更新组条目时出错\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s:无法打开组文件\n"
@@ -1846,15 +1900,11 @@
 "  -U, --unlock\t\t\t解锁用户帐号\n"
 "\n"
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s:update_group 内存溢出\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s:增加新组条目时出错\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s:update_gshadow 内存溢出\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s:没有指定标志\n"
 
@@ -1863,8 +1913,8 @@
 msgstr "%s:-e 和 -f 参数需要影子密码\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
-msgstr "%s:-a 标志只允许和 -G 标志一起使用\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgstr ""
 
 #, c-format
 msgid "%s: uid %lu is not unique\n"
@@ -1952,6 +2002,31 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s:无法恢复 %s:%s (您的修改在 %s 中)\n"
 
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "用法:chpasswd [选项]\n"
+#~ "\n"
+#~ "选项:\n"
+#~ "  -e, --encrypted\t所提供的密码是加密过的\n"
+#~ "  -h, --help\t\t显示此帮助信息并退出\n"
+#~ "  -m, --md5\t\t如果所提供的密码尚未被加密,使用 MD5 而非 DES 进行加密\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "没有密码文件\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "用法:%s [输入]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "抱歉。\n"
 

Modified: upstream/trunk/po/zh_TW.po
===================================================================
--- upstream/trunk/po/zh_TW.po	2007-11-24 13:08:08 UTC (rev 1458)
+++ upstream/trunk/po/zh_TW.po	2007-11-24 14:02:10 UTC (rev 1459)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.9\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-28 19:15+0100\n"
+"POT-Creation-Date: 2007-11-24 12:26+0100\n"
 "PO-Revision-Date: 2005-06-02 22:20+0800\n"
 "Last-Translator: Asho Yeh <asho at debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@ -20,6 +20,15 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr ""
+
+#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "無法為設定訊息配置空間。\n"
 
@@ -142,6 +151,12 @@
 msgid "Incorrect password for %s.\n"
 msgstr "“%s”的密碼不正確\n"
 
+#, c-format
+msgid ""
+"Invalid ENCRYPT_METHOD value: '%s'.\n"
+"Defaulting to DES.\n"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "無法進入“%s”目錄\n"
@@ -441,14 +456,14 @@
 
 #, fuzzy, c-format
 msgid ""
-"Usage: chgpasswd [options]\n"
+"Usage: %s [options]\n"
 "\n"
 "Options:\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
 "  -e, --encrypted\tsupplied passwords are encrypted\n"
 "  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
+"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"%s\n"
 msgstr ""
 "用法:chpasswd [選項]\n"
 "\n"
@@ -457,9 +472,28 @@
 "  -h, --help\t\t顯示這份說明文字然後結束\n"
 "  -m,  --md5\t\t如果所提供的密碼沒有加密,則使用 MD5 加密法\n"
 "\t\t\t來替代 DES。\n"
-"\n"
 
+msgid ""
+"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: invalid numeric argument '%s'\n"
+msgstr "%s:無效的數字參數“%s”\n"
+
 #, c-format
+msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgstr ""
+
+#, c-format
+msgid "%s: the -c, -e, and -m flags are exclusive\n"
+msgstr ""
+
+#, c-format
+msgid "%s: unsupported crypt method: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock group file\n"
 msgstr "%s:無法鎖定群組檔案\n"
 
@@ -504,25 +538,6 @@
 msgstr "%s:更新密碼檔案時出錯。\n"
 
 #, c-format
-msgid ""
-"Usage: chpasswd [options]\n"
-"\n"
-"Options:\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
-"\t\t\tpasswords are not encrypted\n"
-"\n"
-msgstr ""
-"用法:chpasswd [選項]\n"
-"\n"
-"選項:\n"
-"  -e, --encrypted\t所提供的密碼已經過加密\n"
-"  -h, --help\t\t顯示這份說明文字然後結束\n"
-"  -m,  --md5\t\t如果所提供的密碼沒有加密,則使用 MD5 加密法\n"
-"\t\t\t來替代 DES。\n"
-
-#, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s:無法鎖定密碼檔\n"
 
@@ -645,9 +660,21 @@
 msgstr "你是誰?\n"
 
 #, c-format
+msgid "%s: can't open file\n"
+msgstr "%s:無法打開檔案\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "未知群組:%s\n"
 
+#, fuzzy, c-format
+msgid "%s: can't close file\n"
+msgstr "%s:無法打開檔案\n"
+
+#, fuzzy, c-format
+msgid "%s: can't close shadow file\n"
+msgstr "%s:無法打開 shadow 檔\n"
+
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "正在將使用者“%s”加入到“%s”群組中\n"
@@ -690,10 +717,6 @@
 msgstr "%s:無法獲得shadow鎖定\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s:無法打開檔案\n"
-
-#, c-format
 msgid "%s: can't update entry\n"
 msgstr "%s:無法更新項目\n"
 
@@ -773,10 +796,6 @@
 msgstr "%s:無法打開shadow群組檔案\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid numeric argument '%s'\n"
-msgstr "%s:無效的數字參數“%s”\n"
-
-#, fuzzy, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s:-O 需要 NAME=VALUE\n"
 
@@ -1166,17 +1185,25 @@
 msgstr "未知的 GID:%lu\n"
 
 #, fuzzy
-msgid "No password.\n"
-msgstr "沒有密碼檔案\n"
+msgid "Invalid password."
+msgstr "舊密碼:"
 
 #, c-format
 msgid "too many groups\n"
 msgstr "使用者群組過多\n"
 
 #, c-format
-msgid "Usage: %s [input]\n"
-msgstr "用法:%s [輸入]\n"
+msgid ""
+"Usage: %s [options] [input]\n"
+"\n"
+"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"%s\n"
+msgstr ""
 
+msgid ""
+"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+msgstr ""
+
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s:無法鎖定 /etc/passwd。\n"
@@ -1265,6 +1292,14 @@
 msgid "Old password: "
 msgstr "舊密碼:"
 
+#, fuzzy, c-format
+msgid ""
+"Enter the new password (minimum of %d characters)\n"
+"Please use a combination of upper and lower case letters and numbers.\n"
+msgstr ""
+"請輸入新密碼(最少 %d 最多 %d 個字元)\n"
+"請混合使用大小寫字母和數字。\n"
+
 #, c-format
 msgid ""
 "Enter the new password (minimum of %d, maximum of %d characters)\n"
@@ -1305,6 +1340,12 @@
 msgstr "%s:記憶體不足\n"
 
 #, c-format
+msgid ""
+"%s: unlocking the user would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user account.\n"
+msgstr ""
+
+#, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s:不支持 %s 套件存庫。\n"
 
@@ -1550,6 +1591,14 @@
 msgstr ""
 
 #, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the group database.\n"
+msgstr "%s:update_group 時記憶體不足\n"
+
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+msgstr "%s:update_gshadow 時記憶體不足\n"
+
+#, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s:gid %u 並不唯一\n"
 
@@ -1695,6 +1744,10 @@
 msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
 msgstr "%s:不能刪除使用者的主群組。\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating shadow group entry\n"
+msgstr "%s:更新群組項目時出錯\n"
+
 #, c-format
 msgid "%s: cannot open group file\n"
 msgstr "%s:無法打開群組檔案\n"
@@ -1767,15 +1820,11 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid "%s: out of memory in update_group\n"
-msgstr "%s:update_group 時記憶體不足\n"
+#, fuzzy, c-format
+msgid "%s: error adding new shadow group entry\n"
+msgstr "%s:增加新群組項目時出錯\n"
 
 #, c-format
-msgid "%s: out of memory in update_gshadow\n"
-msgstr "%s:update_gshadow 時記憶體不足\n"
-
-#, c-format
 msgid "%s: no flags given\n"
 msgstr "%s:沒有指定標誌\n"
 
@@ -1784,7 +1833,7 @@
 msgstr "%s:-e 和 -f 參數需要shadow密碼\n"
 
 #, c-format
-msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
 #, c-format
@@ -1864,6 +1913,33 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s:無法復原 %s:%s (您的修改在 %s 中)\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "Usage: chgpasswd [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -e, --encrypted\tsupplied passwords are encrypted\n"
+#~ "  -h, --help\t\tdisplay this help message and exit\n"
+#~ "  -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n"
+#~ "\t\t\tpasswords are not encrypted\n"
+#~ "\n"
+#~ msgstr ""
+#~ "用法:chpasswd [選項]\n"
+#~ "\n"
+#~ "選項:\n"
+#~ "  -e, --encrypted\t所提供的密碼已經過加密\n"
+#~ "  -h, --help\t\t顯示這份說明文字然後結束\n"
+#~ "  -m,  --md5\t\t如果所提供的密碼沒有加密,則使用 MD5 加密法\n"
+#~ "\t\t\t來替代 DES。\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "No password.\n"
+#~ msgstr "沒有密碼檔案\n"
+
+#~ msgid "Usage: %s [input]\n"
+#~ msgstr "用法:%s [輸入]\n"
+
 #~ msgid "Sorry.\n"
 #~ msgstr "抱歉。\n"
 




More information about the Pkg-shadow-commits mailing list