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

nekral-guest at alioth.debian.org nekral-guest at alioth.debian.org
Sat Feb 2 17:20:43 UTC 2008


Author: nekral-guest
Date: 2008-02-02 17:20:42 +0000 (Sat, 02 Feb 2008)
New Revision: 1749

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:
Updated PO files.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/ChangeLog	2008-02-02 17:20:42 UTC (rev 1749)
@@ -1,3 +1,7 @@
+2008-02-02  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* po/*.po: Updated PO files.
+
 2008-01-26  Nicolas François  <nicolas.francois at centraliens.net>
 
 	Fix build failures with --disable-shadowgrp. Thanks to Jürgen

Modified: upstream/trunk/po/bs.po
===================================================================
--- upstream/trunk/po/bs.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/bs.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+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"
@@ -25,7 +25,6 @@
 msgid "crypt method not supported by libcrypt? (%s)\n"
 msgstr ""
 
-#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr ""
 
@@ -37,19 +36,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr ""
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr ""
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Vaša šifra je istekla."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Vaša šifra je neaktivna."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Vaš račun je istekao."
 
@@ -63,11 +58,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Vaša šifra ističe za in %ld dana.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Vaša šifra ističe sutra.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Vaša šifra ističe danas.\n"
 
@@ -75,7 +68,6 @@
 msgid "Unable to change tty %s"
 msgstr ""
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr ""
 
@@ -93,7 +85,6 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Previše prijavljivanja.\n"
 
@@ -188,7 +179,6 @@
 msgid "%s's Password: "
 msgstr "%s's Šifra: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -207,7 +197,6 @@
 "\n"
 msgstr ""
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 
@@ -229,27 +218,24 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Datum isteka računa (GGGG-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "never\n"
 msgstr "Nikad\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Šifra:"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Šifra neaktivna"
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr ""
 
@@ -278,51 +264,55 @@
 msgstr ""
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr ""
 
 #, c-format
-msgid "%s: unknown user %s\n"
+msgid "%s: can't lock shadow password file\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the shadow password file is not present\n"
+msgid "%s: can't open shadow password file\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock shadow password file\n"
+msgid "%s: can't rewrite shadow password file\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't open shadow password file\n"
+msgid "%s: can't rewrite password file\n"
 msgstr ""
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: can't update password file\n"
 msgstr ""
 
 #, c-format
-msgid "Changing the aging information for %s\n"
+msgid "%s: can't update shadow password file\n"
 msgstr ""
 
 #, c-format
-msgid "%s: error changing fields\n"
+msgid "%s: the shadow password file is not present\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't update password file\n"
+msgid "%s: failed to drop privileges (%s)\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't update shadow password file\n"
+msgid "%s: unknown user %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
+msgid "Changing the aging information for %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
+msgid "%s: error changing fields\n"
 msgstr ""
 
 #, c-format
@@ -366,72 +356,66 @@
 msgid "Other"
 msgstr "Ostalo"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
+msgid "Cannot change ID to root.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
+msgid "Cannot lock the password file; try again later.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
+msgid "Cannot open the password file.\n"
 msgstr ""
 
 #, c-format
-msgid "Changing the user information for %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
 msgstr ""
 
-#, c-format
-msgid "%s: invalid name: '%s'\n"
+msgid "Error updating the password entry.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: invalid room number: '%s'\n"
+msgid "Cannot commit password file changes.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: invalid work phone: '%s'\n"
+msgid "Cannot unlock the password file.\n"
 msgstr ""
 
 #, c-format
-msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid name: '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "%s: '%s' contains illegal characters\n"
+msgid "%s: invalid room number: '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "%s: fields too long\n"
+msgid "%s: invalid work phone: '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "Cannot change ID to root.\n"
+msgid "%s: invalid home phone: '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
+msgid "%s: '%s' contains illegal characters\n"
 msgstr ""
 
 #, c-format
-msgid "Cannot open the password file.\n"
+msgid "%s: Cannot determine your user name.\n"
 msgstr ""
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
 msgstr ""
 
 #, c-format
-msgid "Error updating the password entry.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
 msgstr ""
 
 #, c-format
-msgid "Cannot commit password file changes.\n"
+msgid "Changing the user information for %s\n"
 msgstr ""
 
 #, c-format
-msgid "Cannot unlock the password file.\n"
+msgid "%s: fields too long\n"
 msgstr ""
 
 #, c-format
@@ -485,6 +469,14 @@
 msgstr ""
 
 #, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr ""
+
+#, c-format
+msgid "%s: error updating group file\n"
+msgstr ""
+
+#, c-format
 msgid "%s: line %d: line too long\n"
 msgstr ""
 
@@ -496,12 +488,16 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "nepoznata grupa: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "nepoznata grupa: %s\n"
+
 #, c-format
-msgid "%s: line %d: cannot update password entry\n"
+msgid "%s: error detected, changes ignored\n"
 msgstr ""
 
 #, c-format
-msgid "%s: error detected, changes ignored\n"
+msgid "%s: can't lock shadow file\n"
 msgstr ""
 
 #, c-format
@@ -513,18 +509,13 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock password file\n"
+msgid "%s: line %d: unknown user %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock shadow file\n"
+msgid "%s: line %d: cannot update password entry\n"
 msgstr ""
 
-#, c-format
-msgid "%s: line %d: unknown user %s\n"
-msgstr ""
-
-#, c-format
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -553,7 +544,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr ""
 
@@ -561,7 +551,6 @@
 msgid "%s: unknown user\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -581,7 +570,6 @@
 "\n"
 msgstr ""
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr ""
 
@@ -622,42 +610,50 @@
 msgstr ""
 
 #, c-format
-msgid "Who are you?\n"
+msgid "%s: can't get lock\n"
 msgstr ""
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't open file\n"
 msgstr ""
 
 #, c-format
-msgid "unknown group: %s\n"
-msgstr "nepoznata grupa: %s\n"
+msgid "%s: can't re-write file\n"
+msgstr ""
 
 #, c-format
-msgid "%s: can't close file\n"
+msgid "%s: can't re-write shadow file\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't close shadow file\n"
+msgid "%s: can't unlock file\n"
 msgstr ""
 
 #, c-format
-msgid "Adding user %s to group %s\n"
-msgstr "Dodajem korisnika %s grupi %s\n"
+msgid "%s: can't update entry\n"
+msgstr ""
 
 #, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Uklanjam korisnika %s iz grupe %s\n"
+msgid "%s: can't update shadow entry\n"
+msgstr ""
 
 #, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: nepoznat član %s\n"
+msgid "unknown group: %s\n"
+msgstr "nepoznata grupa: %s\n"
 
 #, c-format
-msgid "%s: Not a tty\n"
+msgid "%s: can't close file\n"
 msgstr ""
 
 #, c-format
+msgid "%s: can't close shadow file\n"
+msgstr ""
+
+#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Mijenjam šifru za grupu %s\n"
 
@@ -674,35 +670,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Pokušajte ponovo kasnije\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
+msgid "Who are you?\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr ""
+msgid "Adding user %s to group %s\n"
+msgstr "Dodajem korisnika %s grupi %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr ""
+msgid "Removing user %s from group %s\n"
+msgstr "Uklanjam korisnika %s iz grupe %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr ""
+msgid "%s: unknown member %s\n"
+msgstr "%s: nepoznat član %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
+msgid "%s: Not a tty\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr ""
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -722,14 +708,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr ""
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr ""
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr ""
 
@@ -770,6 +748,9 @@
 msgstr "%s: grupa %s postoji\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr ""
+
 msgid "Usage: groupdel group\n"
 msgstr ""
 
@@ -797,47 +778,36 @@
 msgid "%s: %s is the NIS master\n"
 msgstr ""
 
-#, c-format
 msgid "Member already exists\n"
 msgstr ""
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr ""
 
-#, c-format
 msgid "Group access is required\n"
 msgstr ""
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr ""
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr ""
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr ""
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr ""
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -847,6 +817,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 
@@ -871,10 +842,6 @@
 msgstr ""
 
 #, c-format
-msgid "No\n"
-msgstr ""
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr ""
 
@@ -887,6 +854,9 @@
 msgstr ""
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr ""
+
 msgid "invalid group file entry\n"
 msgstr ""
 
@@ -894,7 +864,6 @@
 msgid "delete line '%s'? "
 msgstr ""
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr ""
 
@@ -926,11 +895,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr ""
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr ""
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr ""
 
@@ -947,10 +914,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr ""
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr ""
 
@@ -982,19 +945,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: id\n"
 msgstr ""
 
-#, c-format
 msgid " groups="
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1007,17 +966,19 @@
 "\n"
 msgstr ""
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr ""
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr ""
 
 msgid "**Never logged in**"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Nepoznat korisnik: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr ""
@@ -1034,17 +995,14 @@
 msgid "       %s [-p] -r host\n"
 msgstr ""
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1080,7 +1038,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr ""
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr ""
 
@@ -1097,6 +1054,10 @@
 msgid "%s: failure forking: %s"
 msgstr ""
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 
@@ -1117,14 +1078,16 @@
 "\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr ""
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Stara šifra:"
+
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "nepoznata grupa: %s\n"
@@ -1133,11 +1096,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "nepoznata grupa: %s\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Stara šifra:"
-
-#, c-format
 msgid "too many groups\n"
 msgstr ""
 
@@ -1150,6 +1108,16 @@
 msgstr ""
 
 #, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr ""
 
@@ -1162,6 +1130,10 @@
 msgstr ""
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr ""
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr ""
 
@@ -1193,11 +1165,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr ""
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr ""
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1241,11 +1208,9 @@
 msgid "New password: "
 msgstr "Nova šifra:"
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Pokušajte ponovo.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1253,7 +1218,6 @@
 "\n"
 "Upozorenje: slaba šifra (unesite je ponovo ako je ipak želite koristiti).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "One se ne slažu; pokušajte ponovo\n"
 
@@ -1291,11 +1255,10 @@
 msgid "The password for %s is unchanged.\n"
 msgstr ""
 
-#, c-format
 msgid "Password changed.\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Password set to expire.\n"
 msgstr "Vaša šifra je istekla."
 
@@ -1303,11 +1266,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr ""
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr ""
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr ""
 
@@ -1339,11 +1300,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr ""
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr ""
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr ""
 
@@ -1379,15 +1338,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr ""
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr ""
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr ""
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr ""
 
@@ -1395,7 +1351,6 @@
 msgid "%s: %s\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1436,15 +1391,15 @@
 "(Ignored)\n"
 msgstr ""
 
-#, c-format
 msgid "No shell\n"
 msgstr ""
 
-#, c-format
 msgid "No password file\n"
 msgstr ""
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr ""
 
@@ -1485,7 +1440,6 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1506,6 +1460,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1526,11 +1482,11 @@
 msgstr ""
 
 #, c-format
-msgid "%s: UID %u is not unique\n"
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't get unique UID\n"
+msgid "%s: can't get unique GID (no more available GIDs)\n"
 msgstr ""
 
 #, c-format
@@ -1624,7 +1580,6 @@
 msgid "Creating mailbox file"
 msgstr ""
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1642,6 +1597,10 @@
 msgstr ""
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr ""
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1651,7 +1610,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1719,7 +1677,6 @@
 msgid "%s: error removing directory %s\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -1811,6 +1768,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"

Modified: upstream/trunk/po/ca.po
===================================================================
--- upstream/trunk/po/ca.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/ca.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-24 17:34+0100\n"
 "Last-Translator: Guillem Jover <guillem at debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -23,7 +23,6 @@
 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"
 
@@ -37,19 +36,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Avís: el grup %s és desconegut\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Avís: hi ha massa grups\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "La vostra contrasenya ha caducat."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "La vostra contrasenya està inactiva."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "El vostre accés ha caducat."
 
@@ -63,11 +58,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "La vostra contrasenya caduca en %ld dies.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "La vostra contrasenya caduca demà.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "La vostra contrasenya caduca avui.\n"
 
@@ -75,7 +68,6 @@
 msgid "Unable to change tty %s"
 msgstr "No es pot canviar la tty %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Desbordament d'entorn\n"
 
@@ -97,7 +89,6 @@
 "S'han produït %d fallades des de l'últim accés.\n"
 "L'ultim va ser %s en %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Massa accessos.\n"
 
@@ -193,7 +184,6 @@
 msgid "%s's Password: "
 msgstr "Contrasenya de l'usuari %s: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -231,7 +221,6 @@
 "                                   a DIES_AVÍS\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Introduïu el nou valor, o premeu ENTER per al predeterminat\n"
 
@@ -253,27 +242,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Data de caducitat per al compte (AAAA-MM-YY)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Últim canvi de contrasenya\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "mai\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "s'ha de canviar la contrasenya\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "La contrasenya caduca\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Contrasenya inactiva\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "El compte caduca\t\t\t\t\t: "
 
@@ -302,18 +285,14 @@
 msgstr "%s: l'autenticació PAM ha fallat\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: no es pot blocar el fitxer de contrasenyes\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: no es pot obrir el fitxer de contrasenyes\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: usuari %s desconegut\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: el fitxer de contrasenyes ombra no és present\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: no es pot blocar el fitxer de contrasenyes ombra\n"
 
@@ -322,18 +301,14 @@
 msgstr "%s: no es pot obrir el fitxer de contrasenyes ombra\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: ha fallat el despreniment de privilegis (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: no es pot reescriure el fitxer de contrasenyes ombra\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "S'està canviant la informació de caducitat per a %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: no es pot reescriure el fitxer de contrasenyes\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: s'ha produït un error en canviar els camps\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: no es pot actualitzar el fitxer de contrasenyes\n"
 
@@ -342,14 +317,26 @@
 msgstr "%s: no es pot actualitzar el fitxer de contrasenyes ombra\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: no es pot reescriure el fitxer de contrasenyes ombra\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: el fitxer de contrasenyes ombra no és present\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: no es pot reescriure el fitxer de contrasenyes\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: ha fallat el despreniment de privilegis (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: usuari %s desconegut\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "S'està canviant la informació de caducitat per a %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: s'ha produït un error en canviar els camps\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -394,22 +381,28 @@
 msgid "Other"
 msgstr "Altre"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: No s'ha pogut determinar el seu nom d'usuari.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "No s'ha pogut canviar l'ID al de root.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: no s'ha pogut canviar l'usuari «%s» al client NIS.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "No s'ha pogut blocar el fitxer de contrasenyes; intenteu-ho més tard\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: «%s» és el mestre NIS per a aquest client.\n"
+msgid "Cannot open the password file.\n"
+msgstr "No s'ha pogut obrir el fitxer de contrasenyes.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "S'està canviant la informació d'usuari per a %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: no s'ha trobat %s a «/etc/passwd»\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Error en actualitzar l'entrada de la contrasenya.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "No es poden confirmar els canvis del fitxer de contrasenyes.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "No s'ha pogut desblocar el fitxer de contrasenyes.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: el nom no és vàlid: «%s»\n"
@@ -431,37 +424,25 @@
 msgstr "%s: «%s» conté caràcters il·legals\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: els camps són massa llargs\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: No s'ha pogut determinar el seu nom d'usuari.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "No s'ha pogut canviar l'ID al de root.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: no s'ha pogut canviar l'usuari «%s» al client NIS.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "No s'ha pogut blocar el fitxer de contrasenyes; intenteu-ho més tard\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: «%s» és el mestre NIS per a aquest client.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "No s'ha pogut obrir el fitxer de contrasenyes.\n"
+msgid "Changing the user information for %s\n"
+msgstr "S'està canviant la informació d'usuari per a %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: no s'ha trobat %s a «/etc/passwd»\n"
+msgid "%s: fields too long\n"
+msgstr "%s: els camps són massa llargs\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Error en actualitzar l'entrada de la contrasenya.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "No es poden confirmar els canvis del fitxer de contrasenyes.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "No s'ha pogut desblocar el fitxer de contrasenyes.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -519,6 +500,15 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: no s'ha pogut obrir el fitxer de contrasenyes ombra\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr ""
+"%s: s'ha produït un error en actualitzar el fitxer de contrasenyes ombra\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: s'ha produït un error en actualitzar l'entrada de grup\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: línia %d: la línia és massa llarga\n"
@@ -531,15 +521,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: línia %d: el grup %s és desconegut\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: línia %d: no s'ha pogut actualitzar l'entrada de la contrasenya\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: línia %d: no es pot actualitzar l'entrada\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: s'ha detectat un error, els canvis s'han ignorat\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: no s'ha pogut blocar el fitxer de contrasenyes ombra\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr ""
 "%s: s'ha produït un error en actualitzar el fitxer de contrasenyes ombra\n"
@@ -549,18 +543,13 @@
 msgstr "%s: s'ha produït un error en actualitzar el fitxer de contrasenyes\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: no es pot blocar el fitxer de contrasenyes\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: no s'ha pogut blocar el fitxer de contrasenyes ombra\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: línia %d: l'usuari %s és desconegut\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: línia %d: no s'ha pogut actualitzar l'entrada de la contrasenya\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -596,7 +585,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s no és un intèrpret vàlid.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Forma d'ús: expiry {-f|-c}\n"
 
@@ -604,7 +592,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: l'usuari és desconegut\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -643,7 +630,6 @@
 "                                per a l'usuari amb USUARI\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Usuari      Fallades Màxim   Últim                    A\n"
 
@@ -684,14 +670,38 @@
 msgstr "%s: contrasenyes ombra de grups requerides per a «-A»\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Qui sou?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: no es pot obtenir el bloqueig\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: no es pot reescriure el fitxer\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: no es pot reescriure el fitxer ombra\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: no es pot desblocar el fitxer\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: no es pot actualitzar l'entrada\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: no es pot actualitzar l'entrada del fitxer de contrasenyes ombra\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "El grup és desconegut: %s\n"
 
@@ -704,22 +714,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "S'està eliminant l'usuari %s del grup %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: El membre %s és desconegut\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: No és una tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "S'està canviant la contrasenya per al grup %s\n"
 
@@ -736,35 +730,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Intenteu-ho de nou més tard.\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: no es pot obtenir el bloqueig\n"
+msgid "Who are you?\n"
+msgstr "Qui sou?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: no es pot obtenir el bloqueig del fitxer de contrasenyes ombra\n"
+msgid "Adding user %s to group %s\n"
+msgstr "S'està afegint l'usuari %s al grup %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: no es pot actualitzar l'entrada\n"
+msgid "Removing user %s from group %s\n"
+msgstr "S'està eliminant l'usuari %s del grup %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: no es pot actualitzar l'entrada del fitxer de contrasenyes ombra\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: El membre %s és desconegut\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: no es pot reescriure el fitxer\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: No és una tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: no es pot reescriure el fitxer ombra\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: no es pot desblocar el fitxer\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -796,14 +780,6 @@
 msgstr "%s: s'ha produït un error en afegir la nova entrada de grup\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: el nom %s no és únic\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: el GID %u no és únic\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: no es pot obtenir un GID únic\n"
 
@@ -844,6 +820,9 @@
 msgstr "%s: el grup %s existeix\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: el GID %u no és únic\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Forma d'ús: groupdel grup\n"
 
@@ -871,47 +850,37 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s és el mestre NIS\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "El membre ja existeix\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "No s'han trobat els membres a borrar\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr "Forma d'ús: groupmems -a úsuari | -d úsuari | -D | -l [-g grup]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "Només el superusuari pot afegir members a grups diferents\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "És requereix accés de grup\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "No és propietari principal del grup actual\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "l'autenticació PAM ha fallat per\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "No es pot blocar el fitxer de grup\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "No es pot obrir el fitxer de grup\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "No es pot obrir el fitxer de grup\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -921,6 +890,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Forma d'ús: groupmod [opcions] GRUP\n"
@@ -954,10 +924,6 @@
 msgstr "Forma d'ús: %s [-r] [-s] [grup]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "No\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: «-s» i «-r» són incompatibles\n"
 
@@ -970,6 +936,9 @@
 msgstr "%s: no es pot obrir el fitxer %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: no es pot actualitzar el fitxer %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "l'entrada del fitxer de grup no és vàlida\n"
 
@@ -977,7 +946,6 @@
 msgid "delete line '%s'? "
 msgstr "voleu eliminar la línia «%s»? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "l'entrada de grup està duplicada\n"
 
@@ -1009,11 +977,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: no es pot actualitzar l'entrada per al grup %s\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "l'entrada del fitxer de grup ombra no és vàlida\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "l'entrada de grup ombra està duplicada\n"
 
@@ -1030,10 +996,6 @@
 msgstr "grup ombra %s: no existeix l'usuari %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: no es pot actualitzar el fitxer %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: el fitxer s'ha actualitzat\n"
 
@@ -1065,19 +1027,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: no es pot eliminar el fitxer de grups ombra\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Forma d'ús: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Forma d'ús: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " grups="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1101,17 +1059,19 @@
 "                                l'usuari amb USUARI especific\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Usuari           Port     Des de           Últim\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Usuari                  Port     Últim\n"
 
 msgid "**Never logged in**"
 msgstr "**No ha entrat mai**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "L'usuari és desconegut: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: argument inesperat: %s\n"
@@ -1128,11 +1088,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r ordinador\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "El temps d'accés no és vàlid\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1140,7 +1098,6 @@
 "\n"
 "Sistema tancat per a manteniment rutinari\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1180,7 +1137,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "S'ha excedit el nombre màxim d'intents (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: avortat a petició del PAM\n"
 
@@ -1199,6 +1155,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: fallada al fer fork: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Avís: accés reactivat després d'un bloqueig temporal.\n"
 
@@ -1221,14 +1181,16 @@
 "temps d'accés excedit\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Forma d'ús: newgrp [-] [grup]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Forma d'ús: sg grup [[-c] ordre]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Contrasenya antiga: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "El UID és desconegut: %u\n"
@@ -1237,11 +1199,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "El GID és desconegut: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Contrasenya antiga: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "hi ha massa grups\n"
 
@@ -1253,7 +1210,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: el grup %s no existeix\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: no es pot blocar «/etc/passwd».\n"
 
@@ -1266,6 +1233,10 @@
 msgstr "%s: no es poden obrir els fitxers\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: s'ha produït un error en actualitzar el fitxer\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: línia %d: la línia no és vàlida\n"
 
@@ -1297,11 +1268,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: línia %d: no es pot actualitzar l'entrada\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: s'ha produït un error en actualitzar el fitxer\n"
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1377,11 +1343,9 @@
 msgid "New password: "
 msgstr "Contrasenya nova:"
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Intenteu-ho de nou.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1389,7 +1353,6 @@
 "\n"
 "Avís: contrasenya feble (introduïu-la de nou per fer-la servir igualment).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "No coincideixen; intenteu-ho de nou.\n"
 
@@ -1427,11 +1390,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "No s'ha canviat la contrasenya per a %s.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "S'ha canviat la contrasenya.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "S'ha establert la contrasenya a caducada.\n"
 
@@ -1439,11 +1400,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Forma d'ús: %s [-q] [-r] [-s] [contrasenya [ombra]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "l'entrada del fitxer de contrasenyes no és vàlida\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "l'entrada de contrasenya està duplicada\n"
 
@@ -1475,11 +1434,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: no es pot actualitzar l'entrada de la contrasenya per a %s\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "l'entrada del fitxer de contrasenyes ombra no és vàlida\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "entrada de contrasenya ombra duplicada\n"
 
@@ -1515,15 +1472,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: no es pot eliminar el fitxer de contrasenyes ombra\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "L'accés de «su» a aquest compte està DENEGAT.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "S'ha evitat l'autenticació de contrasenya.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Si us plau introduïu la VOSTRA contrasenya com a autenticació.\n"
 
@@ -1531,7 +1485,6 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1586,15 +1539,15 @@
 "%s: %s\n"
 "(Ignorat)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "No hi ha intèrpret d'ordres\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "No hi ha fitxer de contrasenyes\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "No hi ha entrada de contrasenya per a «root»\n"
 
@@ -1638,7 +1591,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: s'han especificat massa grups (màx de %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1659,6 +1612,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1713,14 +1668,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: no es pot obtenir un UID únic\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: no es pot obtenir un GID únic\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: el directori base «%s» no és vàlid\n"
@@ -1813,7 +1768,6 @@
 msgid "Creating mailbox file"
 msgstr "S'està creant la bústia de correu"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1835,6 +1789,10 @@
 "g».\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: el UID %u no és únic\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1845,10 +1803,8 @@
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr ""
-"%s: avís: CREATE_HOME no està suportat, si us plau useu «-m» en el seu "
-"lloc.\n"
+"%s: avís: CREATE_HOME no està suportat, si us plau useu «-m» en el seu lloc.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1929,7 +1885,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: s'ha produït un error en eliminar el directori %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2050,6 +2006,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2088,6 +2050,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s: el nom %s no és únic\n"
+
+#~ msgid "No\n"
+#~ msgstr "No\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/cs.po
===================================================================
--- upstream/trunk/po/cs.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/cs.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-24 18:00+0100\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -25,7 +25,6 @@
 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"
 
@@ -38,19 +37,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Varování: neznámá skupina %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Varování: příliš mnoho skupin\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Platnost vašeho hesla vypršela."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Vaše heslo je vypnuto."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Platnost vašeho účtu vypršela."
 
@@ -64,11 +59,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Platnost vašeho hesla vyprší za %ld dnů.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Platnost vašeho hesla vyprší zítra.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Platnost vašeho hesla vyprší dnes.\n"
 
@@ -76,7 +69,6 @@
 msgid "Unable to change tty %s"
 msgstr "TTY %s nelze změnit"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Přetečení prostředí\n"
 
@@ -101,7 +93,6 @@
 "%d selhání od posledního přihlášení.\n"
 "Poslední: %s na %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Příliš mnoho souběžných přihlášení.\n"
 
@@ -196,7 +187,6 @@
 msgid "%s's Password: "
 msgstr "Heslo uživatele %s:"
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -231,7 +221,6 @@
 "  -W, --warndays VAR_DNŮ        nastaví varování o expiraci na VAR_DNŮ\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 "Zadejte novou hodnotu, nebo stiskněte ENTER pro použití implicitní hodnoty\n"
@@ -254,27 +243,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Vypršení platnosti účtu (RRRR-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Poslední změna hesla\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "nikdy\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "heslo musí být změněno\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Platnost hesla vyprší\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Vypnuté heslo\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Platnost účtu vyprší\t\t\t\t\t\t: "
 
@@ -303,18 +286,14 @@
 msgstr "%s: ověření pomocí PAM selhalo\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: soubor s hesly nelze zamknout\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: soubor s hesly nelze otevřít\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: neznámý uživatel %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: soubor se stínovými hesly není přítomen\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: soubor se stínovými hesly nelze zamknout\n"
 
@@ -323,18 +302,14 @@
 msgstr "%s: soubor se stínovými hesly nelze otevřít\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: selhalo odevzdání privilegií (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: soubor se stínovými hesly nelze přepsat\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Měním informace o uživateli %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: soubor s hesly nelze přepsat\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: chyba při změně položek\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: soubor s hesly nelze aktualizovat\n"
 
@@ -343,14 +318,26 @@
 msgstr "%s: soubor se stínovými hesly nelze aktualizovat\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: soubor se stínovými hesly nelze přepsat\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: soubor se stínovými hesly není přítomen\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: soubor s hesly nelze přepsat\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: selhalo odevzdání privilegií (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: neznámý uživatel %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Měním informace o uživateli %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: chyba při změně položek\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -395,22 +382,28 @@
 msgid "Other"
 msgstr "Ostatní"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: vaše uživatelské jméno nelze zjistit.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Nelze změnit ID na root.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: uživatele \"%s\" nelze na NIS klientu změnit.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "Nelze zamknout soubor s hesly; zkuste to později.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: \"%s\" je hlavním NIS serverem pro tohoto klienta.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Soubor s hesly nelze otevřít.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Měním informace o uživateli %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s se v /etc/passwd nenalézá\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Chyba při aktualizaci položky v souboru s hesly.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Nelze provést změny v souboru s hesly.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Soubor s hesly nelze odemknout.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: chybné jméno: \"%s\"\n"
@@ -432,37 +425,25 @@
 msgstr "%s: \"%s\" obsahuje chybné znaky\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: položka je příliš dlouhá\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: vaše uživatelské jméno nelze zjistit.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Nelze změnit ID na root.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: uživatele \"%s\" nelze na NIS klientu změnit.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Nelze zamknout soubor s hesly; zkuste to později.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: \"%s\" je hlavním NIS serverem pro tohoto klienta.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Soubor s hesly nelze otevřít.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Měním informace o uživateli %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s se v /etc/passwd nenalézá\n"
+msgid "%s: fields too long\n"
+msgstr "%s: položka je příliš dlouhá\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Chyba při aktualizaci položky v souboru s hesly.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Nelze provést změny v souboru s hesly.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Soubor s hesly nelze odemknout.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -521,6 +502,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: soubor se stínovými hesly nelze otevřít\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: chyba při aktualizaci souboru se stínovými hesly\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: položku souboru se skupinami nelze aktualizovat\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: řádek %d je příliš dlouhý\n"
@@ -533,15 +522,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: řádek %d: neznámá skupina %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: řádek %d: položku v souboru s hesly nelze aktualizovat\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: řádek %d: položku nelze aktualizovat\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: chyba, změny budou ignorovány\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: soubor se stínovými hesly nelze zamknout\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: chyba při aktualizaci souboru se stínovými hesly\n"
 
@@ -550,18 +543,13 @@
 msgstr "%s: chyba při aktualizaci souboru s hesly\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: soubor s hesly nelze zamknout\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: soubor se stínovými hesly nelze zamknout\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: řádek %d: neznámý uživatel %s\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: řádek %d: položku v souboru s hesly nelze aktualizovat\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -596,7 +584,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "Shell %s je neplatný.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Použití: expiry {-f|-c}\n"
 
@@ -604,7 +591,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: neznámý uživatel\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -641,7 +627,6 @@
 "                                nebo -l)\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Uživatel    Chyb     Maximum Poslední                 Na\n"
 
@@ -682,14 +667,38 @@
 msgstr "%s: přepínač -A funguje pouze se stínovými hesly skupin\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Kdo jste?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: nelze získat zámek\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+msgstr "%s: nelze získat zámek pro soubor se stínovými hesly\n"
+
+#, c-format
 msgid "%s: can't open file\n"
 msgstr "%s: nelze otevřít soubor\n"
 
 #, c-format
+msgid "%s: can't re-write file\n"
+msgstr "%s: nelze přepsat soubor\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: nelze přepsat soubor se stínovými hesly\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: nelze odemknout soubor\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: nelze aktualizovat položku\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: nelze aktualizovat položku souboru se stínovými hesly\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "neznámá skupina %s\n"
 
@@ -702,22 +711,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Odstraňuji uživatele %s ze skupiny %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: neznámý člen %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: Nejedná se o tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Měním heslo skupiny %s\n"
 
@@ -734,35 +727,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Zkuste to později\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: nelze získat zámek\n"
+msgid "Who are you?\n"
+msgstr "Kdo jste?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: nelze získat zámek pro soubor se stínovými hesly\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Přidávám uživatele %s do skupiny %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: nelze aktualizovat položku\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Odstraňuji uživatele %s ze skupiny %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: nelze aktualizovat položku souboru se stínovými hesly\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: neznámý člen %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: nelze přepsat soubor\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: Nejedná se o tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: nelze přepsat soubor se stínovými hesly\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: nelze odemknout soubor\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -793,14 +776,6 @@
 msgstr "%s: chyba při přidávání položky souboru se skupinami\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: jméno %s není jedinečné\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u není jedinečné\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: nelze získat jedinečné GID\n"
 
@@ -841,6 +816,9 @@
 msgstr "%s: skupina %s již existuje\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u není jedinečné\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Použití: groupdel skupina\n"
 
@@ -868,47 +846,37 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s je hlavním NIS serverem\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "Člen již ve skupině existuje\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "Člen určený pro odstranění nebyl nalezen\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr "Použití: groupmems -a uživatel | -d uživatel | -D | -l [-g skupina]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "Přidávat členy do jiných skupin může pouze uživatel root\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "Je vyžadován skupinový přístup\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "Nejste vlastníkem aktuální skupiny\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "Ověření pomocí PAM selhalo\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "Soubor se skupinami nelze zamknout\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "Soubor se skupinami nelze otevřít\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "Soubor se skupinami nelze zavřít\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -918,6 +886,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Použití: groupmod [volby] SKUPINA\n"
@@ -952,10 +921,6 @@
 msgstr "Použití: %s [-r] [-s] [soubor se skupinami]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Ne\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s a -r nejsou slučitelné\n"
 
@@ -968,6 +933,9 @@
 msgstr "%s: soubor %s nelze otevřít\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: soubor %s nelze aktualizovat\n"
+
 msgid "invalid group file entry\n"
 msgstr "chybná položka v souboru se skupinami\n"
 
@@ -975,7 +943,6 @@
 msgid "delete line '%s'? "
 msgstr "smazat řádek \"%s\"?"
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "tato položka se v souboru se skupinami vyskytuje vícekrát\n"
 
@@ -1007,11 +974,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: položku skupiny %s nelze odstranit\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "chybná položka v souboru se stínovými skupinami\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "duplikovaná položka v souboru se stínovými skupinami\n"
 
@@ -1028,10 +993,6 @@
 msgstr "stínová skupina %s: uživatel %s neexistuje\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: soubor %s nelze aktualizovat\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: soubory byly aktualizovány\n"
 
@@ -1063,19 +1024,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: soubor se stínovými hesly skupin nelze smazat\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Použití: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Použití: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " skupiny="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1096,17 +1053,19 @@
 "  -u, --user ÚČET               zobrazí záznamy lastlogu pro uživatele ÚČET\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Uživatel         Port     Z                Naposledy\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Uživatel                Port     Naposledy\n"
 
 msgid "**Never logged in**"
 msgstr "**Nikdy nebyl přihlášen**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Neznámý uživatel: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: neočekávaný argument: %s\n"
@@ -1123,11 +1082,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "         %s [-p] -r počítač\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Chybný čas přihlášení\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1135,7 +1092,6 @@
 "\n"
 "Systém byl uzavřen kvůli pravidelné údržbě.\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1175,7 +1131,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Maximální počet pokusů vypršel (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: PAM vyžádal přerušení\n"
 
@@ -1194,6 +1149,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: chyba rozdvojení: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Varování: po dočasném zákazu je přihlašování opět povoleno.\n"
 
@@ -1216,14 +1175,16 @@
 "Čas přihlášení vypršel\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Použití: newgrp [-] [skupina]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Použití: sg skupina [[-c] příkaz]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Staré heslo: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "neznámé UID: %u\n"
@@ -1232,11 +1193,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "neznámé GID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Staré heslo: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "příliš mnoho skupin\n"
 
@@ -1248,7 +1204,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: skupina %s neexistuje\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: soubor /etc/passwd nelze zamknout.\n"
 
@@ -1261,6 +1227,10 @@
 msgstr "%s: soubory nelze otevřít\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: chyba při aktualizaci souborů\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: řádek %d: chybný řádek\n"
 
@@ -1292,11 +1262,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: řádek %d: položku nelze aktualizovat\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: chyba při aktualizaci souborů\n"
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1366,11 +1331,9 @@
 msgid "New password: "
 msgstr "Nové heslo: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Zkuste to znovu.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1378,7 +1341,6 @@
 "\n"
 "Varování: slabé heslo (chcete-li jej opravdu použít, zadejte jej znovu).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Neshodují se; zkuste to znovu.\n"
 
@@ -1416,11 +1378,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Heslo uživatele %s nebylo změněno.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Heslo bylo změněno.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Heslu byla nastavena vypršená platnost.\n"
 
@@ -1429,11 +1389,9 @@
 msgstr ""
 "Použití: %s [-q] [-r] [-s] [soubor s hesly [soubor se stínovými hesly]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "chybná položka v souboru s hesly\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "duplikovaná položka v souboru s hesly\n"
 
@@ -1465,11 +1423,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: položku souboru s hesly pro uživatele %s nelze aktualizovat\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "chybná položka v souboru se stínovými hesly\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "duplikovaná položka v souboru se stínovými hesly\n"
 
@@ -1505,15 +1461,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: nemůžete smazat soubor se stínovými hesly\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Z tohoto účtu je přístup k su ZAKÁZÁN.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Ověřování heslem vynecháno.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Pro ověření zadejte VAŠE vlastní heslo.\n"
 
@@ -1521,7 +1474,6 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1575,15 +1527,15 @@
 "%s: %s\n"
 "(Ignoruji)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Žádný shell\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Soubor s hesly neexistuje\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "V databázi není položka pro uživatele 'root'\n"
 
@@ -1627,7 +1579,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: zadáno příliš mnoho skupin (max %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1648,6 +1600,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1694,14 +1648,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: nelze získat jedinečné UID\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: nelze získat jedinečné GID\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: chybný základní adresář \"%s\"\n"
@@ -1793,7 +1747,6 @@
 msgid "Creating mailbox file"
 msgstr "Vytvářím poštovní schránku"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1815,6 +1768,10 @@
 "použijte -g.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u není jedinečné\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1826,7 +1783,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: varování: CREATE_HOME není podporováno, použijte přepínač -m\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1905,7 +1861,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: chyba při mazání adresáře %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2022,6 +1978,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2060,6 +2022,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s: jméno %s není jedinečné\n"
+
+#~ msgid "No\n"
+#~ msgstr "Ne\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/da.po
===================================================================
--- upstream/trunk/po/da.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/da.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-24 18:50+0100\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
 "Language-Team: Danish\n"
@@ -27,7 +27,6 @@
 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"
 
@@ -39,19 +38,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Advarsel: ukendt gruppe %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Advarsel: for mange grupper\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Din adgangskode er udløbet."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Din adgangskode er inaktiv."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Din adgangskode er udløbet."
 
@@ -65,11 +60,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Din adgangskode udløber om %ld dage.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Din adgangskode udløber i morgen.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Din adgangskode udløber i dag.\n"
 
@@ -77,7 +70,6 @@
 msgid "Unable to change tty %s"
 msgstr "Kunne ikke ændre tty %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Miljøoverløb\n"
 
@@ -99,7 +91,6 @@
 "%d fejl siden sidste logind.\n"
 "Sidst var %s, %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Logget på for mange gange.\n"
 
@@ -194,7 +185,6 @@
 msgid "%s's Password: "
 msgstr "%s's adgangskode: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -232,7 +222,6 @@
 "                                VARSELSDAGE\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Angiv ny værdi eller tryk RETUR for standardværdien\n"
 
@@ -254,27 +243,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Konto-udløbsdato (ÅÅÅÅ-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Sidste ændring af adgangskode\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "aldrig\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "adgangskoden skal ændres\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Adgangskode udløber\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Adgangskode inaktiv\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Konto udløber\t\t\t\t\t\t: "
 
@@ -303,18 +286,14 @@
 msgstr "%s: PAM-autentifikation mislykkedes\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: kan ikke låse adgangskodefil\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: kan ikke åbne adgangskodefil\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: ukendt bruger %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: skyggeadgangskodefilen findes ikke\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: kan ikke låse skyggeadgangskodefil\n"
 
@@ -323,18 +302,14 @@
 msgstr "%s: kan ikke åbne skyggeadgangskodefil\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: kunne ikke afgive rettigheder (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: kan ikke genskrive skyggeadgangskodefilen\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Ændrer forældelsesoplysninger for %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: kan ikke genskrive adgangskodefilen\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: fejl ved ændring af felter\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: kan ikke opdatere adgangskodefil\n"
 
@@ -343,14 +318,26 @@
 msgstr "%s: kan ikke opdatere skyggeadgangskodefil\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: kan ikke genskrive skyggeadgangskodefilen\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: skyggeadgangskodefilen findes ikke\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: kan ikke genskrive adgangskodefilen\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: kunne ikke afgive rettigheder (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: ukendt bruger %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Ændrer forældelsesoplysninger for %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: fejl ved ændring af felter\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -394,22 +381,28 @@
 msgid "Other"
 msgstr "Andet"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Kan ikke afgøre dit brugernavn.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Kan ikke ændre ID til root.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: kan ikke ændre brugeren'%s' på NIS-klienten.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "Kan ikke låse adgangskodefilen; forsøg igen senere.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: '%s' er NIS-masteren for denne klient.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Kan ikke åbne adgangskodefilen.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Ændrer brugeroplysninger for %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s ikke fundet i /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Fejl under opdatering af adgangskodelinje.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Kan ikke skrive ændringerne til adgangskodefilen.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Kan ikke låse adgangskodefilen op.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: ugyldigt navn: '%s'\n"
@@ -431,37 +424,25 @@
 msgstr "%s: '%s' indeholder ugyldige tegn\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: felter for lange\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Kan ikke afgøre dit brugernavn.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Kan ikke ændre ID til root.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: kan ikke ændre brugeren'%s' på NIS-klienten.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Kan ikke låse adgangskodefilen; forsøg igen senere.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: '%s' er NIS-masteren for denne klient.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Kan ikke åbne adgangskodefilen.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Ændrer brugeroplysninger for %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s ikke fundet i /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s: felter for lange\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Fejl under opdatering af adgangskodelinje.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Kan ikke skrive ændringerne til adgangskodefilen.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Kan ikke låse adgangskodefilen op.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -520,6 +501,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: Kan ikke åbne skyggefilen\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: fejl under opdatering af skyggefil\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: fejl under opdatering af gruppelinje\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: linje %d: linjen er for lang\n"
@@ -532,15 +521,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: linje %d: ukendt gruppe %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: linje %d: kan ikke opdatere adgangskodelinje\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: linje %d: kan ikke opdatere posten\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: fejl opdaget, ændringerne blev ignoreret\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: Kan ikke låse skyggefilen\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: fejl under opdatering af skyggefil\n"
 
@@ -549,18 +542,13 @@
 msgstr "%s: fejl under opdatering af adgangskodefil\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: kan ikke låse adgangskodefil\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: Kan ikke låse skyggefilen\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: linje %d: ukendt bruger %s\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: linje %d: kan ikke opdatere adgangskodelinje\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -597,7 +585,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s er en ugyldig skal.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Brug: expiry {-f|-c}\n"
 
@@ -605,7 +592,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: ukendt bruger\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -642,7 +628,6 @@
 "                                brugeren med LOGIND\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Logind      Fejl     Maksimum Seneste                 Tid\n"
 
@@ -683,14 +668,38 @@
 msgstr "%s: der kræves skyggeadgangskoder for -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Hvem er du?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: Kan ikke opnå lås\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: kan ikke genskrive fil\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: kan ikke genskrive skyggefil\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: kan ikke låse fil op\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: kan ikke opdatere linje\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: kan ikke opdatere skyggelinje\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "ukendt gruppe: %s\n"
 
@@ -703,22 +712,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Fjerner brugeren %s fra gruppen %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: ukendt medlem %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: Ikke en tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Ændrer adgangskoden for gruppen %s\n"
 
@@ -735,35 +728,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Prøv igen senere\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: Kan ikke opnå lås\n"
+msgid "Who are you?\n"
+msgstr "Hvem er du?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: Kan ikke opnå skyggelås\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Tilføjer brugeren %s til gruppen %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: kan ikke opdatere linje\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Fjerner brugeren %s fra gruppen %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: kan ikke opdatere skyggelinje\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: ukendt medlem %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: kan ikke genskrive fil\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: Ikke en tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: kan ikke genskrive skyggefil\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: kan ikke låse fil op\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -795,14 +778,6 @@
 msgstr "%s: fejl under tilføjelse af gruppelinje\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: navnet %s er ikke unikt\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u er ikke unikt\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: kan ikke få unik GID\n"
 
@@ -843,6 +818,9 @@
 msgstr "%s: gruppen %s eksisterer\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u er ikke unikt\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Brug: groupdel gruppe\n"
 
@@ -870,48 +848,38 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s er NIS-masteren\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "Medlemmet eksisterer allerede\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "Medlemmet, der skulle slettes, blev ikke fundet\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 "Brug: groupmems -a brugernavn| -d brugernavn | -D | -l [-g gruppenavn]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "Kun root kan tilføje medlemmer til andre grupper\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "Gruppeadgang kræves\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "Ikke primær ejer af den aktuelle gruppe\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "PAM-autentifikation mislykkedes for\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "Kan ikke låse gruppefil\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "Kan ikke åbne gruppefil\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "Kan ikke lukke gruppefil\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -921,6 +889,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Brug: groupmod [tilvalg] GRUPPE\n"
@@ -954,10 +923,6 @@
 msgstr "Brug %s [-r] [-s] [gruppe]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Nej\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s og -r er ikke kompatible\n"
 
@@ -970,6 +935,9 @@
 msgstr "%s: kan ikke åbne filen %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: kan ikke opdatere filen %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "ugyldig gruppefils-linje\n"
 
@@ -977,7 +945,6 @@
 msgid "delete line '%s'? "
 msgstr "slet linjen '%s'? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "gruppelinjen er en dublet\n"
 
@@ -1009,11 +976,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: kan ikke opdatere linjen for gruppen %s\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "ugyldig skyggegruppefils-linje\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "skyggegruppelinjen er en dublet\n"
 
@@ -1030,10 +995,6 @@
 msgstr "skyggegruppen %s: ingen bruger %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: kan ikke opdatere filen %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: filerne er blevet opdateret\n"
 
@@ -1065,19 +1026,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: kan ikke slette skyggegruppefilen\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Brug: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Brug: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " grupper="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1101,17 +1058,19 @@
 "                                det angivne LOGIND\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Brugernavn       Port     Fra              Seneste\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Brugernavn              Port     Seneste\n"
 
 msgid "**Never logged in**"
 msgstr "**Har aldrig logget på**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Ukendt bruger: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: uventet argument: %s\n"
@@ -1128,11 +1087,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "      %s [-p] -r vært\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Ugyldig login-tid\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1140,7 +1097,6 @@
 "\n"
 "Systemet er lukket for rutinemæssig vedligehold\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1180,7 +1136,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Maksimalt antal forsøg nået (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "logind: PAM har anmodet om afbrydelse\n"
 
@@ -1199,6 +1154,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: fejl under spaltning: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Advarsel: login genetableret efter midlertidig udelukkelse.\n"
 
@@ -1221,14 +1180,16 @@
 "logind-tid overskredet\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Brug: newgrp [-] [gruppe]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Brug: sg gruppe [[-c] kommando]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Gammel adgangskode: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "ukendt UID: %u\n"
@@ -1237,11 +1198,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "ukendt GID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Gammel adgangskode: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "for mange grupper\n"
 
@@ -1253,7 +1209,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: gruppen %s eksisterer ikke\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: kan ikke låse /etc/passwd.\n"
 
@@ -1266,6 +1232,10 @@
 msgstr "%s: kan ikke åbne filer\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: fejl under opdatering af filerne\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: linje %d: ugyldig linje\n"
 
@@ -1297,11 +1267,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: linje %d: kan ikke opdatere posten\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: fejl under opdatering af filerne\n"
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1371,11 +1336,9 @@
 msgid "New password: "
 msgstr "Ny adgangskode: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Prøv igen.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1383,7 +1346,6 @@
 "\n"
 "Advarsel: svag adgangskode (skriv den igen for at bruge det alligevel).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "De er ikke ens; prøv igen.\n"
 
@@ -1421,11 +1383,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Adgangskoden for %s er uændret.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Adgangskode ændret.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Adgangskode er sat til at udløbe.\n"
 
@@ -1433,11 +1393,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Brug: %s [-q] [-r] [-s] [adgangskode [skygge]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "ugyldig linje i adgangskodefil\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "adgangskodelinjen er en dublet\n"
 
@@ -1469,11 +1427,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: kan ikke opdatere adgangskodelinjen for  %s\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "ugyldig linje i skyggeadgangskodefil\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "skyggeadgangskodelinjen er en dublet\n"
 
@@ -1509,15 +1465,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: kan ikke slette skyggeadgangskodefilen\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Adgang til at udføre su til den konto er NÆGTET.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Gik uden om adgangskode-autentifikation.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Angiv din EGEN adgangskode som autentifikation.\n"
 
@@ -1525,7 +1478,6 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1579,15 +1531,15 @@
 "%s: %s\n"
 "(Ignoreret)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Ingen skal\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Ingen adgangskodefil\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Ingen adgangskodelinje for 'root'\n"
 
@@ -1631,7 +1583,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: der er angivet for mange grupper (højst %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1652,6 +1604,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1699,14 +1653,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: kan ikke få unik UID\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: kan ikke få unik GID\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: ugyldig grundmappe '%s'\n"
@@ -1798,7 +1752,6 @@
 msgid "Creating mailbox file"
 msgstr "Opretter postboks-fil"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1820,6 +1773,10 @@
 "gruppe.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u er ikke unikt\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1831,7 +1788,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: advarsel: CREATE_HOME understøttes ikke, brug i stedet -m.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1909,7 +1865,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: fejl under fjernelse af mappen %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2025,6 +1981,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2063,6 +2025,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s: navnet %s er ikke unikt\n"
+
+#~ msgid "No\n"
+#~ msgstr "Nej\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/de.po
===================================================================
--- upstream/trunk/po/de.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/de.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-24 16:48+0100\n"
 "Last-Translator: Holger Wansing <linux at wansing-online.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -26,7 +26,6 @@
 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"
 
@@ -39,19 +38,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Warnung: unbekannte Gruppe %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Warnung: zu viele Gruppen\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Ihr Kennwort ist abgelaufen."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Ihr Kennwort ist inaktiv."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Ihr Benutzerkonto ist abgelaufen."
 
@@ -65,11 +60,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Ihr Kennwort läuft in %ld Tagen ab.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Ihr Kennwort läuft morgen ab.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Ihr Kennwort läuft heute ab.\n"
 
@@ -77,7 +70,6 @@
 msgid "Unable to change tty %s"
 msgstr "tty %s kann nicht geändert werden"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Umgebungsüberlauf\n"
 
@@ -99,7 +91,6 @@
 "%d Fehlversuche seit letzter Anmeldung.\n"
 "Der letzte war am %s auf %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Zu viele Anmeldungen.\n"
 
@@ -195,7 +186,6 @@
 msgid "%s's Password: "
 msgstr "Kennwort von %s: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -232,7 +222,6 @@
 "                                WARN_DAYS setzen\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Geben Sie einen neuen Wert an oder ENTER für den Standardwert\n"
 
@@ -254,27 +243,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Ablaufdatum des Benutzerkontos (JJJJ-MM-TT)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Letzte Kennwortänderung\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "Nie\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "Kennwort muss geändert werden\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Kennwort läuft ab\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Kennwort inaktiv\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Benutzerkonto läuft ab\t\t\t\t: "
 
@@ -303,18 +286,14 @@
 msgstr "%s: PAM-Authentifizierung fehlgeschlagen\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: kann Kennwortdatei nicht sperren\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: Kann Kennwortdatei nicht öffnen\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: Benutzer %s unbekannt\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: Shadow-Kennwortdatei ist nicht vorhanden\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: Kann Shadow-Kennwortdatei nicht sperren\n"
 
@@ -323,18 +302,14 @@
 msgstr "%s: Kann Shadow-Kennwortdatei nicht öffnen\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: Löschen der Privilegien (%s) fehlgeschlagen\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: Kann die Shadow-Kennwortdatei nicht neu schreiben\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Ändere die Kennwortalterung für %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: Kann die Kennwortdatei nicht neu schreiben\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: Fehler beim Ändern der Felder\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: Kann Kennwortdatei nicht aktualisieren\n"
 
@@ -343,14 +318,26 @@
 msgstr "%s: Kann Shadow-Kennwortdatei nicht aktualisieren\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: Kann die Shadow-Kennwortdatei nicht neu schreiben\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: Shadow-Kennwortdatei ist nicht vorhanden\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: Kann die Kennwortdatei nicht neu schreiben\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: Löschen der Privilegien (%s) fehlgeschlagen\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: Benutzer %s unbekannt\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Ändere die Kennwortalterung für %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: Fehler beim Ändern der Felder\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -393,22 +380,29 @@
 msgid "Other"
 msgstr "Sonstiges"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Kann Ihren Benutzernamen nicht feststellen.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Kann ID nicht auf root ändern.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: Kann den Benutzer »%s« auf dem NIS-Client nicht ändern.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr ""
+"Kann die Kennwortdatei nicht sperren; versuchen Sie es später noch einmal.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: »%s« ist der NIS-Master für diesen Client.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Kann die Kennwortdatei nicht öffnen.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Ändere Benutzerinformationen für %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s in /etc/passwd nicht gefunden\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Fehler beim Aktualisieren des Kennworteintrags.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Kann Änderungen in der Kennwortdatei nicht schreiben.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Kann die Kennwortdatei nicht entsperren.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: Ungültiger Name: »%s«\n"
@@ -430,38 +424,25 @@
 msgstr "%s: »%s« enthält ungültige Zeichen\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: Felder zu lang\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Kann Ihren Benutzernamen nicht feststellen.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Kann ID nicht auf root ändern.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: Kann den Benutzer »%s« auf dem NIS-Client nicht ändern.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr ""
-"Kann die Kennwortdatei nicht sperren; versuchen Sie es später noch einmal.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: »%s« ist der NIS-Master für diesen Client.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Kann die Kennwortdatei nicht öffnen.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Ändere Benutzerinformationen für %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s in /etc/passwd nicht gefunden\n"
+msgid "%s: fields too long\n"
+msgstr "%s: Felder zu lang\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Fehler beim Aktualisieren des Kennworteintrags.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Kann Änderungen in der Kennwortdatei nicht schreiben.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Kann die Kennwortdatei nicht entsperren.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -521,6 +502,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: Kann die shadow-Datei nicht öffnen\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: Fehler beim Aktualisieren der shadow-Datei\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: Fehler beim Aktualisieren des Gruppeneintrags\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: Zeile %d: Zeile zu lang\n"
@@ -533,15 +522,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: Zeile %d: Gruppe %s unbekannt\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: Zeile %d: Kann Kennworteintrag nicht aktualisieren\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: Zeile %d: Kann Eintrag nicht aktualisieren\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: Fehler entdeckt, Änderungen verworfen\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: Kann die shadow-Datei nicht sperren\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: Fehler beim Aktualisieren der shadow-Datei\n"
 
@@ -550,18 +543,14 @@
 msgstr "%s: Fehler beim Aktualisieren der Kennwortdatei\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: kann Kennwortdatei nicht sperren\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: Kann die shadow-Datei nicht sperren\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: Zeile %d: Benutzer %s unbekannt\n"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: Zeile %d: Kann Kennworteintrag nicht aktualisieren\n"
+
+#, fuzzy
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -599,7 +588,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s ist eine ungültige Shell.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Aufruf: expiry {-f|-c}\n"
 
@@ -607,7 +595,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: Unbekannter Benutzer\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -645,7 +632,6 @@
 "                                Benutzerkonto LOGIN\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Anmeldung   Fehlver. Maximum Letzter                  Auf\n"
 
@@ -686,14 +672,38 @@
 msgstr "%s: Shadow-Gruppenkennwörter für -A erforderlich\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Wer sind Sie?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: Sperre nicht möglich\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: Datei kann nicht neu geschrieben werden\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: shadow-Datei kann nicht neu geschrieben werden\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: Datei kann nicht entsperrt werden\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: Eintrag kann nicht aktualisiert werden\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: Shadow-Eintrag kann nicht aktualisiert werden\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "Unbekannte Gruppe: %s\n"
 
@@ -706,22 +716,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Entferne Benutzer %s aus der Gruppe %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: Mitglied %s unbekannt\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: Kein tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Ändere Kennwort für die Gruppe %s\n"
 
@@ -738,35 +732,26 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Versuchen Sie es später noch einmal\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: Sperre nicht möglich\n"
+msgid "Who are you?\n"
+msgstr "Wer sind Sie?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: Sperre für shadow nicht möglich\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Füge Benutzer %s zu Gruppe %s hinzu\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: Eintrag kann nicht aktualisiert werden\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Entferne Benutzer %s aus der Gruppe %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: Shadow-Eintrag kann nicht aktualisiert werden\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: Mitglied %s unbekannt\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: Datei kann nicht neu geschrieben werden\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: Kein tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: shadow-Datei kann nicht neu geschrieben werden\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: Datei kann nicht entsperrt werden\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -798,14 +783,6 @@
 msgstr "%s: Fehler beim Hinzufügen eines neuen Gruppeneintrags\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: Name %s ist nicht einmalig\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u ist nicht einmalig\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: Kann keine einmalige GID bekommen\n"
 
@@ -846,6 +823,9 @@
 msgstr "%s: Gruppe %s bereits vorhanden\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u ist nicht einmalig\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Aufruf: groupdel Gruppe\n"
 
@@ -873,47 +853,41 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s ist der NIS-Master\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr ""
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr ""
 
-#, c-format
 msgid "Group access is required\n"
 msgstr ""
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "PAM authentication failed for\n"
 msgstr "%s: PAM-Authentifizierung fehlgeschlagen\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to lock group file\n"
 msgstr "%s: Kann group-Datei nicht sperren\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to open group file\n"
 msgstr "%s: Kann group-Datei nicht öffnen\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Cannot close group file\n"
 msgstr "%s: Kann group-Datei nicht öffnen\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -923,6 +897,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Aufruf: groupadd [Optionen] Gruppe\n"
@@ -959,10 +934,6 @@
 msgstr "Aufruf: %s [-r] [-s] [Gruppe]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Nein\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s und -r sind nicht kompatibel\n"
 
@@ -975,6 +946,9 @@
 msgstr "%s: Kann Datei %s nicht öffnen\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: Kann Datei %s nicht aktualisieren\n"
+
 msgid "invalid group file entry\n"
 msgstr "Ungültiger Eintrag in group-Datei\n"
 
@@ -982,7 +956,6 @@
 msgid "delete line '%s'? "
 msgstr "Zeile »%s« löschen? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "Doppelter Gruppeneintrag\n"
 
@@ -1014,11 +987,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: Kann Gruppeneintrag %s nicht aktualisieren\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "Ungültiger Shadow-group-Dateieintrag\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "Doppelter Shadow-group-Eintrag\n"
 
@@ -1035,10 +1006,6 @@
 msgstr "Shadow-Gruppe %s: kein Benutzer %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: Kann Datei %s nicht aktualisieren\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: Die Dateien wurden aktualisiert\n"
 
@@ -1070,19 +1037,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: Kann Shadow-group-Datei nicht löschen\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Aufruf: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Aufruf: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " Gruppen="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1105,17 +1068,19 @@
 "  -u, --user LOGIN              Eintrag für Benutzer LOGIN anzeigen\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Benutzer         Port     Von              Letzter\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Benutzer                Port     Letzter\n"
 
 msgid "**Never logged in**"
 msgstr "**Noch nie angemeldet**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Unbekannter Benutzer: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: unerwartetes Argument: %s\n"
@@ -1132,11 +1097,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r Rechner\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Ungültige Anmeldezeit\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1144,7 +1107,6 @@
 "\n"
 "System wegen Wartungsarbeiten geschlossen\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1184,7 +1146,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Maximale Anzahl der Versuche abgelaufen (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: Abbruch angefordert durch PAM\n"
 
@@ -1203,6 +1164,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: Fehler beim Fork: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Warnung: Login reaktiviert nach temporärer Sperre.\n"
 
@@ -1225,14 +1190,16 @@
 "Login-Zeit abgelaufen\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Aufruf: newgrp [-] [Gruppe]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Aufruf: sg Gruppe [[-c] Befehl]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Altes Kennwort: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "Unbekannte UID: %u\n"
@@ -1241,11 +1208,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "Unbekannte GID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Altes Kennwort: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "zu viele Gruppen\n"
 
@@ -1257,7 +1219,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: Gruppe %s existiert nicht\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: Kann /etc/passwd nicht sperren.\n"
 
@@ -1270,6 +1242,10 @@
 msgstr "%s: Kann Dateien nicht öffnen\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: Fehler beim Aktualisieren von Dateien\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: Zeile %d: Ungültige Zeile\n"
 
@@ -1301,11 +1277,7 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: Zeile %d: Kann Eintrag nicht aktualisieren\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: Fehler beim Aktualisieren von Dateien\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1381,11 +1353,9 @@
 msgid "New password: "
 msgstr "Neues Kennwort: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Versuchen Sie es noch einmal.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1394,7 +1364,6 @@
 "Warnung: Schlechtes Kennwort (Geben Sie es noch einmal ein,\n"
 "um es trotzdem zu verwenden).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Sie sind nicht identisch; versuchen Sie es noch einmal.\n"
 
@@ -1433,11 +1402,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Das Kennwort für %s wurde nicht geändert.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Kennwort geändert.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Kennwort wird ablaufen.\n"
 
@@ -1445,11 +1412,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Aufruf: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "Ungültiger Eintrag in Kennwortdatei\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "Doppelter Kennworteintrag\n"
 
@@ -1481,11 +1446,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: Kann passwd-Eintrag für %s nicht aktualisieren\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "Ungültiger Shadow-Kennwortdateieintrag\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "Doppelter Shadow-Kennworteintrag\n"
 
@@ -1521,15 +1484,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: Kann Shadow-Kennwortdatei nicht löschen\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Zugriff mit su zu diesem Benutzerkonto VERWEIGERT.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Kennwort-Authentifizierung umgangen.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Bitte geben Sie Ihr EIGENES Kennwort als Authentifizierung ein.\n"
 
@@ -1537,7 +1497,7 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1591,15 +1551,15 @@
 "%s: %s\n"
 "(Ignoriert)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Keine Shell\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Keine Kennwortdatei\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Kein Kennworteintrag für »root«\n"
 
@@ -1643,7 +1603,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: Zu viele Gruppen angegeben (max. %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1664,6 +1624,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1713,14 +1675,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: Kann keine einmalige UID bekommen\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: Kann keine einmalige GID bekommen\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: Ungültiges Home-Standardverzeichnis »%s«\n"
@@ -1812,7 +1774,6 @@
 msgid "Creating mailbox file"
 msgstr "Erzeuge Mailbox-Datei"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1834,6 +1795,10 @@
 "hinzufügen wollen, benutzen Sie -g.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u ist nicht einmalig\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1847,7 +1812,6 @@
 "%s: Warnung: CREATE_HOME wird nicht unterstützt, verwenden Sie stattdessen -"
 "m.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1928,7 +1892,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: Fehler beim Löschen des Verzeichnisses %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2046,6 +2010,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2086,6 +2056,12 @@
 "%s: Wiederherstellung von %s fehlgeschlagen: %s\n"
 "(Ihre Änderungen befinden sich in %s)\n"
 
+#~ msgid "%s: name %s is not unique\n"
+#~ msgstr "%s: Name %s ist nicht einmalig\n"
+
+#~ msgid "No\n"
+#~ msgstr "Nein\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/dz.po
===================================================================
--- upstream/trunk/po/dz.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/dz.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+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"
@@ -28,7 +28,6 @@
 msgid "crypt method not supported by libcrypt? (%s)\n"
 msgstr ""
 
-#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "རིམ་སྒྲིག་བརྡ་དོན་གྱི་དོན་ལུ་ བར་སྟོང་སྤྲོད་མ་ཚུགས།\n"
 
@@ -40,19 +39,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "ཉེན་བརྡ་:མ་ཤེས་པའི་སྡེ་ཚན་%s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "ཉེན་བརྡ་:སྡེ་ཚན་མང་དྲགས་པ་\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་འདི་ དུས་ཡོལ་ནུག"
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་འདི་ ནུས་མེད་ཨིན་པས།"
 
-#, c-format
 msgid "Your login has expired."
 msgstr "ཁྱོད་ཀྱི་ནང་བསྐྱོད་འདི་ དུས་ཡོལ་ནུག"
 
@@ -66,11 +61,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་འདི་ ཉིནམ་%ldནང་ དུས་ཡོལ་ནི་མས།\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་འདི་ ནངས་པར་དུས་ཡོལ་ནི་མས།\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་འདི་ ད་རིས་དུས་ཡོལ་ནི་མས།\n"
 
@@ -78,7 +71,6 @@
 msgid "Unable to change tty %s"
 msgstr "ཊི་ཊི་ཝའི་ %s བསྒྱུར་བཅོས་འབད་མ་ཚུགས།"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "མཐའ་འཁོར་ལུད་སོང་བ།\n"
 
@@ -102,7 +94,6 @@
 "མཇུག་མམ་གྱི་ནང་བསྐྱོད་འབད་ཞིནམ་ལས་ཚུར་ %dའཐུས་ཤོར་ཚུ།\n"
 "མཇུག་མམ་ %s འདི་ %s གུ་ཨིན་པས།\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "ནང་བསྐྱོད་མང་དྲགས་པ།\n"
 
@@ -198,7 +189,7 @@
 msgid "%s's Password: "
 msgstr "%s's ཆོག་ཡིག་:"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -234,7 +225,6 @@
 "   -W, --warndays WARN_DAYS\t དུས་ཡོལ་ཉེན་བརྡའི་ཉིནམ་འདི་ཚུ་ WARN_DAYSལུ་ གཞི་སྒྲིག་འབད།\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "བེ་ལུ་གསརཔ་བཙུགས་ ཡང་ཅིན་ སྔོན་སྒྲིག་གི་དོན་ལུ་ ENTERལུ་ཨེབས།\n"
 
@@ -256,27 +246,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "རྩིས་ཐོའི་དུས་ཡོལ་ཚེས་གྲངས་(ཝའི་ཝའི་ཝའི་ཝའི་-ཨེམ་ཨེམ་-ཌི་ཌི་)།"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "མཇུག་གི་ཆོག་ཡིག་བསྒྱུར་བཅོས་\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "ནམ་ཡང་\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "ཆོག་ཡིག་འདི་བསྒྱུར་བཅོས་འབད་དགོ\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "ཆོག་ཡིག་དུས་ཡོལཝ་ཨིན་\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "ཆོག་ཡིག་ནུས་མེད་\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "རྩིས་ཐོ་དུས་ཡོལཝ་ཨིན་\t\t\t\t\t\t: "
 
@@ -305,18 +289,14 @@
 msgstr "%s: པི་ཨེ་ཨེམ་ བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: མ་ཤེས་པའི་ལག་ལེན་པ་%s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་འདི་ མིན་འདུག\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མ་ཚུགས།\n"
 
@@ -325,18 +305,14 @@
 msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: ཁེ་དབང་(%s)ཚུ་བཀོག་ནིའི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ ལོག་འབྲི་མ་ཚུགས།\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "%s གི་དོན་ལུ་ རྒས་པའི་བརྡ་དོན་བསྒྱུར་བཅོས་འབད་དོ།\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ ལོག་འབྲི་མ་ཚུགས།\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: ས་སྒོ་ཚུ་བསྒྱུར་བཅོས་འབད་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ དུས་མཐུན་བཟོ་མ་ཚུགས།\n"
 
@@ -345,14 +321,26 @@
 msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ དུས་མཐུན་བཟོ་མ་ཚུགས།\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ ལོག་འབྲི་མ་ཚུགས།\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་འདི་ མིན་འདུག\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ ལོག་འབྲི་མ་ཚུགས།\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: ཁེ་དབང་(%s)ཚུ་བཀོག་ནིའི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: མ་ཤེས་པའི་ལག་ལེན་པ་%s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "%s གི་དོན་ལུ་ རྒས་པའི་བརྡ་དོན་བསྒྱུར་བཅོས་འབད་དོ།\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: ས་སྒོ་ཚུ་བསྒྱུར་བཅོས་འབད་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -395,22 +383,28 @@
 msgid "Other"
 msgstr "གཞན།"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: ཁྱོད་ཀྱི་ལག་ལེན་པའི་མིང་ གཏན་འབེབས་བཟོ་མི་ཚུགས།\n"
+msgid "Cannot change ID to root.\n"
+msgstr "རྩ་བ་ལུ་ ཨའི་ཌི་ བསྒྱུར་བཅོས་འབད་མི་ཚུགས།\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: ཨེན་ཨའི་ཨེསི་ ཞབས་ཏོག་སྤྱོད་མི་གུ་ ལག་ལེན་པ་ '%s' བསྒྱུར་བཅོས་འབད་མི་ཚུགས།\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "ཆོག་ཡིག་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས་ ཤུལ་ལས་ལོག་སྟེ་འབད་རྩོལ་སྐྱེད།\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: '%s' འདི་ ཞབས་ཏོག་སྤྱོད་མི་འདི་གི་དོན་ལུ་ ཨེན་ཨའི་ཨེསི་ ཨམ་ཨིན།\n"
+msgid "Cannot open the password file.\n"
+msgstr "ཆོག་ཡིག་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "%sགི་དོན་ལུ་ ལག་ལེན་པའི་བརྡ་དོན་ བསྒྱུར་བཅོས་འབད་དོ།\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s:  /etc/passwd ནང་ལུ་ %s མ་ཐོབ།\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "ཆོག་ཡིག་ཐོ་བཀོད་དུས་མཐུན་འབདཝ་ད་ལུ་ འཛོལ་བ།\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "ཆོག་ཡིག་ཡིག་སྣོད་བསྒྱུར་བཅོས་ཚུ་ དང་ལེན་འབད་མི་ཚུགས།\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "ཆོག་ཡིག་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: ནུས་མེད་ཀྱི་མིང་:'%s'\n"
@@ -432,37 +426,25 @@
 msgstr "%s:  '%s' ནང་ལུ་ ཁྲིམས་འགལ་ཡིག་ཆ་ཚུ་ཡོད།\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: ས་སྒོ་ཚུ་རིང་དྲགས་པས།\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: ཁྱོད་ཀྱི་ལག་ལེན་པའི་མིང་ གཏན་འབེབས་བཟོ་མི་ཚུགས།\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "རྩ་བ་ལུ་ ཨའི་ཌི་ བསྒྱུར་བཅོས་འབད་མི་ཚུགས།\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: ཨེན་ཨའི་ཨེསི་ ཞབས་ཏོག་སྤྱོད་མི་གུ་ ལག་ལེན་པ་ '%s' བསྒྱུར་བཅོས་འབད་མི་ཚུགས།\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "ཆོག་ཡིག་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས་ ཤུལ་ལས་ལོག་སྟེ་འབད་རྩོལ་སྐྱེད།\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: '%s' འདི་ ཞབས་ཏོག་སྤྱོད་མི་འདི་གི་དོན་ལུ་ ཨེན་ཨའི་ཨེསི་ ཨམ་ཨིན།\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "ཆོག་ཡིག་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
+msgid "Changing the user information for %s\n"
+msgstr "%sགི་དོན་ལུ་ ལག་ལེན་པའི་བརྡ་དོན་ བསྒྱུར་བཅོས་འབད་དོ།\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s:  /etc/passwd ནང་ལུ་ %s མ་ཐོབ།\n"
+msgid "%s: fields too long\n"
+msgstr "%s: ས་སྒོ་ཚུ་རིང་དྲགས་པས།\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "ཆོག་ཡིག་ཐོ་བཀོད་དུས་མཐུན་འབདཝ་ད་ལུ་ འཛོལ་བ།\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "ཆོག་ཡིག་ཡིག་སྣོད་བསྒྱུར་བཅོས་ཚུ་ དང་ལེན་འབད་མི་ཚུགས།\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "ཆོག་ཡིག་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -521,6 +503,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་དུས་མཐུན་བཟོ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: སྡེ་ཚན་ཐོ་བཀོད་དུས་མཐུན་བཟོ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: གྲལ་ཐིག་ %d: གྲལ་ཐིག་རིང་དྲགས་པས།\n"
@@ -533,15 +523,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: གྲལ་ཐིག་ %d: མ་ཤེས་པའི་སྡེ་ཚན་  %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: གྲལ་ཐིག་ %d: ཆོག་ཡིག་ཐོ་བཀོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: གྲལ་ཐིག་ %d: ཐོ་བཀོད་དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: འཛོལ་བ་སྐྱོན་འཛིན་འབད་ཡི་ བསྒྱུར་བཅོས་ཚུ་སྣང་མེད་བཞག་ཡི།\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་དུས་མཐུན་བཟོ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
 
@@ -550,18 +544,14 @@
 msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་དུས་མཐུན་བཟོ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: གྲལ་ཐིག་ %d: མ་ཤེས་པའི་ལག་ལེན་པ་%s\n"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: གྲལ་ཐིག་ %d: ཆོག་ཡིག་ཐོ་བཀོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+
+#, fuzzy
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -598,7 +588,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s འདི་ནུས་མེད་ཀྱི་ཤལ་ཨིན།\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "ལག་ལེན་: དུས་ཡོལ་{-f|-c}\n"
 
@@ -606,7 +595,7 @@
 msgid "%s: unknown user\n"
 msgstr "%s: མ་ཤེས་པའི་ལག་ལེན་པ།\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -641,7 +630,6 @@
 "བཟོཝ་ཨིན།\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "ནང་བསྐྱོད་       མང་མཐའི་མཇུག་མཐའ་འཐུས་ཤོར་                   ཨཱོན། \n"
 
@@ -682,14 +670,38 @@
 msgstr "%s: -Aགི་དོན་ལུ་ གྱིབ་མའི་སྡེ་ཚན་ཆོག་ཡིག་ཚུ་དགོ\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "ཁྱོད་ག་སྨོ?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+msgstr "%s: གྱིབ་མ་ལྡེ་མིག་ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+
+#, c-format
 msgid "%s: can't open file\n"
 msgstr "%s: ཡིག་སྣོད་ཁ་ཕྱེ་མི་ཚུགས།\n"
 
 #, c-format
+msgid "%s: can't re-write file\n"
+msgstr "%s: ཡིག་སྣོད་ལོག་འབྲི་མི་ཚུགས།\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་ལོག་འབྲི་མི་ཚུགས།\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: ཡིག་སྣོད་ལྡེ་མིག་ཕྱེ་མིཚུགས།\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: ཐོ་བཀོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: གྱིབ་མའི་ཐོ་བཀོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "མ་ཤེས་པའི་སྡེ་ཚན་:%s\n"
 
@@ -702,22 +714,6 @@
 msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
 
 #, c-format
-msgid "Adding user %s to group %s\n"
-msgstr "སྡེ་ཚན་ %sལུ་ ལག་ལེན་པ་ %sཁ་སྐོང་འབད་དོ།\n"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "སྡེ་ཚན་ %sནང་ལས་ ལག་ལེན་པ་ %sརྩ་བསྐྲད་གཏང་དོ།\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: མ་ཤེས་པའི་འཐུས་མི་ %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: ཊི་ཊི་ཝའི་མེན།\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "སྡེ་ཚན་ %sགི་དོན་ལུ་ ཆོག་ཡིག་སོར་དོ།\n"
 
@@ -734,35 +730,26 @@
 msgid "%s: Try again later\n"
 msgstr "%s: དོ་རུང་ཤུལ་ལས་འབད་རྩོལ་བསྐྱེད།\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+msgid "Who are you?\n"
+msgstr "ཁྱོད་ག་སྨོ?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: གྱིབ་མ་ལྡེ་མིག་ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+msgid "Adding user %s to group %s\n"
+msgstr "སྡེ་ཚན་ %sལུ་ ལག་ལེན་པ་ %sཁ་སྐོང་འབད་དོ།\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: ཐོ་བཀོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+msgid "Removing user %s from group %s\n"
+msgstr "སྡེ་ཚན་ %sནང་ལས་ ལག་ལེན་པ་ %sརྩ་བསྐྲད་གཏང་དོ།\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: གྱིབ་མའི་ཐོ་བཀོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: མ་ཤེས་པའི་འཐུས་མི་ %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: ཡིག་སྣོད་ལོག་འབྲི་མི་ཚུགས།\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: ཊི་ཊི་ཝའི་མེན།\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་ལོག་འབྲི་མི་ཚུགས།\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: ཡིག་སྣོད་ལྡེ་མིག་ཕྱེ་མིཚུགས།\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -794,14 +781,6 @@
 msgstr "%s: སྡེ་ཚན་ཐོ་བཀོད་གསརཔ་ཁ་སྐོང་འབད་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: མིང་ %s འདི་ ཐུན་མོང་པ་ཨིན།\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: ཇི་ཨའི་ཌི་ %uའདི་ ཐུན་མོང་པ་ཨིན།\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: ཐུན་མོང་མ་ཡིན་པའི་ ཇི་ཨའི་ཌི་འཐོབ་མི་ཚུགས།\n"
 
@@ -842,6 +821,9 @@
 msgstr "%s: སྡེ་ཚན་ %sཡོདཔ་ཨིན།\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: ཇི་ཨའི་ཌི་ %uའདི་ ཐུན་མོང་པ་ཨིན།\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "ལག་ལེན་:groupdel སྡེ་ཚན།\n"
 
@@ -869,47 +851,41 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %sའདི་ ཨེན་ཇི་ཨེསི་ ཨམ་ཨིན།\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr ""
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr ""
 
-#, c-format
 msgid "Group access is required\n"
 msgstr ""
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "PAM authentication failed for\n"
 msgstr "%s: པི་ཨེ་ཨེམ་ བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to lock group file\n"
 msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མ་ཚུགས།\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to open group file\n"
 msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Cannot close group file\n"
 msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -919,6 +895,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "ལག་ལེན་:groupadd [གདམ་ཁ་ཚུ་]སྡེ་ཚན།\n"
@@ -955,10 +932,6 @@
 msgstr "ལག་ལེན་: %s [-r] [-s] [སྡེ་ཚན་]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "མེན།\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s དང་ -r གཉིས་མཐུན་འགྱུར་ཅན་མེན།\n"
 
@@ -971,6 +944,9 @@
 msgstr "%s: ཡིག་སྣོད་%s ཁ་ཕྱེ་མི་ཚུགས།\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: ཡིག་སྣོད་ %sའདི་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+
 msgid "invalid group file entry\n"
 msgstr "ནུས་མེད་སྡེ་ཚན་ཐོ་བཀོད།\n"
 
@@ -978,7 +954,6 @@
 msgid "delete line '%s'? "
 msgstr "གྲལ་ཐིག་ '%s'བཏོན་གཏང་ནི་ཨིན་ན?"
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "སྡེ་ཚན་ཐོ་བཀོད་ བརྫུན་མ་བཟོ།\n"
 
@@ -1010,11 +985,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: སྡེ་ཚན་ %sགི་དོན་ལུ་ ཐོ་བཀོད་དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "ནུས་མེད་གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ཐོ་བཀོད།\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "ངོ་བཤུས་གྱིབ་མའི་སྡེ་ཚན་ཐོ་བཀོད།\n"
 
@@ -1031,10 +1004,6 @@
 msgstr "གྱིབ་མའི་སྡེ་ཚན་%s: ལག་ལེན་པ་%sམེད།\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: ཡིག་སྣོད་ %sའདི་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: ཡིག་སྣོད་ཚུ་དུས་མཐུན་བཟོ་ཡི།\n"
 
@@ -1066,19 +1035,16 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ བཏོན་གཏང་མི་ཚུགས།\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "ལག་ལེནཔ་:id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "ལག་ལེན་པ་: id\n"
 
-#, c-format
 msgid " groups="
 msgstr "སྡེ་ཚན་="
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1101,17 +1067,19 @@
 "lastlog དྲན་ཐོ་ དཔར་བསྐྲུན་འབད།\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "ལག་ལེན་པའི་མིང་         འདྲེན་ལམ་     ལས་             མཇུག་མཐའ།\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "ལག་ལེན་པའི་མིང་                འདྲེན་ལམ་    མཇུག་མཐའ།\n"
 
 msgid "**Never logged in**"
 msgstr "**ནམ་ཡང་ནང་བསྐྱོད་མ་འབད་**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "མ་ཤེས་པའི་ལག་ལེན་པ་:%s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: རེ་བ་མ་བསྐྱེད་པའི་སྒྲུབ་རྟགས་:%s\n"
@@ -1128,11 +1096,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r host\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "ནུས་མེད་ནང་བསྐྱོད་ཀྱི་དུས་ཚོད།\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1140,7 +1106,6 @@
 "\n"
 "རྒྱུན་ལས་རྒྱུན་སྐྱོང་གི་དོན་ལུ་ རིམ་ལུགས་ཁ་བསྡམས་ཅི།\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1180,7 +1145,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "འབད་རྩོལ་གྱི་ཨང་གྲངས་མང་མཐའ་ལྷག་ཡོདཔ་(%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "ནང་བསྐྱོད་:པི་ཨུ་ཨེམ་གྱིས་ཞུ་ཡོད་པའི་བར་བཤོལ།\n"
 
@@ -1199,6 +1163,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: ཁ་སྤེལ་བ་འཐུས་ཤོར་:%s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "ཉེན་བརྡ་:གནས་སྐབས་ལྡེ་མིག་བརྐྱབས་པའི་ཤུལ་ལུ་ ལོག་སྟེ་ནང་བསྐྱོད་ལྕོགས་ཅན་བཟོ་ཡོདཔ།\n"
 
@@ -1221,14 +1189,16 @@
 "ནང་བསྐྱོད་དུས་ཚོད་ལྷག་ཡོདཔ།\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "ལག་ལེན་: newgrp [-][ སྡེ་ཚན་]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "ལག་ལེན་: sg group [[-c]བརྡ་བཀོད་ ]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "ཆོག་ཡིག་རྙིངམ་:"
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "མ་ཤེས་པའི་ ཇི་ཨའི་ཌི་:%u\n"
@@ -1237,11 +1207,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "མ་ཤེས་པའི་ ཇི་ཨའི་ཌི་:%lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "ཆོག་ཡིག་རྙིངམ་:"
-
-#, c-format
 msgid "too many groups\n"
 msgstr "སྡེ་ཚན་མང་དྲགས་པ།\n"
 
@@ -1253,7 +1218,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: སྡེ་ཚན་ %sམེད།\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: /etc/passwd ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
 
@@ -1266,6 +1241,10 @@
 msgstr "%s: ཡིག་སྣོད་ཚུ་ཁ་ཕྱེ་མི་ཚུགས།\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: ཡིག་སྣོད་དུས་མཐུན་བཟོ་བའི་སྐབས་ལུ་ འཛོལ་བ།\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s:གྲལ་ཐིག་%d: ནུས་མེད་གྲལ་ཐིག་\n"
 
@@ -1297,11 +1276,7 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: གྲལ་ཐིག་ %d: ཐོ་བཀོད་དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: ཡིག་སྣོད་དུས་མཐུན་བཟོ་བའི་སྐབས་ལུ་ འཛོལ་བ།\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1366,11 +1341,9 @@
 msgid "New password: "
 msgstr "ཆོག་ཡིག་གསརཔ་:"
 
-#, c-format
 msgid "Try again.\n"
 msgstr "ལོག་འབད་རྩོལ་བསྐྱེད་:\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1378,7 +1351,6 @@
 "\n"
 "ཉེན་བརྡ་:ནུས་མེད་ཀྱི་ཆོག་ཡིག་(ག་དེ་ཨིན་རུང་ལག་ལེན་འཐབ་ནིའི་དོན་ལས་ ལོག་བཙུགས་)།\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "དེ་ཚུ་མཐུན་སྒྲིག་མིན་འདུག་ ལོག་འབད་རྩོལ་བསྐྱེད།\n"
 
@@ -1416,11 +1388,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr " %sགི་དོན་ལུ་ ཆོག་ཡིག་འདི་མ་སོར་བས།\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "ཆོག་ཡིག་སོར་ཡོདཔ།\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "ཆོག་ཡིག་དུས་ཡོལ་ནིའི་དོན་ལས་་གཞི་སྒྲིག་འབད་ཡོདཔ།\n"
 
@@ -1428,11 +1398,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "ལག་ལེན་:%s [-q] [-r] [-s] [passwd [གྱིབ་མ་]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "ནུས་མེད་ཀྱི་ཆོག་ཡིག་ཡིག་སྣོད་ཐོ་བཀོད།\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "ཆོག་ཡིག་ཐོ་བཀོད་རྫུན་མ།\n"
 
@@ -1464,11 +1432,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: %sགི་དོན་ལུ་ ཆོག་ཡིག་ཐོ་བཀོད་དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "ནུས་མེད་གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ཐོ་བཀོད།\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "གྱིབ་མའི་ཆོག་ཡིག་ཐོ་བཀོད་རྫུན་མ།\n"
 
@@ -1504,15 +1470,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ བཏོན་གཏང་མི་ཚུགས།\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "རྩིས་ཐོ་དེ་ལུ་ ཟླ་ལུ་འཛུལ་སྤྱོད་འབད་ནི་ ཉན་མ་བཏུབ་པས།\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "ཆོག་ཡིག་བདེན་བཤད་ཟུར་ལས་འགྱོ་ཡོདཔ།\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "ཁྱོད་རའི་ཆོག་ཡིག་འདི་ བདེན་བཤད་སྦེ་བཙུགས།\n"
 
@@ -1520,7 +1483,7 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1573,15 +1536,15 @@
 "%s: %s\n"
 "(སྣང་མེད་བཞག་ཡོདཔ་)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "ཤལ་མེད།\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "ཆོག་ཡིག་ཡིག་སྣོད་མེད།\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "'རྩ་བ་'གི་དོན་ལུ་ ཆོག་ཡིག་ཐོ་བཀོད་མེད།\n"
 
@@ -1625,7 +1588,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: སྡེ་ཚན་མང་རབས་ཅིག་གསལ་བཀོད་འབད་ཡོདཔ་(མང་མཐའ་ %d)།\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1646,6 +1609,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1696,14 +1661,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: ཐུན་མོང་ ཡུ་ཨའི་ཌི་འཐོབ་མི་ཚུགས།\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: ཐུན་མོང་མ་ཡིན་པའི་ ཇི་ཨའི་ཌི་འཐོབ་མི་ཚུགས།\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: ནུས་མེད་གཞི་རྟེན་སྣོད་ཐོ་'%s'།\n"
@@ -1795,7 +1760,6 @@
 msgid "Creating mailbox file"
 msgstr "ཡིག་སྒྲོམ་ཡིག་སྣོད་ གསར་བསྐྲུན་འབད་དོ།"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1816,6 +1780,10 @@
 "ལེན་འཐབ།\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: ཡུ་ཨའི་ཌི་ %uའདི་ ཐུན་མོང་མེན།\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1827,7 +1795,7 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: ཉེན་བརྡ་: CREATE_HOME རྒྱབ་སྐྱོར་མ་འབད་ དེའི་ཚབ་ལུ་ -mལག་ལེན་འཐབ་གནང་།\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1904,7 +1872,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: སྣོད་ཐོ་%s རྩ་བསྐྲད་གཏང་པའི་སྐབས་ལུ་ འཛོལ་བ།\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2019,8 +1987,15 @@
 msgid "failed to rename mailbox"
 msgstr "ཡིག་སྒྲོམ་གྱི་བསྐྱར་མིང་བཏགས་ནི་ལུ་ འཛོལ་བ།"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+#, fuzzy
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2059,6 +2034,12 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: %sསོར་ཆུད་འབད་མ་ཚུགས་: %s (ཁྱོད་ཀྱི་བསྒྱུར་བཅོས་ཚུ་ %sནང་ཨིན་)།\n"
 
+#~ msgid "%s: name %s is not unique\n"
+#~ msgstr "%s: མིང་ %s འདི་ ཐུན་མོང་པ་ཨིན།\n"
+
+#~ msgid "No\n"
+#~ msgstr "མེན།\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/el.po
===================================================================
--- upstream/trunk/po/el.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/el.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-24 21:44+0100\n"
 "Last-Translator: Konstantinos Margaritis <markos at debian.org>\n"
 "Language-Team: Greek <debian-l10n-greek at lists.debian.org>\n"
@@ -28,7 +28,6 @@
 msgid "crypt method not supported by libcrypt? (%s)\n"
 msgstr ""
 
-#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Αδυναμία δέσμευσης χώρου για πληροφορίες διαμόρφωσης.\n"
 
@@ -41,19 +40,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Προειδοποίηση: άγνωστη ομάδα %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Προειδοποίηση: Πολλές ομάδες\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Το συνθηματικό σας έχει λήξει."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Το συνθηματικό σας είναι ανενεργό."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Ο κωδικός εισόδου σας έχει λήξει."
 
@@ -67,11 +62,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Το συνθηματικό σας θα λήξει σε %ld μέρες.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Το συνθηματικό σας θα λήξει αύριο.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Το συνθηματικό σας θα λήξει σήμερα.\n"
 
@@ -79,7 +72,6 @@
 msgid "Unable to change tty %s"
 msgstr "Αδυναμία αλλαγής tty %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Υπερχείλιση περιβάλλοντος\n"
 
@@ -101,7 +93,6 @@
 "%d αποτυχίες από την τελευταία είσοδο.\n"
 " Η τελευταία ήταν στις %s στο %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Πολλές είσοδοι στο σύστημα.\n"
 
@@ -198,7 +189,6 @@
 msgid "%s's Password: "
 msgstr "Του %s το Συνθηματικό: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -236,7 +226,6 @@
 "                                WARN_DAYS\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Εισάγετε την νέα τιμή, ή πιέστε ENTER για την προκαθορισμένη\n"
 
@@ -258,27 +247,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Ημερομηνία Λήξης Λογαριασμού (ΧΧΧΧ-ΜΜ-ΗΗ)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Τελευταία αλλαγή συνθηματικού \t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "Ποτέ\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "το συνθηματικό πρέπει να αλλαχθεί\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Το συνθηματικό λήγει\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Ανενεργό συνθηματικό\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Ο λογαριασμός λήγει\t\t\t\t\t\t: "
 
@@ -307,18 +290,14 @@
 msgstr "%s: Αποτυχία εξακρίβωσης PAM\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: αδυναμία κλειδώματος του αρχείου συνθηματικών\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: αδυναμία ανοίγματος του αρχείου συνθηματικών\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: άγνωστος χρήστης %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: Το αρχείο σκιωδών συνθηματικών δεν υπάρχει\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών\n"
 
@@ -327,18 +306,14 @@
 msgstr "%s: αδυναμία ανοίγματος του αρχείου σκιωδών συνθηματικών\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: αποτυχία απόρριψης προνομίων (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: αδυναμία επανεγγραφής αρχείου σκιωδών συνθηματικών\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Αλλαγή πληροφοριών χρόνου για τον %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: αδυναμία επανεγγραφής αρχείου συνθηματικών\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: Σφάλμα κατά την αλλαγή πεδίων\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: αδυναμία ανανέωσης αρχείου συνθηματικών\n"
 
@@ -347,14 +322,26 @@
 msgstr "%s: αδυναμία ανανέωσης του αρχείου σκιωδών συνθηματικών\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: αδυναμία επανεγγραφής αρχείου σκιωδών συνθηματικών\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: Το αρχείο σκιωδών συνθηματικών δεν υπάρχει\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: αδυναμία επανεγγραφής αρχείου συνθηματικών\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: αποτυχία απόρριψης προνομίων (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: άγνωστος χρήστης %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Αλλαγή πληροφοριών χρόνου για τον %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: Σφάλμα κατά την αλλαγή πεδίων\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -399,22 +386,28 @@
 msgid "Other"
 msgstr "Άλλο"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Δεν είναι δυνατόν να καθοριστεί το όνομα χρήστη σας.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Αδυναμία αλλαγής ταυτότητας χρήστη σε root.\n"
 
-#, fuzzy, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: αδυναμία αλλαγής χρήστη `%s' στον NIS εξυπηρετούμενο.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "Αδυναμία κλειδώματος του αρχείου συνθηματικών. Δοκιμάστε αργότερα.\n"
 
-#, fuzzy, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: `%s' είναι ο κύριος διακομιστής NIS γι'αυτόν τον εξυπηρετούμενο.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Αδυναμία ανοίγματος του αρχείου συνθηματικών.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Αλλαγή πληροφοριών χρήστη για τον %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: Ο %s δεν βρέθηκε στο /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Σφάλμα κατά την ανανέωση καταχώρησης στο αρχείο συνθηματικών.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Αδυναμία εισαγωγής των αλλαγών στο αρχείο συνθηματικών.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Αδυναμία ξεκλειδώματος του αρχείου συνθηματικών\n"
+
 #, fuzzy, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: Μη έγκυρο όνομα: `%s'\n"
@@ -436,37 +429,25 @@
 msgstr "%s: \"%s\" περιέχει μη έγκυρους χαρακτήρες\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: Πολύ μακριά πεδία\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Δεν είναι δυνατόν να καθοριστεί το όνομα χρήστη σας.\n"
 
-#, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Αδυναμία αλλαγής ταυτότητας χρήστη σε root.\n"
+#, fuzzy, c-format
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: αδυναμία αλλαγής χρήστη `%s' στον NIS εξυπηρετούμενο.\n"
 
-#, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Αδυναμία κλειδώματος του αρχείου συνθηματικών. Δοκιμάστε αργότερα.\n"
+#, fuzzy, c-format
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: `%s' είναι ο κύριος διακομιστής NIS γι'αυτόν τον εξυπηρετούμενο.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Αδυναμία ανοίγματος του αρχείου συνθηματικών.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Αλλαγή πληροφοριών χρήστη για τον %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: Ο %s δεν βρέθηκε στο /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s: Πολύ μακριά πεδία\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Σφάλμα κατά την ανανέωση καταχώρησης στο αρχείο συνθηματικών.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Αδυναμία εισαγωγής των αλλαγών στο αρχείο συνθηματικών.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Αδυναμία ξεκλειδώματος του αρχείου συνθηματικών\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -528,6 +509,15 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: αδυναμία ανοίγματος του αρχείου σκιωδών συνθηματικών\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr ""
+"%s: Σφάλμα κατά την ανανέωση καταχωρήσεων στο αρχείο σκιωδών συνθηματικών\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: Σφάλμα κατά την ανανέωση καταχώρισης ομάδας\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: γραμμή %d: πολύ μεγάλη γραμμή\n"
@@ -540,15 +530,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: γραμμή %d: άγνωστος χρήστης %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: γραμμή %d: αδυναμία ανανέωσης καταχώρησης συνθηματικού\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: γραμμή %d: αδυναμία ανανέωσης καταχώρησης\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: Ανιχνεύτηκε σφάλμα, οι αλλαγές αγνοήθηκαν\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr ""
 "%s: Σφάλμα κατά την ανανέωση καταχωρήσεων στο αρχείο σκιωδών συνθηματικών\n"
@@ -558,18 +552,13 @@
 msgstr "%s: Σφάλμα κατά την ανανέωση καταχωρήσεων στο αρχείο συνθηματικών\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: αδυναμία κλειδώματος του αρχείου συνθηματικών\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: γραμμή %d: άγνωστος χρήστης %s\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: γραμμή %d: αδυναμία ανανέωσης καταχώρησης συνθηματικού\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -598,7 +587,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s δεν είναι έγκυρος φλοιός.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Χρήση: expiry {-f|-c}\n"
 
@@ -606,7 +594,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: άγνωστος χρήστης\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -647,7 +634,6 @@
 "                                για το χρήστη με LOGIN\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Αποτυχίες Μέγιστο Τελευταία                   Στις\n"
 
@@ -688,14 +674,39 @@
 msgstr "%s: σκιώδη συνθηματικά ομάδων απαιτούνται για το -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Ποιος είσαι;\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: Αδυναμία δημιουργίας κλειδώματος\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+msgstr ""
+"%s: Αδυναμία δημιουργίας κλειδώματος του αρχείου σκιωδών συνθηματικών\n"
+
+#, c-format
 msgid "%s: can't open file\n"
 msgstr "%s: αδυναμία ανοίγματος του αρχείου\n"
 
 #, c-format
+msgid "%s: can't re-write file\n"
+msgstr "%s: αδυναμία επανεγγραφής αρχείου\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: αδυναμία επανεγγραφής αρχείου σκιωδών συνθηματικών\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: αδυναμία ξεκλειδώματος αρχείου\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: αδυναμία ανανέωσης καταχώρησης\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: αδυναμία ανανέωσης καταχώρησης στο αρχείο σκιωδών συνθηματικών\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "άγνωστη ομάδα: %s\n"
 
@@ -708,22 +719,6 @@
 msgstr "%s: αδυναμία ανοίγματος του αρχείου σκιωδών συνθηματικών\n"
 
 #, c-format
-msgid "Adding user %s to group %s\n"
-msgstr "Προσθήκη του χρήστη %s στην ομάδα %s\n"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Διαγραφή του χρήστη %s από την ομάδα %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: άγνωστο μέλος %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: Δεν είναι tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Αλλαγή του συνθήματος για την ομάδα %s\n"
 
@@ -740,36 +735,26 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Ξαναδοκιμάστε αργότερα\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: Αδυναμία δημιουργίας κλειδώματος\n"
+msgid "Who are you?\n"
+msgstr "Ποιος είσαι;\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr ""
-"%s: Αδυναμία δημιουργίας κλειδώματος του αρχείου σκιωδών συνθηματικών\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Προσθήκη του χρήστη %s στην ομάδα %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: αδυναμία ανανέωσης καταχώρησης\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Διαγραφή του χρήστη %s από την ομάδα %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: αδυναμία ανανέωσης καταχώρησης στο αρχείο σκιωδών συνθηματικών\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: άγνωστο μέλος %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: αδυναμία επανεγγραφής αρχείου\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: Δεν είναι tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: αδυναμία επανεγγραφής αρχείου σκιωδών συνθηματικών\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: αδυναμία ξεκλειδώματος αρχείου\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -801,14 +786,6 @@
 msgstr "%s: Σφάλμα κατά την προσθήκη νέας καταχώρησης στο αρχείο ομάδων\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: Το όνομα %s δεν είναι μοναδικό\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: Το GID %u δεν είναι μοναδικό\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: αδυναμία λήψης μοναδικού GID\n"
 
@@ -849,6 +826,9 @@
 msgstr "%s: Η ομάδα %s υπάρχει\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: Το GID %u δεν είναι μοναδικό\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Χρήση: groupdel ομάδα\n"
 
@@ -878,47 +858,41 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: Ο %s είναι ο κύριος διακομιστής NIS\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr ""
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr ""
 
-#, c-format
 msgid "Group access is required\n"
 msgstr ""
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "PAM authentication failed for\n"
 msgstr "%s: Αποτυχία εξακρίβωσης PAM\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to lock group file\n"
 msgstr "%s: Αδυναμία κλειδώματος του αρχείου ομάδων\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to open group file\n"
 msgstr "%s: Αδυναμία ανοίγματος του αρχείου ομάδων\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Cannot close group file\n"
 msgstr "%s: αδυναμία ανοίγματος αρχείου ομάδων\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -928,6 +902,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Χρήση: groupadd [options] group\n"
@@ -964,10 +939,6 @@
 msgstr "Χρήση: %s [-r] [-s] [group]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Όχι\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s και -r είναι ασύμβατα\n"
 
@@ -980,6 +951,9 @@
 msgstr "%s: αδυναμία ανοίγματος αρχείου %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: αδυναμία ανανέωσης αρχείου %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "Μη έγκυρη καταχώρηση στο αρχείο ομάδων\n"
 
@@ -987,7 +961,6 @@
 msgid "delete line '%s'? "
 msgstr "διαγραφή γραμμής `%s'; "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "αντιγραφή καταχώρησης στο αρχείο ομάδων\n"
 
@@ -1021,11 +994,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: αδυναμία ανανέωσης καταχώρησης για την ομάδα %s\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "Μη έγκυρη καταχώρηση στο αρχείο σκιωδών συνθηματικών ομάδων\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "αντιγραφή καταχώρησης στο αρχείο σκιωδών συνθηματικών ομάδων\n"
 
@@ -1042,10 +1013,6 @@
 msgstr "σκιώδης ομάδα %s: δεν υπάρχει χρήστης %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: αδυναμία ανανέωσης αρχείου %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: τα αρχεία ανανεώθηκαν\n"
 
@@ -1080,19 +1047,15 @@
 msgstr ""
 "%s: Δεν είναι δυνατόν να διαγραφεί το αρχείο σκιωδών συνθηματικών ομάδων\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Χρήση: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Χρήση: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " ομάδες="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1117,17 +1080,19 @@
 "                                χρήστη με καθορισμένο LOGIN\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Όνομα_Χρήστη     Θύρα     Από              Τελευταία\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Όνομα_Χρήστη            Θύρα     Τελευταία\n"
 
 msgid "**Never logged in**"
 msgstr "**Καμιά είσοδος στο σύστημα**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Άγνωστος χρήστης: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr ""
@@ -1144,11 +1109,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r σύστημα\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Εσφαλμένη ώρα εισόδου\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1156,7 +1119,6 @@
 "\n"
 "Το σύστημα έκλεισε για συντήρηση ρουτίνας\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1196,7 +1158,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Μέγιστος αριθμός ημερών μεταξύ των αλλαγών συνθηματικού\t\t: %ld\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr ""
 
@@ -1215,6 +1176,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: αποτυχία διχάλωσης: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 "Προειδοποίηση: Η είσοδος επανενεργοποιήθηκε μετά από προσωρινό αποκλεισμό.\n"
@@ -1238,14 +1203,16 @@
 "υπέρβαση ορίου χρόνου εισόδου\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Χρήση: newgrp [-] [ομάδα]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Χρήση: sg ομάδα [[-c] εντολή]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Παλιό Συνθηματικό: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "άγνωστο UID: %u\n"
@@ -1254,11 +1221,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "άγνωστο GID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Παλιό Συνθηματικό: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "πάρα πολλές ομάδες\n"
 
@@ -1270,7 +1232,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: Η ομάδα %s δεν υπάρχει\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: αδυναμία κλειδώματος του /etc/passwd.\n"
 
@@ -1283,6 +1255,10 @@
 msgstr "%s: αδυναμία ανοίγματος των αρχείων\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: Σφάλμα κατά την ενημέρωση αρχείων\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: γραμμή %d: μη έγκυρη γραμμή\n"
 
@@ -1314,11 +1290,7 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: γραμμή %d: αδυναμία ανανέωσης καταχώρησης\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: Σφάλμα κατά την ενημέρωση αρχείων\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1396,11 +1368,9 @@
 msgid "New password: "
 msgstr "Νέο Συνθηματικό: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Ξαναδοκιμάστε.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1408,7 +1378,6 @@
 "\n"
 "Προσοχή: αδύναμο συνθηματικό (εισάγετε το πάλι για να το χρησιμοποιήσετε).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Δεν ταιριάζουν. Δοκιμάστε ξανά.\n"
 
@@ -1446,11 +1415,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Το συνθηματικό για τον %s δεν άλλαξε.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Το συνθηματικό άλλαξε.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Το συνθηματικό έχει ρυθμιστεί να λήξει.\n"
 
@@ -1458,11 +1425,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Χρήση: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "Μη έγκυρη καταχώρηση στο αρχείο συνθηματικών\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "διπλότυπη καταχώριση στο αρχείο συνθηματικών\n"
 
@@ -1494,11 +1459,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: αδυναμία ανανέωσης καταχώρησης συνθηματικού για τον %s\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "Μη έγκυρη καταχώριση στο αρχείο σκιωδών συνθηματικών\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "διπλότυπη καταχώριση στο αρχείο σκιωδών συνθηματικών\n"
 
@@ -1535,15 +1498,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: Δεν είναι δυνατόν να διαγραφεί το αρχείο σκιωδών συνθηματικών\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Πρόσβαση στη su σε αυτόν τον λογαριασμό ΑΡΝΗΘΗΚΕ.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Παράκαμψη εξακρίβωσης με συνθηματικό.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Παρακαλώ εισάγετε το ΔΙΚΟ σας συνθηματικό για εξακρίβωση.\n"
 
@@ -1551,7 +1511,7 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1606,15 +1566,15 @@
 "%s: %s\n"
 "(Αγνοήθηκε)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Δεν υπάρχει φλοιός\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Δεν υπάρχει αρχείο συνθηματικών\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Δεν υπάρχει καταχώρηση συνθηματικού για τον 'root'\n"
 
@@ -1658,7 +1618,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: Προσδιορίστηκαν υπερβολικές ομάδες (μεγ. %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1679,6 +1639,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1732,15 +1694,15 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: αδυναμία λήψης μοναδικού UID\n"
 
 #, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: αδυναμία λήψης μοναδικού GID\n"
+
+#, fuzzy, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: Μη έγκυρος κατάλογος βάσης `%s'\n"
 
@@ -1834,7 +1796,6 @@
 msgid "Creating mailbox file"
 msgstr ""
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1854,6 +1815,10 @@
 "ομάδα, χρησιμοποιήστε -g.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: Το UID %u δεν είναι μοναδικό\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1867,7 +1832,6 @@
 "%s: προειδοποίηση: το CREATE_HOME δεν υποστηρίζεται, παρακαλώ χρησιμοποιήστε "
 "το -m.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1940,7 +1904,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: Σφάλμα κατά την διαγραφή του καταλόγου %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2064,6 +2028,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2103,6 +2073,12 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: αδυναμία επαναφοράς %s: %s (οι αλλαγές είναι στο %s)\n"
 
+#~ msgid "%s: name %s is not unique\n"
+#~ msgstr "%s: Το όνομα %s δεν είναι μοναδικό\n"
+
+#~ msgid "No\n"
+#~ msgstr "Όχι\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"

Modified: upstream/trunk/po/es.po
===================================================================
--- upstream/trunk/po/es.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/es.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-25 21:23+0100\n"
 "Last-Translator: Rubén Porras Campo <nahoo at inicia.es>\n"
 "Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -24,7 +24,6 @@
 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"
 
@@ -38,19 +37,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Aviso: grupo %s desconocido\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Aviso: demasiados grupos\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Su contraseña ha caducado."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Su contraseña está inactiva."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Su acceso ha caducado."
 
@@ -64,11 +59,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Su contraseña caducará en %ld días.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Su contraseña caducará mañana.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Su contraseña caducará hoy.\n"
 
@@ -76,7 +69,6 @@
 msgid "Unable to change tty %s"
 msgstr "Incapaz de cambiar tty %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Desbordamiento de entorno\n"
 
@@ -98,7 +90,6 @@
 "%d fallos desde la última entrada.\n"
 "La última fue %s en %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Demasiados accesos.\n"
 
@@ -193,7 +184,6 @@
 msgid "%s's Password: "
 msgstr "Contraseña de %s: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -230,7 +220,6 @@
 "  -W, --warndays DÍAS_AVISO     set expiration warning days to WARN_DAYS\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Introduzca el nuevo valor, o presione ENTER para el predeterminado\n"
 
@@ -252,27 +241,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Fecha de caducidad de la cuenta (AAAA-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Último cambio de contraseña\t\t\t\t\t:"
 
-#, c-format
 msgid "never\n"
 msgstr "nunca\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "Contraseña cambiada\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "La contraseña caduca\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Contraseña inactiva\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "La cuenta caduca\t\t\t\t\t\t: "
 
@@ -301,18 +284,14 @@
 msgstr "%s: Autenticación PAM fallida\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: no puedo bloquear el fichero de contraseñas\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: no puedo abrir el fichero de contraseñas\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: usuario desconocido %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: el fichero de contraseñas ocultas no está presente\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: no puedo bloquear el fichero de contraseñas ocultas\n"
 
@@ -321,18 +300,14 @@
 msgstr "%s: no puedo abrir el fichero de contraseñas ocultas\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: no fue posible desprenderse de los privilegios (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: no se puede reescribir el fichero de contraseñas ocultas\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Cambiando la información de la edad para %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: no se puede reescribir el fichero de contraseñas\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: error cambiando los campos\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: no puedo actualizar el fichero de contraseñas\n"
 
@@ -341,14 +316,26 @@
 msgstr "%s: no puedo actualizar el fichero de contraseñas ocultas\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: no se puede reescribir el fichero de contraseñas ocultas\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: el fichero de contraseñas ocultas no está presente\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: no se puede reescribir el fichero de contraseñas\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: no fue posible desprenderse de los privilegios (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: usuario desconocido %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Cambiando la información de la edad para %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: error cambiando los campos\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -393,22 +380,28 @@
 msgid "Other"
 msgstr "Otro"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: no puedo determinar su nombre de usuario.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "No se puede cambiar el ID al del superusuario.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: no se pudo cambiar el usuario «%s» en el cliente NIS.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "No se puede bloquear el fichero de contraseñas, inténtelo más tarde.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: «%s» es el maestro NIS para este cliente.\n"
+msgid "Cannot open the password file.\n"
+msgstr "No se puede abrir el fichero de contraseñas.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Cambiando la información de usuario para %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: no se encontró %s en /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Error actualizando la entrada de la contraseña.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "No se pueden remitir los cambios del fichero de contraseñas.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "No se puede desbloquear el fichero de contraseñas.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: nombre inválido: «%s»\n"
@@ -430,37 +423,25 @@
 msgstr "%s: «%s» contiene caracteres ilegales\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: campos demasiado largos\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: no puedo determinar su nombre de usuario.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "No se puede cambiar el ID al del superusuario.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: no se pudo cambiar el usuario «%s» en el cliente NIS.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "No se puede bloquear el fichero de contraseñas, inténtelo más tarde.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: «%s» es el maestro NIS para este cliente.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "No se puede abrir el fichero de contraseñas.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Cambiando la información de usuario para %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: no se encontró %s en /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s: campos demasiado largos\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Error actualizando la entrada de la contraseña.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "No se pueden remitir los cambios del fichero de contraseñas.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "No se puede desbloquear el fichero de contraseñas.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -520,6 +501,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: no se puede abrir el fichero de contraseñas ocultas (shadow)\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: error actualizando el fichero de contraseñas ocultas (shadow)\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: error actualizando la entrada del grupo\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: línea %d: línea demasiado larga\n"
@@ -532,15 +521,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: línea %d: grupo desconocido %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: línea %d: no se puede actualizar la entrada de la contraseña\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: línea %d: no se puede actualizar la entrada\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: error detectado, cambios ignorados\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: no se puede bloquear el fichero de contraseñas ocultas (shadow)\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: error actualizando el fichero de contraseñas ocultas (shadow)\n"
 
@@ -549,18 +542,14 @@
 msgstr "%s: error actualizando el fichero de contraseñas\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: no puedo bloquear el fichero de contraseñas\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: no se puede bloquear el fichero de contraseñas ocultas (shadow)\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: línea %d: usuario desconocido %s\n"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: línea %d: no se puede actualizar la entrada de la contraseña\n"
+
+#, fuzzy
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -597,7 +586,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s no es una shell válida.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Modo de uso: expiry {-f|-c}\n"
 
@@ -605,7 +593,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: usuario desconocido\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -643,7 +630,6 @@
 "                                para el usuario USUARIO\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Usuario     Fallos Máximo Último                   Activo\n"
 
@@ -684,14 +670,38 @@
 msgstr "%s: se requieren contraseñas de grupo ocultas (shadow) para -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "¿Quién es?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: no se puede obtener el bloqueo\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: no se puede reescribir el fichero\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: no se puede reescribir el fichero oculto (shadow)\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: no se puede desbloquear el fichero\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: no se puede actualizar la entrada\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: no se puede actualizar la entrada oculta (shadow)\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "grupo desconocido: %s\n"
 
@@ -704,22 +714,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Eliminando al usuario %s del grupo %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: miembro desconocido %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: No es una tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Cambiando la contraseña para el grupo %s\n"
 
@@ -736,35 +730,26 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Pruebe otra vez más tarde\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: no se puede obtener el bloqueo\n"
+msgid "Who are you?\n"
+msgstr "¿Quién es?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: no se puede obtener el bloqueo de shadow\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Añadiendo al usuario %s al grupo %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: no se puede actualizar la entrada\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Eliminando al usuario %s del grupo %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: no se puede actualizar la entrada oculta (shadow)\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: miembro desconocido %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: no se puede reescribir el fichero\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: No es una tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: no se puede reescribir el fichero oculto (shadow)\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: no se puede desbloquear el fichero\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -796,14 +781,6 @@
 msgstr "%s: error añadiendo entrada nueva de grupo\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: el nombre %s no es único\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: el GID %u no es único\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: no se puede obtener un GID único\n"
 
@@ -844,6 +821,9 @@
 msgstr "%s: el grupo %s existe\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: el GID %u no es único\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Modo de uso: groupdel grupo\n"
 
@@ -871,47 +851,41 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s es el maestro NIS\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr ""
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr ""
 
-#, c-format
 msgid "Group access is required\n"
 msgstr ""
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "PAM authentication failed for\n"
 msgstr "%s: Autenticación PAM fallida\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to lock group file\n"
 msgstr "%s: incapaz de bloquear el fichero de grupos\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to open group file\n"
 msgstr "%s: incapaz de abrir el fichero de grupos\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Cannot close group file\n"
 msgstr "%s: no se puede abrir el fichero de grupos\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -921,6 +895,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Modo de uso: groupadd [opciones] grupo\n"
@@ -957,10 +932,6 @@
 msgstr "Modo de uso: %s [-r] [-s] [grupo]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "No\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s y -r son incompatibles\n"
 
@@ -973,6 +944,9 @@
 msgstr "%s: no se puede abrir el fichero %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: no se puede actualizar el fichero %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "entrada del fichero de grupos inválida\n"
 
@@ -980,7 +954,6 @@
 msgid "delete line '%s'? "
 msgstr "¿eliminar la línea «%s»? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "entrada de grupo duplicada\n"
 
@@ -1012,11 +985,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: no se puede actualizar la entrada para el grupo %s\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "entrada del fichero de grupos oculto (shadow) inválida\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "entrada del fichero de grupos oculto (shadow) duplicada\n"
 
@@ -1033,10 +1004,6 @@
 msgstr "grupo oculto (shadow) %s: no existe el usuario %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: no se puede actualizar el fichero %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: los ficheros se han actualizado\n"
 
@@ -1068,19 +1035,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: no se puede eliminar el fichero de grupos oculto\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Modo de uso: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Modo de uso: id\n"
 
-#, c-format
 msgid " groups="
 msgstr "grupos="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1103,17 +1066,19 @@
 "  -u, --user USUARIO            muestra el registro lastlog para el usuario\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Nombre           Puerto   De               Último\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Nombre                  Puerto   Último\n"
 
 msgid "**Never logged in**"
 msgstr "**Nunca ha entrado**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Usuario desconocido: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: argumento inesperado: %s\n"
@@ -1130,11 +1095,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r puesto\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Tiempo de acceso inválido\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1142,7 +1105,6 @@
 "\n"
 "Sistema cerrado para mantenimiento rutinario\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1182,7 +1144,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Número de intentos máximo excedido (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: petición abortada por PAM\n"
 
@@ -1201,6 +1162,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: fallo en la llamada a fork: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Aviso: acceso reestablecido después de un lockout temporal.\n"
 
@@ -1223,14 +1188,16 @@
 "tiempo de acceso excedido\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Modo de uso: newgrp [-] [grupo]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Modo de uso: sg grupo [[-c] orden]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Contraseña antigua: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "UID desconocido: %u\n"
@@ -1239,11 +1206,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "GID desconocido: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Contraseña antigua: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "demasiados grupos\n"
 
@@ -1255,7 +1217,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: el grupo %s no existe\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: no se puede bloquear /etc/passwd.\n"
 
@@ -1268,6 +1240,10 @@
 msgstr "%s: no se pueden abrir los ficheros\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: error actualizando los ficheros\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: línea %d: línea inválida\n"
 
@@ -1301,11 +1277,7 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: línea %d: no se puede actualizar la entrada\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: error actualizando los ficheros\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1377,11 +1349,9 @@
 msgid "New password: "
 msgstr "Nueva contraseña: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Vuelva a intentarlo.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1389,7 +1359,6 @@
 "\n"
 "Aviso: contraseña débil (introdúzcala otra vez para usarla de todos modos).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "No concuerdan, pruebe de nuevo.\n"
 
@@ -1427,11 +1396,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "La contraseña para %s no se ha modificado.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Contraseña cambiada.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Contraseña caducada.\n"
 
@@ -1439,11 +1406,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Modo de uso: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "entrada del fichero de contraseñas inválida\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "entrada de contraseña duplicada\n"
 
@@ -1475,11 +1440,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: no se puede actualizar la entrada de la contraseña para %s\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "entrada de contraseña oculta (shadow) inválida\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "entrada de contraseña oculta (shadow) duplicada\n"
 
@@ -1516,15 +1479,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: no se puede eliminar el fichero de contraseñas ocultas (shadow)\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Acceso a \"su\" a esa cuenta DENEGADO.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Evitada autenticación de contraseña.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Por favor, introduzca su PROPIA contraseña como autenticación.\n"
 
@@ -1532,7 +1492,7 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1586,15 +1546,15 @@
 "%s: %s\n"
 "(Ignorado)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Sin shell\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "No hay fichero de contraseñas\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "No hay entrada de contraseña para 'root'\n"
 
@@ -1640,7 +1600,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: demasiados grupos especificados (máx de %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1661,6 +1621,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1713,14 +1675,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: no se puede obtener un UID único\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: no se puede obtener un GID único\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: directorio base «%s» inválido\n"
@@ -1813,7 +1775,6 @@
 msgid "Creating mailbox file"
 msgstr "Creando el buzón de correo"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1834,6 +1795,10 @@
 "%s: el grupo %s existe - si quiere añadir este usuario a ese grupo, use -g.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: el UID %u no es único\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1846,7 +1811,6 @@
 msgstr ""
 "%s: aviso: CREATE_HOME no está soportado, por favor, use -m en su lugar.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1926,7 +1890,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: error eliminando el directorio %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2048,6 +2012,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2086,6 +2056,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s: el nombre %s no es único\n"
+
+#~ msgid "No\n"
+#~ msgstr "No\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/eu.po
===================================================================
--- upstream/trunk/po/eu.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/eu.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-24 22:20+0100\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: librezale <librezale at librezale.org>\n"
@@ -26,7 +26,6 @@
 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"
 
@@ -40,19 +39,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Abisua: %s talde ezezaguna\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Abisua: talde gehiegi\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Pasahitza iraungi egin da."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Pasahitza ezgaitua dago."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Erabiltzaile-izena iraungi egin da."
 
@@ -66,11 +61,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Pasahitza %ld egun barru iraungi egingo da.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Pasahitza bihar iraungi egingo da.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Pasahitza gaur iraungi egingo da.\n"
 
@@ -78,7 +71,6 @@
 msgid "Unable to change tty %s"
 msgstr "Ezin da %s tty aldatu"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Inguruneak gainezka egin du\n"
 
@@ -100,7 +92,6 @@
 "%d hutsegite azken saio hasieratik.\n"
 "Azkena %s izan zen %s(e)n.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Gehiegizko saio hasierak.\n"
 
@@ -197,7 +188,6 @@
 msgid "%s's Password: "
 msgstr "%s (r)en pasahitza: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -232,7 +222,6 @@
 "  -W, --warndays ABISU_EGUN         iraungitze abisua ABISU_EGUN-era ezarri\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Idatzi balio berria, edo sakatu 'Sartu' tekla lehenetsirako\n"
 
@@ -254,27 +243,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Kontuaren iraungitze data (UUUU-HH-EE)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Azken pasahitz aldaketa\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "Inoiz ere ez\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "Pasahitza aldatu egin behar da\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Pasahitz iraungitze data\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Pasahitza ezgaitu egingo da\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Kontua iraungitzeko data\t\t\t\t\t: "
 
@@ -303,18 +286,14 @@
 msgstr "%s: PAM autentifikazioak huts egin du\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: ezin da pasahitzen fitxategia blokeatu\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: ezin da pasahitzen fitxategia ireki\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: %s erabiltzaile ezezaguna\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: ezin da itzalpeko (shadow) pasahitz fitxategia ez dago\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: ezin da itzalpeko (shadow) pasahitz fitxategia blokeatu\n"
 
@@ -323,18 +302,14 @@
 msgstr "%s: ezin da itzalpeko (shadow) pasahitz fitxategia ireki\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: huts baimenak kentzerakoan (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s:ezin da itzalpeko pasahitz fitxategia berridatzi\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "%s(r)en data informazioa aldatzen\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: ezin da pasahitzen fitxategia berridatzi\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: errorea eremuak aldatzean\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: ezin da pasahitzen fitxategia eguneratu\n"
 
@@ -343,14 +318,26 @@
 msgstr "%s: ezin da itzalpeko (shadow) pasahitz fitxategia eguneratu\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s:ezin da itzalpeko pasahitz fitxategia berridatzi\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: ezin da itzalpeko (shadow) pasahitz fitxategia ez dago\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: ezin da pasahitzen fitxategia berridatzi\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: huts baimenak kentzerakoan (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: %s erabiltzaile ezezaguna\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "%s(r)en data informazioa aldatzen\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: errorea eremuak aldatzean\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -393,22 +380,28 @@
 msgid "Other"
 msgstr "Bestelakoa"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Ezin da Erabiltzaile izena zehaztu.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Ezin izan da IDa root-era aldatu.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: ezin da NIS bezeroko '%s' erabiltzailea aldatu.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "Ezin izan da pasahitzen fitxategia blokeatu; saiatu geroago.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: '%s' da bezero honen NIS nagusia.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Ezin izan da pasahitzen fitxategia ireki.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "%s(r)en erabiltzaile informazioa aldatzen\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s ez da '/etc/paswd'-en aurkitu\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Errorea pasahitzen sarrera eguneratzean.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Ezin izan da pasahitzen fitxategiko aldaketak bidali.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Ezin izan da pasahitzen fitxategia desblokeatu.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: izen baliogabea: '%s'\n"
@@ -430,37 +423,25 @@
 msgstr "%s: '%s'(e)k karaktere baliogabeak ditu\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: eremu luzegiak\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Ezin da Erabiltzaile izena zehaztu.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Ezin izan da IDa root-era aldatu.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: ezin da NIS bezeroko '%s' erabiltzailea aldatu.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Ezin izan da pasahitzen fitxategia blokeatu; saiatu geroago.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: '%s' da bezero honen NIS nagusia.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Ezin izan da pasahitzen fitxategia ireki.\n"
+msgid "Changing the user information for %s\n"
+msgstr "%s(r)en erabiltzaile informazioa aldatzen\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s ez da '/etc/paswd'-en aurkitu\n"
+msgid "%s: fields too long\n"
+msgstr "%s: eremu luzegiak\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Errorea pasahitzen sarrera eguneratzean.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Ezin izan da pasahitzen fitxategiko aldaketak bidali.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Ezin izan da pasahitzen fitxategia desblokeatu.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -521,6 +502,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s ezin da 'shadow' fitxategia ireki\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: errorea 'shadow' fitxategia eguneratzean\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: errorea taldearen sarrera eguneratzean\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: %d. lerroa: lerro luzegia\n"
@@ -533,15 +522,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: %d. lerroa: %s talde ezezaguna\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: %d. lerroa: ezin da pasahitzaren sarerra eguneratu\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: %d lerroa: ezin da sarrera eguneratu\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s:errorea atzeman da, aldaketak alde batera utzi dira\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: ezin da 'shadow' fitxategia blokeatu\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: errorea 'shadow' fitxategia eguneratzean\n"
 
@@ -550,18 +543,13 @@
 msgstr "%s: errorea pasahitzen fitxategia eguneratzean\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: ezin da pasahitzen fitxategia blokeatu\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: ezin da 'shadow' fitxategia blokeatu\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: %d. lerroa: %s erabiltzaile ezezaguna\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: %d. lerroa: ezin da pasahitzaren sarerra eguneratu\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -596,7 +584,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s shell baliogabea da.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Erabilera: expiry {-f|-c}\n"
 
@@ -604,7 +591,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: erabiltzaile ezezaguna\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -645,7 +631,6 @@
 "                                aukerekin erabiltzen bada) mantentzeko.\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Saio-hasiera    Hutsegiteak Gehienezkoa Azkena     Aktiboa\n"
 
@@ -686,14 +671,38 @@
 msgstr "%s: -A erabiltzeko itzalpeko talde-pasahitza eskatzen da\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Zer moduz zaude?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: ezin da blokeatu\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: ezin da fitxategia berridatzi\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: ezin da 'shadow' fitxategia berridatzi\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: ezin da fitxategia desblokeatu\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: ezin da sarrera eguneratu\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: ezin da 'shadow'-eko sarrera eguneratu\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "talde ezezaguna: %s\n"
 
@@ -706,22 +715,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "%s erabiltzailea %s taldetik kentzen\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: %s kide ezezaguna\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: ez da tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "%s taldearen pasahitza aldatzen\n"
 
@@ -738,35 +731,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Saiatu geroago\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: ezin da blokeatu\n"
+msgid "Who are you?\n"
+msgstr "Zer moduz zaude?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: ezin da 'shadow' blokeatu\n"
+msgid "Adding user %s to group %s\n"
+msgstr "%s erabiltzailea %s taldean gehitzen\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: ezin da sarrera eguneratu\n"
+msgid "Removing user %s from group %s\n"
+msgstr "%s erabiltzailea %s taldetik kentzen\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: ezin da 'shadow'-eko sarrera eguneratu\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: %s kide ezezaguna\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: ezin da fitxategia berridatzi\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: ez da tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: ezin da 'shadow' fitxategia berridatzi\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: ezin da fitxategia desblokeatu\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -797,14 +780,6 @@
 msgstr "%s: errorea talde sarrera berria gehitzean\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: %s izena ez da bakarra\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: %u GID-a ez da bakarra\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: ezin da GID bakarra lortu\n"
 
@@ -845,6 +820,9 @@
 msgstr "%s: %s taldea badago\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: %u GID-a ez da bakarra\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Erabilera: groupdel taldea\n"
 
@@ -872,49 +850,39 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s NIS nagusia da\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "Partaidea dagoeneko badago\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "Ezabatzeko partaidea ez da aurkitu\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 "Erabilera: groupmems -a erabiltzailea | -d erabiltzailea | -D | -l [-g "
 "taldea]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "Root-ekbakarri gehitu ditzake partaideak talde ezberdinetara\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "Talde sarrera beharrezkoa da\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "Ez da taldearen jabe nagusia\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "PAM autentifikazioak huts egin du\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "Ezin da talde-fitxategia blokeatu\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "Ezin da talde fitxategia ireki\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "Ezin da talde fitxategia ireki\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -924,6 +892,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Erabilera: groupmod [aukerak] TALDEA\n"
@@ -958,10 +927,6 @@
 msgstr "Erabilera: %s [-r] [-s] [taldea]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Ez\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s eta -r ezin dira batera erabili\n"
 
@@ -974,6 +939,9 @@
 msgstr "%s: ezin da %s fitxategia ireki\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: ezin da %s fitxategia eguneratu\n"
+
 msgid "invalid group file entry\n"
 msgstr "baliogabeko talde-fitxategiko sarrera\n"
 
@@ -981,7 +949,6 @@
 msgid "delete line '%s'? "
 msgstr "'%s' lerroa ezabatu? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "bikoiztu taldearen sarrera\n"
 
@@ -1013,11 +980,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: ezin da %s taldearen sarrera eguneratu\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "Baliogabeko itzalpeko talde-fitxategiko sarrera\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "bikoiztutako itzalpeko taldearen sarrera\n"
 
@@ -1034,10 +999,6 @@
 msgstr "%s itzalpeko taldea: %s erabiltzailea ez dago\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: ezin da %s fitxategia eguneratu\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: fitxategiak eguneratu dira\n"
 
@@ -1069,19 +1030,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: ezin da itzalpeko talde-fitxategia ezabatu\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Erabilera: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Erabilera: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " taldeak="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1106,17 +1063,19 @@
 "                                erregistroa bistaratzen du\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Erabiltzaile-izena        Ataka      Nondik           Azkena\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Erabiltzaile-izena           Ataka          Azkena\n"
 
 msgid "**Never logged in**"
 msgstr "**Inoiz ez du saiorik hasi**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Erabiltzaile ezezaguna: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: argumentu esperogabea: %s\n"
@@ -1133,11 +1092,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "           %s [-p] -r ostalaria\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Baliogabeko saio-hasieraren denbora\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1145,7 +1102,6 @@
 "\n"
 "Sistema aldiko mantenuagatik itxita\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1185,7 +1141,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Saiakera muga gainditu da (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "Saioa hastea: PAM-ek uztea eskatu du\n"
 
@@ -1204,6 +1159,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: huts zaitzerakoan: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 "Abisua: saio-hasiera berriru gaitu egingo da aldi bateko blokeoaren "
@@ -1228,14 +1187,16 @@
 "saio hasiera denbora pasa da\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Erabilera: newgrp [-] [taldea]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Erabilera: sg taldea [[-c] komandoa]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Pasahitz zaharra: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "UID ezezaguna: %u\n"
@@ -1244,11 +1205,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "GID ezezaguna: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Pasahitz zaharra: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "talde gehiegi\n"
 
@@ -1260,7 +1216,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: %s taldea ez da existitzen\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: ezin da '/etc/passwd' blokeatu.\n"
 
@@ -1273,6 +1239,10 @@
 msgstr "%s: ezin dira fitxategiak ireki\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: errorea fitxategiak eguneratzean\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: %d lerroa: lerro baliogabea\n"
 
@@ -1304,11 +1274,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: %d lerroa: ezin da sarrera eguneratu\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: errorea fitxategiak eguneratzean\n"
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1383,11 +1348,9 @@
 msgid "New password: "
 msgstr "Pasahitz berria: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Saiatu berriro.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1395,7 +1358,6 @@
 "\n"
 "Oharra: pasahitza ahula da (sartu berriro erabiltzen jarraitzeko).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Ez dira berdinak, saiatu berriro.\n"
 
@@ -1433,11 +1395,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "%s(r)en pasahitza aldatu gabe dago.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Pasahitza aldatuta.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Pasahitza iraungi egin da.\n"
 
@@ -1445,11 +1405,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Erabilera: %s [-q] [-r] [-s] [pasahitza [itzalpekoa]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "Baliogabeko pasahitzen fitxategiko sarrera\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "bikoiztutako pasahitz sarrera\n"
 
@@ -1481,11 +1439,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: ezin da %s(r)en pasahitzaren sarrera eguneratu\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "baliogabeko itzalpeko pasahitz-fitxategiko sarrera\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "bikoiztutako itzalpeko pasahitz-fitxategiko sarrera\n"
 
@@ -1521,15 +1477,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: ezin da itzalpeko pasahitz-fitxategia ezabatu\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "kontu honentzako 'su' sarbidea UKATUTA.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Pasahitz autentifikazioa saltatuta.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Sartu zure pasahitz PROPIOA autentifikazio gisa\n"
 
@@ -1537,7 +1490,6 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1591,15 +1543,15 @@
 "%s: %s\n"
 "(Ez ikusi egin zaio)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Ez dago shell-a\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Ez dago pasahitz-fitxategirik\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Ez dago 'root'-en pasahitzik\n"
 
@@ -1643,7 +1595,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: talde gehiegi zehaztu dira (geh. %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1664,6 +1616,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1706,14 +1660,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: ezin da UID bakarra lortu\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: ezin da GID bakarra lortu\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: oinarrizko '%s' direktorio baliogabea\n"
@@ -1805,7 +1759,6 @@
 msgid "Creating mailbox file"
 msgstr "Postakutxa fitxategia sortzen"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1826,6 +1779,10 @@
 "%s: %s taldea badago - erabiltzaile hau talde honetan gehiteko erabili '-g'\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: %u UID-a ez da bakarra\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1837,7 +1794,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: abisua: CREATE_HOME ez da onartzen, erabili '-m' aukera.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1915,7 +1871,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: errorea %s direktorioa ezabatzean\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2035,6 +1991,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2073,6 +2035,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s: %s izena ez da bakarra\n"
+
+#~ msgid "No\n"
+#~ msgstr "Ez\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/fi.po
===================================================================
--- upstream/trunk/po/fi.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/fi.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-24 22:54+0100\n"
 "Last-Translator: Tommi Vainikainen <thv+debian at iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -24,7 +24,6 @@
 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"
 
@@ -36,19 +35,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Varoitus: tuntematon ryhmä %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Varoitus: liian monta ryhmää\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Salasanasi on vanhentunut."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Salasanasi ei ole käytössä."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Käyttäjätunnuksesi on vanhentunut."
 
@@ -62,11 +57,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Salasanasi vanhenee %ld päivässä.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Salasanasi vanhenee huomenna.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Salasanasi vanhenee tänään.\n"
 
@@ -74,7 +67,6 @@
 msgid "Unable to change tty %s"
 msgstr "Päätettä %s ei voi vaihtaa"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Ympäristön ylivuoto\n"
 
@@ -96,7 +88,6 @@
 "Edellisen kirjautumisen jälkeen %d epäonnistunutta yritystä.\n"
 "Viimeisin oli %s päätteellä %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Liian monta sisäänkirjautumista.\n"
 
@@ -191,7 +182,6 @@
 msgid "%s's Password: "
 msgstr "Käyttäjän %s salasana: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -229,7 +219,6 @@
 "VAR_PÄIVIÄ\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Syötä uusi arvo tai paina ENTER jättääksesi oletuksen\n"
 
@@ -251,27 +240,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Tunnuksen vanhenemispäiväys (VVVV-KK-PP)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Edellinen salasanan vaihto\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "ei koskaan\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "salasana täytyy vaihtaa\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Salasana vanhenee\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Salasana pois käytöstä\t\t\t\t\t:"
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Tunnus vanhenee\t\t\t\t\t:"
 
@@ -300,18 +283,14 @@
 msgstr "%s: PAM-todennus epäonnistui\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: salasanatiedostoa ei voi lukita\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: salasanatiedostoa ei voi avata\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: Tuntematon käyttäjä %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: varjosalasanatiedostoa ei ole\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: varjosalasanatiedostoa ei voi lukita\n"
 
@@ -320,18 +299,14 @@
 msgstr "%s: varjosalasanatiedostoa ei voi avata\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: Oikeuksien pudottaminen epäonnistui (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: varjosalasanatiedostoa ei voi uudelleenkirjoittaa\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Muutetaan käyttäjän %s vanhenemistietoja\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: salasanatiedostoa ei voi uudelleenkirjoittaa\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: virhe muutettaessa kenttiä\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: salasanatiedostoa ei voi päivittää\n"
 
@@ -340,14 +315,26 @@
 msgstr "%s: varjosalasanatiedostoa ei voi päivittää\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: varjosalasanatiedostoa ei voi uudelleenkirjoittaa\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: varjosalasanatiedostoa ei ole\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: salasanatiedostoa ei voi uudelleenkirjoittaa\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: Oikeuksien pudottaminen epäonnistui (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: Tuntematon käyttäjä %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Muutetaan käyttäjän %s vanhenemistietoja\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: virhe muutettaessa kenttiä\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -390,22 +377,28 @@
 msgid "Other"
 msgstr "Muu"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Käyttäjätunnusta ei voi selvittää.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Ei voi vaihtaa tunnusta pääkäyttäjäksi.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: ei voi vaihtaa käyttäjää \"%s\" NIS-asiakkaalla.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "Salasanatiedostoa ei voi lukita. Yritä myöhemmin uudelleen.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: \"%s\" on NIS-palvelin tälle asiakkaalle.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Salasanatiedostoa ei voi avata.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Muutetaan käyttäjän %s tietoja\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: Käyttäjää %s ei löydy tiedostosta /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Virhe päivitettäessä salasanatietuetta.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Salasanatiedoston muutoksia ei voi tallentaa.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Salasanatiedoston lukitusta ei voi avata.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: virheellinen nimi: \"%s\"\n"
@@ -427,37 +420,25 @@
 msgstr "%s: \"%s\" sisältää ei-sallittuja merkkejä\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: kentät liian pitkiä\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Käyttäjätunnusta ei voi selvittää.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Ei voi vaihtaa tunnusta pääkäyttäjäksi.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: ei voi vaihtaa käyttäjää \"%s\" NIS-asiakkaalla.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Salasanatiedostoa ei voi lukita. Yritä myöhemmin uudelleen.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: \"%s\" on NIS-palvelin tälle asiakkaalle.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Salasanatiedostoa ei voi avata.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Muutetaan käyttäjän %s tietoja\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: Käyttäjää %s ei löydy tiedostosta /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s: kentät liian pitkiä\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Virhe päivitettäessä salasanatietuetta.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Salasanatiedoston muutoksia ei voi tallentaa.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Salasanatiedoston lukitusta ei voi avata.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -515,6 +496,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: varjotiedostoa ei voi avata\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: virhe päivitettäessä varjotiedostoa\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: virhe päivitettäessä ryhmätietuetta\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: rivi %d: rivi on liian pitkä\n"
@@ -527,15 +516,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: rivi %d: tuntematon ryhmä %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: rivi %d: salasanatietuetta ei voi päivittää\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: rivi %d: tietuetta ei voi päivittää\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: virhe havaittu, muutokset ohitetaan\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: varjotiedostoa ei voi lukita\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: virhe päivitettäessä varjotiedostoa\n"
 
@@ -544,18 +537,13 @@
 msgstr "%s: virhe päivitettäessä salasanatiedostoa\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: salasanatiedostoa ei voi lukita\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: varjotiedostoa ei voi lukita\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: rivi %d: tuntematon käyttäjä %s\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: rivi %d: salasanatietuetta ei voi päivittää\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -591,7 +579,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s on virheellinen kuori.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Käyttö: expiry {-f|-c}\n"
 
@@ -599,7 +586,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: tuntematon käyttäjä\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -636,7 +622,6 @@
 "                                vain käyttäjälle TUNNUS\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Tunnus      Epäonn.  Enint.  Edellinen                Päätteellä\n"
 
@@ -677,14 +662,38 @@
 msgstr "%s: varjoryhmäsalanat vaaditaan valitsimelle -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Kuka olet?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: ei voi lukita\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: tiedostoa ei voi uudelleenkirjoittaa\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: varjotiedostoa ei voi uudelleenkirjoittaa\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: tiedoston lukkoa ei voi avata\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: tietuetta ei voi päivittää\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: varjotietuetta ei voi päivittää\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "tuntematon ryhmä: %s\n"
 
@@ -697,22 +706,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Poistetaan käyttäjä %s ryhmästä %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: tuntematon jäsen %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: Ei ole pääte\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Vaihdetaan ryhmän %s salasana\n"
 
@@ -729,35 +722,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Yritä myöhemmin uudelleen\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: ei voi lukita\n"
+msgid "Who are you?\n"
+msgstr "Kuka olet?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: varjoa ei voi lukita\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Lisätään käyttäjä %s ryhmään %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: tietuetta ei voi päivittää\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Poistetaan käyttäjä %s ryhmästä %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: varjotietuetta ei voi päivittää\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: tuntematon jäsen %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: tiedostoa ei voi uudelleenkirjoittaa\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: Ei ole pääte\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: varjotiedostoa ei voi uudelleenkirjoittaa\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: tiedoston lukkoa ei voi avata\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -788,14 +771,6 @@
 msgstr "%s: virhe lisättäessä uutta ryhmätietuetta\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: nimi %s ei ole ainutkertainen\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u ei ole ainutkertainen\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: ei saa ainutkertaista GID:iä\n"
 
@@ -836,6 +811,9 @@
 msgstr "%s: ryhmä %s on olemassa\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u ei ole ainutkertainen\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Käyttö: groupdel ryhmä\n"
 
@@ -863,47 +841,37 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: isäntä %s on NIS-palvelin\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "Jäsen on jo olemassa\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "Poistettavaa jäsentä ei löytynyt\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr "Käyttö: groupmems -a tunnus | -d tunnus | -D | -l [-g ryhmännimi]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "Vain pääkäyttäjä voi lisätä jäseniä eri ryhmiin\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "Ryhmäoikeus vaaditaan\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "Et ole nykyisen ryhmän ensisijainen omistaja\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "PAM-todennus epäonnistui\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "Ryhmätiedostoa ei voi lukita\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "Ryhmätiedostoa ei voi avata\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "Ryhmätiedostoa ei voi avata\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -913,6 +881,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Käyttö: groupmod [valitsimet] RYHMÄ\n"
@@ -945,10 +914,6 @@
 msgstr "Käyttö: %s [-r] [-s] [ryhmä]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Ei\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: valitsimet -s ja -r eivät sovi yhteen\n"
 
@@ -961,6 +926,9 @@
 msgstr "%s: tiedostoa %s ei voi lukita\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: tiedostoa %s ei voi päivittää\n"
+
 msgid "invalid group file entry\n"
 msgstr "virheellinen ryhmätiedostotietue\n"
 
@@ -968,7 +936,6 @@
 msgid "delete line '%s'? "
 msgstr "poista rivi \"%s\"? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "kaksinkertainen ryhmätietue\n"
 
@@ -1000,11 +967,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: ryhmän %s tietuetta ei voi päivittää\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "virheellinen tietue varjoryhmätiedostossa\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "kaksinkertainen varjoryhmätietue\n"
 
@@ -1021,10 +986,6 @@
 msgstr "varjoryhmä %s: ei käyttäjää %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: tiedostoa %s ei voi päivittää\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: tiedostot päivitettiin\n"
 
@@ -1056,19 +1017,16 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: varjoryhmätiedostoa ei voi poistaa\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Käyttö: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Käyttö: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " ryhmät="
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1090,17 +1048,19 @@
 "  -h, --help                 Näytä tämä ohje ja lopeta\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Käyttäjä         Portti   Mistä            Viimeksi\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Käyttäjä                Portti   Viimeksi\n"
 
 msgid "**Never logged in**"
 msgstr "**Ei koskaan kirjautunut sisään**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Tuntematon käyttäjä: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: odottamaton argumentti: %s\n"
@@ -1117,11 +1077,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r isäntä\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Virheellinen kirjautumisaika\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1129,7 +1087,6 @@
 "\n"
 "Järjestelmä on suljettu ylläpidon ajaksi\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1169,7 +1126,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Suurin sallittu määrä yrityksiä ylitetty (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: keskeytyspyyntö PAM:sta\n"
 
@@ -1188,6 +1144,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: fork-kutsu epäonnistui: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 "Varoitus: sisäänkirjautuminen uudelleen käytössä hetkellisen eston jälkeen.\n"
@@ -1211,14 +1171,16 @@
 "sisäänkirjautumisaika ylitetty\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Käyttö: newgrp [-] [ryhmä]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Käyttö: sg ryhmä [[-c] komento]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Vanha salasana: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "tuntematon UID: %u\n"
@@ -1227,11 +1189,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "tuntematon GID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Vanha salasana: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "liian monta ryhmää\n"
 
@@ -1243,7 +1200,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: ryhmää %s ei ole olemassa\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: tiedostoa /etc/passwd ei voi lukita.\n"
 
@@ -1256,6 +1223,10 @@
 msgstr "%s: tiedostoja ei voi avata\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: virhe päivitettäessä tiedostoja\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: rivi %d: virheellinen rivi\n"
 
@@ -1287,11 +1258,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: rivi %d: tietuetta ei voi päivittää\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: virhe päivitettäessä tiedostoja\n"
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1362,11 +1328,9 @@
 msgid "New password: "
 msgstr "Uusi salasana: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Yritä uudelleen.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1374,7 +1338,6 @@
 "\n"
 "Varoitus: heikko salasana (syötä uudelleen käyttääksesi joka tapauksessa).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Ne eivät täsmää. Yritä uudelleen.\n"
 
@@ -1412,11 +1375,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Käyttäjän %s salasanaa ei vaihdettu.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Salasana vaihdettu.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Salasana asetettu vanhenemaan.\n"
 
@@ -1424,11 +1385,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Käyttö: %s [-q] [-r] [-s] [passwd [varjo]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "virheellinen sanasanatiedostotietue\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "kaksinkertainen salasanatietue\n"
 
@@ -1460,11 +1419,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: salasanatietuetta %s ei voi päivittää\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "virheellinen tietue varjosalasanatiedostossa\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "kaksinkertainen varjosalasanatietue\n"
 
@@ -1500,15 +1457,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: varjosalasanatiedostoa ei voi poistaa\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Tunnuksen vaihtaminen täksi käyttäjäksi EVÄTTY.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Salasanatodennus ohitettu.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Syötä OMA salasanasi todennukseksi.\n"
 
@@ -1516,7 +1470,6 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1570,15 +1523,15 @@
 "%s: %s\n"
 "(Ohitettu)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Ei kuorta\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Ei salasanatiedosto\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Ei salasanatietuetta pääkäyttäjälle (\"root\")\n"
 
@@ -1623,7 +1576,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: liian monta ryhmää määritelty (korkeintaan %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1644,6 +1597,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1695,14 +1650,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: ei saa ainutkertaista UID:tä\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: ei saa ainutkertaista GID:iä\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: virheellinen perushakemisto \"%s\"\n"
@@ -1794,7 +1749,6 @@
 msgid "Creating mailbox file"
 msgstr "Luodaan postilaatikkotiedosto"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1816,6 +1770,10 @@
 "valitsinta -g.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u ei ole ainutkertainen\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1827,7 +1785,7 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: varoitus: CREATE_HOME ei tuettu, käytä -m sen sijaan.\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1906,7 +1864,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: virhe poistettaessa hakemistoa %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2026,6 +1984,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2065,6 +2029,12 @@
 msgstr ""
 "%s: tiedostoa %s ei voi palauttaa: %s (muutoksesi ovat tiedostossa %s)\n"
 
+#~ msgid "%s: name %s is not unique\n"
+#~ msgstr "%s: nimi %s ei ole ainutkertainen\n"
+
+#~ msgid "No\n"
+#~ msgstr "Ei\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/fr.po
===================================================================
--- upstream/trunk/po/fr.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/fr.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-24 16:16+0100\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"
@@ -27,7 +27,6 @@
 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"
@@ -42,19 +41,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Attention : le groupe %s est inconnu\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Attention : il y a trop de groupes\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Votre mot de passe est arrivé en fin de validité."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Votre mot de passe est désactivé."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Votre compte est arrivé en fin de validité."
 
@@ -68,11 +63,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Votre mot de passe arrivera en fin de validité dans %ld jours.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Votre mot de passe arrivera demain en fin de validité.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Votre mot de passe arrive aujourd'hui en fin de validité.\n"
 
@@ -80,7 +73,6 @@
 msgid "Unable to change tty %s"
 msgstr "Impossible de modifier le tty %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Débordement de l'environnement\n"
 
@@ -102,7 +94,6 @@
 "%d échecs depuis la dernière connexion.\n"
 "Le dernier échec était le %s sur %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Trop de connexions.\n"
 
@@ -199,7 +190,6 @@
 msgid "%s's Password: "
 msgstr "Mot de passe de %s : "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -237,7 +227,6 @@
 "                                de fin de validité à JOURS_AVERT\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 "Entrez la nouvelle valeur ou « Entrée » pour conserver la valeur proposée\n"
@@ -260,27 +249,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Date de fin de validité du compte (AAAA-MM-JJ)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Dernier changement de mot de passe\t\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "jamais\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "Le mot de passe doit être changé\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Fin de validité du mot de passe\t\t\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Mot de passe désactivé\t\t\t\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Fin de validité du compte\t\t\t\t\t\t\t: "
 
@@ -313,18 +296,15 @@
 msgstr "%s : échec de la méthode d'authentification PAM\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr ""
+"%s : impossible de verrouiller le fichier des mots de passe /etc/passwd\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s : impossible d'ouvrir le fichier des mots de passe /etc/passwd\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s : utilisateur %s inconnu\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s : le fichier des mots de passe cachés /etc/shadow n'existe pas\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr ""
 "%s : impossible de verrouiller le fichier des mots de passe cachés /etc/"
@@ -336,18 +316,15 @@
 "%s : impossible d'ouvrir le fichier des mots de passe cachés /etc/shadow\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s : échec lors de l'abandon des privilèges (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr ""
+"%s : impossible de réécrire le fichier des mots de passe cachés /etc/shadow\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Changement des informations sur la limite de validité pour %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s : impossible de réécrire le fichier des mots de passe /etc/passwd\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s : erreur lors de la modification des champs\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr ""
 "%s : impossible de mettre à jour le fichier des mots de passe /etc/passwd\n"
@@ -359,15 +336,26 @@
 "shadow\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr ""
-"%s : impossible de réécrire le fichier des mots de passe cachés /etc/shadow\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s : le fichier des mots de passe cachés /etc/shadow n'existe pas\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s : impossible de réécrire le fichier des mots de passe /etc/passwd\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s : échec lors de l'abandon des privilèges (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s : utilisateur %s inconnu\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Changement des informations sur la limite de validité pour %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s : erreur lors de la modification des champs\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -412,22 +400,32 @@
 msgid "Other"
 msgstr "Autre"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s : Impossible de déterminer votre nom d'utilisateur.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Impossible de devenir superutilisateur.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s : impossible de changer l'utilisateur « %s » sur le client NIS.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr ""
+"Impossible de verrouiller le fichier des mots de passe /etc/passwd ; "
+"réessayez plus tard.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s : « %s » est le maître NIS pour ce client.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Impossible d'ouvrir le fichier des mots de passe /etc/passwd.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Modification des informations relatives à l'utilisateur %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s : %s non trouvé dans /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Erreur lors de la mise à jour de l'entrée dans /etc/passwd.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr ""
+"Impossible de valider le changement du mot de passe dans /etc/passwd.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr ""
+"Impossible de déverrouiller le fichier des mots de passe /etc/passwd.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s : nom incorrect : « %s »\n"
@@ -449,41 +447,25 @@
 msgstr "%s : « %s » contient des caractères incorrects\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s : champs trop longs\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s : Impossible de déterminer votre nom d'utilisateur.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Impossible de devenir superutilisateur.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s : impossible de changer l'utilisateur « %s » sur le client NIS.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr ""
-"Impossible de verrouiller le fichier des mots de passe /etc/passwd ; "
-"réessayez plus tard.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s : « %s » est le maître NIS pour ce client.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Impossible d'ouvrir le fichier des mots de passe /etc/passwd.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Modification des informations relatives à l'utilisateur %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s : %s non trouvé dans /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s : champs trop longs\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Erreur lors de la mise à jour de l'entrée dans /etc/passwd.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr ""
-"Impossible de valider le changement du mot de passe dans /etc/passwd.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr ""
-"Impossible de déverrouiller le fichier des mots de passe /etc/passwd.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -546,6 +528,16 @@
 msgstr ""
 "%s : impossible d'ouvrir le fichier des mots de passe cachés /etc/shadow\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr ""
+"%s : erreur lors de la mise à jour du fichier des mots de passe cachés /etc/"
+"shadow\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s : erreur lors de la mise à jour de l'entrée dans /etc/group\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s : ligne %d : ligne trop longue\n"
@@ -558,16 +550,21 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s : ligne %d : groupe %s inconnu\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr ""
-"%s : ligne %d : impossible de mettre à jour l'entrée dans /etc/passwd\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s : ligne %d : impossible de mettre l'entrée à jour\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s : erreur détectée ; modifications ignorées\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr ""
+"%s : impossible de verrouiller le fichier des mots de passe cachés /etc/"
+"shadow\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr ""
 "%s : erreur lors de la mise à jour du fichier des mots de passe cachés /etc/"
@@ -579,21 +576,14 @@
 "%s : erreur lors de la mise à jour du fichier des mots de passe /etc/passwd\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr ""
-"%s : impossible de verrouiller le fichier des mots de passe /etc/passwd\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr ""
-"%s : impossible de verrouiller le fichier des mots de passe cachés /etc/"
-"shadow\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s : ligne %d : utilisateur %s inconnu\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr ""
+"%s : ligne %d : impossible de mettre à jour l'entrée dans /etc/passwd\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -629,7 +619,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s n'est pas un interpréteur de commandes valable.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Syntaxe : expiry {-f|-c}\n"
 
@@ -637,7 +626,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s : utilisateur inconnu\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -677,7 +665,6 @@
 "                                dont le compte est LOGIN\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Identifiant Échecs   Maximum Dernier                 Sur\n"
 
@@ -719,14 +706,42 @@
 "%s : mots de passe cachés dans /etc/gshadow nécessaires avec l'option -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Qui êtes-vous ?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s : impossible d'obtenir le verrou\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+msgstr ""
+"%s : impossible d'obtenir le verrou sur le fichier des mots de passe cachés /"
+"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 re-write file\n"
+msgstr "%s : impossible de réécrire le fichier\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr ""
+"%s : impossible de réécrire le fichier des mots de passe cachés /etc/shadow\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s : impossible de déverrouiller le fichier\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s : impossible de mettre à jour l'entrée\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr ""
+"%s : impossible de mettre à jour l'entrée dans le fichier /etc/shadow\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "groupe inconnu : %s\n"
 
@@ -740,22 +755,6 @@
 "%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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Retrait de l'utilisateur %s du groupe %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s : membre %s inconnu\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s : n'est pas un tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Changement du mot de passe pour le groupe %s\n"
 
@@ -772,39 +771,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s : réessayez plus tard\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s : impossible d'obtenir le verrou\n"
+msgid "Who are you?\n"
+msgstr "Qui êtes-vous ?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr ""
-"%s : impossible d'obtenir le verrou sur le fichier des mots de passe cachés /"
-"etc/shadow\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Ajout de l'utilisateur %s au groupe %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s : impossible de mettre à jour l'entrée\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Retrait de l'utilisateur %s du groupe %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr ""
-"%s : impossible de mettre à jour l'entrée dans le fichier /etc/shadow\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s : membre %s inconnu\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s : impossible de réécrire le fichier\n"
+msgid "%s: Not a tty\n"
+msgstr "%s : n'est pas un tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr ""
-"%s : impossible de réécrire le fichier des mots de passe cachés /etc/shadow\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s : impossible de déverrouiller le fichier\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -836,14 +821,6 @@
 msgstr "%s : erreur lors de l'ajout du nouveau groupe\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s : le nom %s n'est pas unique\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s : l'identifiant de groupe (GID) %u n'est pas unique\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s : impossible d'obtenir un identifiant de groupe (GID) unique\n"
 
@@ -890,6 +867,9 @@
 msgstr "%s : le groupe %s existe\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s : l'identifiant de groupe (GID) %u n'est pas unique\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Syntaxe : groupdel groupe\n"
 
@@ -917,51 +897,41 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s : %s est le maître NIS\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "Ce membre existe déjà\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "Le membre à supprimer est introuvable\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 "Syntaxe : groupmems -a nom_utilisateur | -d nom_utilisateur | -D | -l [-g "
 "nom_groupe]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr ""
 "Seul le superutilisateur (root) peut ajouter des membres à différents "
 "groupes\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "L'accès de groupe est nécessaire\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "Ce n'est pas le propriétaire principal du group actuel\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "Échec de la méthode d'authentification PAM pour\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "Impossible de verrouiller le fichier des groupes /etc/group\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "Impossible d'ouvrir le fichier des groupes /etc/group\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "Impossible de fermer le fichier des groupes /etc/group\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -971,6 +941,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Syntaxe : groupmod [option] GROUPE\n"
@@ -1007,10 +978,6 @@
 msgstr "Syntaxe : %s [-r] [-s] [groupe]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Non\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s : -s et -r sont incompatibles\n"
 
@@ -1023,6 +990,9 @@
 msgstr "%s : impossible d'ouvrir le fichier %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s : impossible de mettre à jour le fichier %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "entrée non valable dans le fichier /etc/group\n"
 
@@ -1030,7 +1000,6 @@
 msgid "delete line '%s'? "
 msgstr "effacer la ligne « %s » ? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "entrée de groupe dupliquée\n"
 
@@ -1062,12 +1031,10 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s : impossible de mettre à jour l'entrée %s dans /etc/group\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr ""
 "entrée non valable dans le fichier des mots de passe cachés /etc/gshadow\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr ""
 "entrée dupliquée dans le fichier des mots de passe cachés /etc/gshadow\n"
@@ -1085,10 +1052,6 @@
 msgstr "%s dans /etc/gshadow : aucun utilisateur %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s : impossible de mettre à jour le fichier %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s : les fichiers ont été mis à jour\n"
 
@@ -1128,19 +1091,15 @@
 "%s : impossible de supprimer le fichier des mots de passe cachés /etc/"
 "gshadow\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Syntaxe : id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Syntaxe : id\n"
 
-#, c-format
 msgid " groups="
 msgstr " groupes="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1164,17 +1123,19 @@
 "                                l'utilisateur dont le compte est LOGIN\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Utilisateur      Port     Venant de        Dernière\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Utilisateur             Port     Dernière\n"
 
 msgid "**Never logged in**"
 msgstr "**Jamais connecté**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Utilisateur %s inconnu\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog : paramètre inattendu : %s\n"
@@ -1191,11 +1152,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r hôte\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Heure de connexion non valable\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1203,7 +1162,6 @@
 "\n"
 "Système fermé pour maintenance\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1243,7 +1201,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Dépassement du nombre maximum de tentatives (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login : interruption requise par PAM\n"
 
@@ -1262,6 +1219,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s : échec lors du clonage (« forking » : %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 "Attention : identifiant de connexion réactivé après une désactivation "
@@ -1286,14 +1247,16 @@
 "Dépassement de temps lors de la connexion\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Syntaxe : newgrp [-] [groupe]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Syntaxe : sg groupe [[-c] commande]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Ancien mot de passe : "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "L'identifiant d'utilisateur (UID) %u est inconnu\n"
@@ -1302,11 +1265,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "L'identifiant de groupe (GID) %lu est inconnu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Ancien mot de passe : "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "trop de groupes\n"
 
@@ -1318,7 +1276,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s : le groupe %s n'existe pas\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s : impossible de verrouiller /etc/passwd.\n"
 
@@ -1331,6 +1299,10 @@
 msgstr "%s : impossible d'ouvrir les fichiers\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s : erreur lors de la mise à jour des fichiers\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s : ligne %d : ligne non valable\n"
 
@@ -1363,11 +1335,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s : ligne %d : impossible de mettre l'entrée à jour\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s : erreur lors de la mise à jour des fichiers\n"
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1442,11 +1409,9 @@
 msgid "New password: "
 msgstr "Nouveau mot de passe : "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Réessayez...\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1455,7 +1420,6 @@
 "Attention : mot de passe trop simple (entrez-le à nouveau pour l'utiliser\n"
 "quand même).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Mots de passe différents, recommencez...\n"
 
@@ -1495,11 +1459,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Le mot de passe pour %s est inchangé.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Mot de passe changé.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Le mot de passe est configuré pour une validité limitée.\n"
 
@@ -1507,11 +1469,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Syntaxe : %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "entrée non valable dans le fichier des mots de passe\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "entrée dupliquée dans le fichier des mots de passe\n"
 
@@ -1543,12 +1503,10 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s : impossible de mettre à jour l'entrée %s dans /etc/shadow\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr ""
 "entrée non valable dans le fichier des mots de passe cachés /etc/shadow\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr ""
 "entrée dupliquée dans le fichier des mots de passe cachés /etc/shadow\n"
@@ -1590,15 +1548,12 @@
 msgstr ""
 "%s : impossible d'effacer le fichier des mots de passe cachés /etc/shadow\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Accès à « su » à partir de ce compte REFUSÉ.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Authentification par mot de passe court-circuitée.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Entrez votre PROPRE mot de passe pour vous authentifier.\n"
 
@@ -1606,7 +1561,6 @@
 msgid "%s: %s\n"
 msgstr "%s : %s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1664,15 +1618,15 @@
 "%s : %s\n"
 "(Ignoré)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Pas d'interpréteur de commandes\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Pas de fichier des mots de passe\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Pas de mot de passe pour « root »\n"
 
@@ -1717,7 +1671,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s : trop de groupes spécifiés (max %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1738,6 +1692,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1781,8 +1737,7 @@
 "  -s, --shell INTERPRÉTEUR      interpréteur de commandes initial pour le\n"
 "                                compte du nouvel utilisateur\n"
 "  -u, --uid UID                 forcer l'utilisation de l'identifiant\n"
-"                                « UID » pour le compte du nouvel "
-"utilisateur\n"
+"                                « UID » pour le compte du nouvel utilisateur\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1793,14 +1748,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s : impossible d'obtenir un identifiant d'utilisateur (UID) unique\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s : impossible d'obtenir un identifiant de groupe (GID) unique\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s : répertoire de base non valable « %s »\n"
@@ -1901,7 +1856,6 @@
 msgid "Creating mailbox file"
 msgstr "Création de la boîte à lettres"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1923,6 +1877,10 @@
 "groupe, utilisez -g.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s : l'identifiant d'utilisateur (UID) %u n'est pas unique\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1936,7 +1894,6 @@
 "%s : attention : CREATE_HOME n'est pas pris en charge, veuillez utiliser -"
 "m.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -2018,7 +1975,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s : erreur lors de l'effacement du répertoire %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2144,6 +2101,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2187,6 +2150,12 @@
 msgstr ""
 "%s : impossible de restaurer %s : %s (vos modifications sont dans %s)\n"
 
+#~ msgid "%s: name %s is not unique\n"
+#~ msgstr "%s : le nom %s n'est pas unique\n"
+
+#~ msgid "No\n"
+#~ msgstr "Non\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/gl.po
===================================================================
--- upstream/trunk/po/gl.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/gl.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+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"
@@ -24,7 +24,6 @@
 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"
 
@@ -38,19 +37,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Aviso: grupo %s descoñecido\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Aviso: hai grupos de máis\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "O seu contrasinal caducou."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "O seu contrasinal está inactivo."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "O seu identificador de usuario caducou."
 
@@ -64,11 +59,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "O seu contrasinal ha caducar en %ld días.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "O seu contrasinal ha caducar mañá.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "O seu contrasinal ha caducar hoxe.\n"
 
@@ -76,7 +69,6 @@
 msgid "Unable to change tty %s"
 msgstr "Non se puido cambiar o tty %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Desbordamento nas variables de ambiente\n"
 
@@ -98,7 +90,6 @@
 "%d fallos desde a última entrada.\n"
 "O último foi o %s en %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Entrou demasiadas veces.\n"
 
@@ -195,7 +186,7 @@
 msgid "%s's Password: "
 msgstr "Contrasinal de %s: "
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -231,7 +222,6 @@
 "\t\t\t\ta AVISO\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Introduza o novo valor ou prema Intro para o valor por defecto\n"
 
@@ -253,27 +243,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Data de caducidade da conta (AAAA-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Último cambio de contrasinal\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "nunca\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "debe cambiarse o contrasinal\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "O contrasinal caduca\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Contrasinal inactivo\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "A conta caduca\t\t\t\t\t\t: "
 
@@ -302,18 +286,14 @@
 msgstr "%s: a autenticación con PAM fallou\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: non se pode bloquear o ficheiro de contrasinais\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: non se pode abrir o ficheiro de contrasinais\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: usuario %s descoñecido\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: o ficheiro de contrasinais shadow non está presente\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: non se pode bloquear o ficheiro de contrasinais shadow\n"
 
@@ -322,18 +302,14 @@
 msgstr "%s: non se pode abrir o ficheiro de contrasinais shadow\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: non se puido deixar os privilexios (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: non se pode rescribir o ficheiro de contrasinais shadow\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "A cambiar a información de caducidade de %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: non se pode rescribir o ficheiro de contrasinais\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: erro ao cambiar os campos\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: non se pode actualizar o ficheiro de contrasinais\n"
 
@@ -342,14 +318,26 @@
 msgstr "%s: non se pode actualizar o ficheiro de contrasinais shadow\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: non se pode rescribir o ficheiro de contrasinais shadow\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: o ficheiro de contrasinais shadow non está presente\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: non se pode rescribir o ficheiro de contrasinais\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: non se puido deixar os privilexios (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: usuario %s descoñecido\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "A cambiar a información de caducidade de %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: erro ao cambiar os campos\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -393,22 +381,29 @@
 msgid "Other"
 msgstr "Outro"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Non se pode determinar o seu nome de usuario.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Non se pode cambiar o ID a root.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: non se pode cambiar o usuario \"%s\" no cliente NIS.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr ""
+"Non se pode bloquear o ficheiro de contrasinais; volva tentalo despois.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: \"%s\" é o mestre NIS deste cliente.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Non se pode abrir o ficheiro de contrasinais.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "A cambiar a información de usuario de %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: non se atopou %s en /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Erro ao actualizar a entrada de contrasinal.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Non se poden gravar os cambios no ficheiro de contrasinais.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Non se pode desbloquear o ficheiro de contrasinais.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: nome non válido: \"%s\"\n"
@@ -430,38 +425,25 @@
 msgstr "%s: \"%s\" contén caracteres non válidos\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: campos longos de máis\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Non se pode determinar o seu nome de usuario.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Non se pode cambiar o ID a root.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: non se pode cambiar o usuario \"%s\" no cliente NIS.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr ""
-"Non se pode bloquear o ficheiro de contrasinais; volva tentalo despois.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: \"%s\" é o mestre NIS deste cliente.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Non se pode abrir o ficheiro de contrasinais.\n"
+msgid "Changing the user information for %s\n"
+msgstr "A cambiar a información de usuario de %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: non se atopou %s en /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s: campos longos de máis\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Erro ao actualizar a entrada de contrasinal.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Non se poden gravar os cambios no ficheiro de contrasinais.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Non se pode desbloquear o ficheiro de contrasinais.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -520,6 +502,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: non se pode abrir o ficheiro shadow\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: erro ao actualizar o ficheiro shadow\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: erro ao actualizar a entrada do grupo\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: liña %d: liña longa de máis\n"
@@ -532,15 +522,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: liña %d: grupo %s descoñecido\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: liña %d: non se pode actualizar a entrada de contrasinal\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: liña %d: non se pode actualizar a entrada\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: detectouse un erro, ignóranse os cambios\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: non se pode bloquear o ficheiro shadow\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: erro ao actualizar o ficheiro shadow\n"
 
@@ -549,18 +543,14 @@
 msgstr "%s: erro ao actualizar o ficheiro de contrasinais\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: non se pode bloquear o ficheiro de contrasinais\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: non se pode bloquear o ficheiro shadow\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: liña %d: usuario %s descoñecido\n"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: liña %d: non se pode actualizar a entrada de contrasinal\n"
+
+#, fuzzy
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -595,7 +585,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s non é un intérprete de ordes válido.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Emprego: expiry {-f|-c}\n"
 
@@ -603,7 +592,7 @@
 msgid "%s: unknown user\n"
 msgstr "%s: usuario descoñecido\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -639,7 +628,6 @@
 "\t\t\topcións -r, -m ou -l) só do USUARIO\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Usuario     Fallos   Máximo  Último                   O\n"
 
@@ -680,14 +668,38 @@
 msgstr "%s: precísase de contrasinais de grupo shadow para -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "¿Quen é vostede?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: non se pode obter un bloqueo\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+msgstr "%s: non se pode obter o bloqueo de shadow\n"
+
+#, c-format
 msgid "%s: can't open file\n"
 msgstr "%s: non se pode abrir o ficheiro\n"
 
 #, c-format
+msgid "%s: can't re-write file\n"
+msgstr "%s: non se pode rescribir o ficheiro\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: non se pode rescribir o ficheiro de shadow\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: non se pode desbloquear o ficheiro\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: non se pode actualizar a entrada\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: non se pode actualizar a entrada de shadow\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "grupo descoñecido: %s\n"
 
@@ -700,22 +712,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "A eliminar o usuario %s do grupo %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: membro %s descoñecido\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: Non é un tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "A cambiar o contrasinal do grupo %s\n"
 
@@ -732,35 +728,26 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Volva tentalo despois\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: non se pode obter un bloqueo\n"
+msgid "Who are you?\n"
+msgstr "¿Quen é vostede?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: non se pode obter o bloqueo de shadow\n"
+msgid "Adding user %s to group %s\n"
+msgstr "A engadir o usuario %s ao grupo %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: non se pode actualizar a entrada\n"
+msgid "Removing user %s from group %s\n"
+msgstr "A eliminar o usuario %s do grupo %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: non se pode actualizar a entrada de shadow\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: membro %s descoñecido\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: non se pode rescribir o ficheiro\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: Non é un tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: non se pode rescribir o ficheiro de shadow\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: non se pode desbloquear o ficheiro\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -789,14 +776,6 @@
 msgstr "%s: erro ao engadir a entrada do novo grupo\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: o nome %s non é único\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: o GID %u non é único\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: non se pode obter un GID único\n"
 
@@ -837,6 +816,9 @@
 msgstr "%s: o grupo %s existe\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: o GID %u non é único\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Emprego: groupdel grupo\n"
 
@@ -864,47 +846,37 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s é o mestre NIS\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "O membro xa existe\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "Non se atopou o membro a eliminar\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr "Emprego: groupmems -a usuario | -d usuario | -D | -l [-g grupo]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "Só o administrador pode engadir membros a distintos grupos\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "Precísase de acceso a grupos\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "Non é o propietario primario do grupo actual\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "A autenticación con PAM fallou para\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "Non se pode bloquear o ficheiro de grupos\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "Non se pode abrir o ficheiro de grupos\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "Non se pode pechar o ficheiro de grupos\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -914,6 +886,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Emprego: groupmod [opcións] GRUPO\n"
@@ -946,10 +919,6 @@
 msgstr "Emprego: %s [-r] [-s] [grupo]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Non\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s e -r son incompatibles\n"
 
@@ -962,6 +931,9 @@
 msgstr "%s: non se pode abrir o ficheiro %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: non se pode actualizar o ficheiro %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "entrada do ficheiro de grupos non válida\n"
 
@@ -969,7 +941,6 @@
 msgid "delete line '%s'? "
 msgstr "¿borrar a liña \"%s\"? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "entrada de grupo duplicada\n"
 
@@ -1001,11 +972,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: non se pode actualizar a entrada do grupo %s\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "entrada do ficheiro de grupos shadow non válida\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "entrada de grupo shadow duplicada\n"
 
@@ -1022,10 +991,6 @@
 msgstr "grupo shadow %s: non existe o usuario %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: non se pode actualizar o ficheiro %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: actualizáronse os ficheiros\n"
 
@@ -1057,19 +1022,16 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: non se pode borrar o ficheiro de grupos shadow\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Emprego: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Emprego: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " grupos="
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1092,17 +1054,19 @@
 "  -u, --user USUARIO\tamosa o rexistro de última entrada do USUARIO\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Usuario          Porto    Desde            Última\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Usuario                 Porto    Última\n"
 
 msgid "**Never logged in**"
 msgstr "**Nunca entrou**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Usuario descoñecido: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: non se esperaba un argumento: %s\n"
@@ -1119,11 +1083,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "         %s [-p] -r servidor\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Hora de entrada non válida\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1131,7 +1093,6 @@
 "\n"
 "O sistema está pechado por mantemento rutinario\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1171,7 +1132,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Superouse o número máximo de intentos (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: cancelación solicitada por PAM\n"
 
@@ -1190,6 +1150,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: fallo ao lanzar o proceso: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Aviso: vólvese permitir a entrada despois do bloqueo temporal.\n"
 
@@ -1212,14 +1176,16 @@
 "superouse o tempo de entrada\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Emprego: newgrp [-] [grupo]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Emprego: sg grupo [[-c] orde]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Contrasinal antigo: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "UID descoñecido: %u\n"
@@ -1228,11 +1194,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "GID descoñecido: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Contrasinal antigo: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "hai grupos de máis\n"
 
@@ -1244,7 +1205,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: o grupo %s non existe\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: non se pode bloquear /etc/passwd.\n"
 
@@ -1257,6 +1228,10 @@
 msgstr "%s: non se pode abrir ficheiros\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: erro ao actualizar os ficheiros\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: liña %d: liña non válida\n"
 
@@ -1288,11 +1263,7 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: liña %d: non se pode actualizar a entrada\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: erro ao actualizar os ficheiros\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1362,11 +1333,9 @@
 msgid "New password: "
 msgstr "Novo contrasinal: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Volva tentalo.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1374,7 +1343,6 @@
 "\n"
 "Aviso: contrasinal feble (introdúzao outra vez para o empregar igualmente).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Non coinciden; volva tentalo.\n"
 
@@ -1412,11 +1380,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Non se cambiou o contrasinal de %s\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Cambiouse o contrasinal.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Vai caducar o contrasinal.\n"
 
@@ -1424,11 +1390,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Emprego: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "entrada do ficheiro de contrasinais non válida\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "entrada de contrasinal duplicada\n"
 
@@ -1460,11 +1424,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: non se pode actualizar a entrada de contrasinal para %s\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "entrada do ficheiro de contrasinais shadow non válida\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "entrada de contrasinal shadow duplicada\n"
 
@@ -1500,15 +1462,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: non se pode borrar o ficheiro de contrasinais shadow\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "O acceso a su para esa conta está DENEGADO.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Omitiuse a autenticación por contrasinal.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Introduza O SEU PROPIO contrasinal para autenticación.\n"
 
@@ -1516,7 +1475,7 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1569,15 +1528,15 @@
 "%s: %s\n"
 "(Ignórase)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Non hai un intérprete de ordes\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Non é un ficheiro de contrasinais\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Non hai unha entrada de contrasinal para \"root\"\n"
 
@@ -1621,7 +1580,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: especificáronse grupos de máis (máximo %d).\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1642,6 +1601,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1688,14 +1649,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: non se pode obter un UID único\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: non se pode obter un GID único\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: directorio base \"%s\" non válido\n"
@@ -1787,7 +1748,6 @@
 msgid "Creating mailbox file"
 msgstr "A crear o ficheiro da caixa do correo"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1809,6 +1769,10 @@
 "-g.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: o UID %u non é único\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1820,7 +1784,7 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: aviso: CREATE_HOME non está soportado, empregue -m no seu canto.\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1899,7 +1863,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: erro ao borrar o directorio %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2014,8 +1978,15 @@
 msgid "failed to rename mailbox"
 msgstr "non se puido cambiar o nome da caixa do correo"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+#, fuzzy
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2054,6 +2025,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s: o nome %s non é único\n"
+
+#~ msgid "No\n"
+#~ msgstr "Non\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/he.po
===================================================================
--- upstream/trunk/po/he.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/he.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -2,13 +2,13 @@
 # Copyright (C) 2004 THE shadow'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the shadow package.
 # Lior Kaplan <webmaster at guides.co.il>, 2004.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+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"
@@ -26,7 +26,6 @@
 msgid "crypt method not supported by libcrypt? (%s)\n"
 msgstr ""
 
-#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "לא יכול להקצות מקום בשביל מידע על הקונפיגורציה.\n"
 
@@ -38,19 +37,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "אזהרה: קבוצה לא מוכרת %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "אזהרה: יותר מידי קבוצות\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "תוקף הסיסמה שלך פג."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "הסיסמה שלך אינה פעילה."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "תוקף הכניסה שלך למערכת פג."
 
@@ -64,11 +59,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "תוקף הסיסמה שלך יפוג בתוך %ld ימים.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "תוקף הסיסמה שלך יפוג מחר.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "תוקף הסיסמה שלך פג היום.\n"
 
@@ -76,7 +69,6 @@
 msgid "Unable to change tty %s"
 msgstr "לא יכול לשנות tty %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "הצפת סביבה\n"
 
@@ -94,7 +86,6 @@
 msgstr[0] "%d שגיאה מאז כניסה אחרונה למערכת. האחרונה היתה %s על %s.\n"
 msgstr[1] "%d שגיאה מאז כניסה אחרונה למערכת. האחרונה היתה %s על %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "יותר מידי כניסות למערכת.\n"
 
@@ -190,7 +181,6 @@
 msgid "%s's Password: "
 msgstr "הסיסמה של %s: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -209,7 +199,6 @@
 "\n"
 msgstr ""
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "הכנס ערך חדש, או לחץ ENTER לברירת המחדל\n"
 
@@ -231,27 +220,26 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "תאריך תוקף חשבון (YYYY-MM-DD)"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Last password change\t\t\t\t\t: "
 msgstr "שינוי סיסמה אחרון (YYYY-MM-DD)"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "never\n"
 msgstr "אף פעם\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Password expires\t\t\t\t\t: "
 msgstr "תוקף סיסמה:\t"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "חסור פעילות סיסמה:\t"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "תוקף חשבון:\t"
 
@@ -280,18 +268,14 @@
 msgstr "%s: זיהוי PAM נכשל\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: לא יכול לנעול קובץ סיסמאות\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: לא יכול לפתוח קובץ סיסמאות\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: לא יכול לפתוח קובץ סיסמאות צל\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: לא יכול לנעול קובץ סיסמאות צל\n"
 
@@ -300,18 +284,14 @@
 msgstr "%s: לא יכול לפתוח קובץ סיסמאות צל\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr ""
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: לא יכול לכתוב מחדש קובץ סיסמאות צל\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "שנה מידע הזדקות בשביל %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: לא יכול לכתוב מחדש קובץ סיסמאות\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: שגיאה בשינוי שדות\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: לא יכול לעדכן קובץ סיסמאות\n"
 
@@ -319,15 +299,27 @@
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: לא יכול לעדכן קובץ סיסמאות צל\n"
 
+#, fuzzy, c-format
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: לא יכול לפתוח קובץ סיסמאות צל\n"
+
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: לא יכול לכתוב מחדש קובץ סיסמאות צל\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr ""
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: לא יכול לכתוב מחדש קובץ סיסמאות\n"
+msgid "%s: unknown user %s\n"
+msgstr ""
 
 #, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "שנה מידע הזדקות בשביל %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: שגיאה בשינוי שדות\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -368,22 +360,28 @@
 msgid "Other"
 msgstr "אחר"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: לא יכול לקבוע את שם המשתמש שלך.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "לא יכול לשנות ID ל-root\n"
 
-#, fuzzy, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: לא יכול לשנות משתמש `%s' על לקוח NIS.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "לא יכול לנעול קובץ סיסמאות; נסה שוב מאוחר יותר\n"
 
+msgid "Cannot open the password file.\n"
+msgstr "לא יכול לפתוח את קובץ הסיסמאות.\n"
+
 #, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
+msgid "%s: %s not found in /etc/passwd\n"
 msgstr ""
 
-#, c-format
-msgid "Changing the user information for %s\n"
-msgstr "משנה מידע בשביל המשתמש %s\n"
+msgid "Error updating the password entry.\n"
+msgstr "שגיאה בעדכון רשומת הסיסמה.\n"
 
+msgid "Cannot commit password file changes.\n"
+msgstr "לא יכול לבצע שינויים בקובץ הסיסמאות.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "לא יכול לשחרר נעילה של קובץ הסיסמאות.\n"
+
 #, fuzzy, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
@@ -405,38 +403,26 @@
 msgstr "%s: \"%s\" מכיל תווים לא חוקיים\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: שדות ארוכים מידי\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: לא יכול לקבוע את שם המשתמש שלך.\n"
 
-#, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "לא יכול לשנות ID ל-root\n"
+#, fuzzy, c-format
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: לא יכול לשנות משתמש `%s' על לקוח NIS.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "לא יכול לנעול קובץ סיסמאות; נסה שוב מאוחר יותר\n"
-
-#, c-format
-msgid "Cannot open the password file.\n"
-msgstr "לא יכול לפתוח את קובץ הסיסמאות.\n"
-
-#, c-format
-msgid "%s: %s not found in /etc/passwd\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
 msgstr ""
 
 #, c-format
-msgid "Error updating the password entry.\n"
-msgstr "שגיאה בעדכון רשומת הסיסמה.\n"
+msgid "Changing the user information for %s\n"
+msgstr "משנה מידע בשביל המשתמש %s\n"
 
 #, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "לא יכול לבצע שינויים בקובץ הסיסמאות.\n"
+msgid "%s: fields too long\n"
+msgstr "%s: שדות ארוכים מידי\n"
 
 #, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "לא יכול לשחרר נעילה של קובץ הסיסמאות.\n"
-
-#, c-format
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -486,6 +472,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: לא יכול לפתוח קובץ צל\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: שגיאה בעדכון קובץ צל\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: שגיאה בעדכון קובץ צל\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: שורה %d: שורה ארוכה מידי\n"
@@ -498,8 +492,8 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: שורה %d: משתמש לא מוכר %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
 msgstr "%s: שורה %d: לא יכול לעדכן רשומת סיסמה\n"
 
 #, c-format
@@ -507,6 +501,10 @@
 msgstr "%s: שגיאה זוהתה, מתעלם משינויים\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: לא יכול לנעול קובץ צל\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: שגיאה בעדכון קובץ צל\n"
 
@@ -515,18 +513,13 @@
 msgstr "%s: שגיאה בעדכון קובץ סיסמאות\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: לא יכול לנעול קובץ סיסמאות\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: לא יכול לנעול קובץ צל\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: שורה %d: משתמש לא מוכר %s\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: שורה %d: לא יכול לעדכן רשומת סיסמה\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -555,7 +548,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s היא מעטפת לא חוקית.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "שימוש: expiry {-f|-c}\n"
 
@@ -563,7 +555,6 @@
 msgid "%s: unknown user\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -583,7 +574,6 @@
 "\n"
 msgstr ""
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr ""
 
@@ -624,41 +614,49 @@
 msgstr ""
 
 #, c-format
-msgid "Who are you?\n"
+msgid "%s: can't get lock\n"
 msgstr ""
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't open file\n"
 msgstr ""
 
 #, c-format
-msgid "unknown group: %s\n"
+msgid "%s: can't re-write file\n"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: לא יכול לנעול קובץ צל\n"
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: לא יכול לפתוח קובץ צל\n"
-
 #, c-format
-msgid "Adding user %s to group %s\n"
+msgid "%s: can't unlock file\n"
 msgstr ""
 
 #, c-format
-msgid "Removing user %s from group %s\n"
+msgid "%s: can't update entry\n"
 msgstr ""
 
 #, c-format
-msgid "%s: unknown member %s\n"
+msgid "%s: can't update shadow entry\n"
 msgstr ""
 
 #, c-format
-msgid "%s: Not a tty\n"
+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 "Changing the password for group %s\n"
 msgstr ""
@@ -676,35 +674,25 @@
 msgid "%s: Try again later\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
+msgid "Who are you?\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
+msgid "Adding user %s to group %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't update entry\n"
+msgid "Removing user %s from group %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
+msgid "%s: unknown member %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't re-write file\n"
+msgid "%s: Not a tty\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr ""
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -724,14 +712,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr ""
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr ""
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr ""
 
@@ -772,6 +752,9 @@
 msgstr ""
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr ""
+
 msgid "Usage: groupdel group\n"
 msgstr ""
 
@@ -799,47 +782,39 @@
 msgid "%s: %s is the NIS master\n"
 msgstr ""
 
-#, c-format
 msgid "Member already exists\n"
 msgstr ""
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr ""
 
-#, c-format
 msgid "Group access is required\n"
 msgstr ""
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "PAM authentication failed for\n"
 msgstr "%s: זיהוי PAM נכשל\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to lock group file\n"
 msgstr "לא יכול לבצע cd ל-\"%s\"\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Cannot close group file\n"
 msgstr "לא יכול לשחרר נעילה של קובץ הסיסמאות.\n"
 
-#, c-format
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -849,6 +824,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 
@@ -873,10 +849,6 @@
 msgstr ""
 
 #, c-format
-msgid "No\n"
-msgstr ""
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr ""
 
@@ -889,6 +861,9 @@
 msgstr ""
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr ""
+
 msgid "invalid group file entry\n"
 msgstr ""
 
@@ -896,7 +871,6 @@
 msgid "delete line '%s'? "
 msgstr ""
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr ""
 
@@ -928,11 +902,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr ""
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr ""
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr ""
 
@@ -949,10 +921,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr ""
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr ""
 
@@ -984,19 +952,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "שימוש: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "שימוש: id\n"
 
-#, c-format
 msgid " groups="
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1009,11 +973,9 @@
 "\n"
 msgstr ""
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr ""
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr ""
 
@@ -1021,6 +983,10 @@
 msgstr ""
 
 #, c-format
+msgid "Unknown user or range: %s\n"
+msgstr ""
+
+#, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr ""
 
@@ -1036,17 +1002,14 @@
 msgid "       %s [-p] -r host\n"
 msgstr ""
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1082,7 +1045,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr ""
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr ""
 
@@ -1099,6 +1061,10 @@
 msgid "%s: failure forking: %s"
 msgstr ""
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 
@@ -1119,14 +1085,16 @@
 "\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr ""
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "סיסמה לא טובה: %s.  "
+
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "%s: שורה %d: משתמש לא מוכר %s\n"
@@ -1135,11 +1103,6 @@
 msgid "unknown GID: %lu\n"
 msgstr ""
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "סיסמה לא טובה: %s.  "
-
-#, c-format
 msgid "too many groups\n"
 msgstr ""
 
@@ -1152,6 +1115,16 @@
 msgstr ""
 
 #, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr ""
 
@@ -1164,6 +1137,10 @@
 msgstr ""
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr ""
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr ""
 
@@ -1195,11 +1172,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr ""
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr ""
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1243,17 +1215,14 @@
 msgid "New password: "
 msgstr ""
 
-#, c-format
 msgid "Try again.\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
 msgstr ""
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr ""
 
@@ -1291,11 +1260,10 @@
 msgid "The password for %s is unchanged.\n"
 msgstr ""
 
-#, c-format
 msgid "Password changed.\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Password set to expire.\n"
 msgstr "תוקף הסיסמה שלך פג."
 
@@ -1303,11 +1271,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr ""
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr ""
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr ""
 
@@ -1339,11 +1305,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr ""
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr ""
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr ""
 
@@ -1379,15 +1343,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr ""
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr ""
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr ""
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr ""
 
@@ -1395,7 +1356,6 @@
 msgid "%s: %s\n"
 msgstr "passwd: %s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1435,15 +1395,15 @@
 "(Ignored)\n"
 msgstr ""
 
-#, c-format
 msgid "No shell\n"
 msgstr ""
 
-#, c-format
 msgid "No password file\n"
 msgstr ""
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr ""
 
@@ -1484,7 +1444,6 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1505,6 +1464,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1525,11 +1486,11 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: UID %u is not unique\n"
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s: can't get unique UID\n"
+msgid "%s: can't get unique GID (no more available GIDs)\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
 #, fuzzy, c-format
@@ -1623,7 +1584,6 @@
 msgid "Creating mailbox file"
 msgstr ""
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1640,6 +1600,10 @@
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: שם לא חוקי: \"%s\"\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1650,7 +1614,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1718,7 +1681,6 @@
 msgid "%s: error removing directory %s\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -1810,6 +1772,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"

Modified: upstream/trunk/po/hu.po
===================================================================
--- upstream/trunk/po/hu.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/hu.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-25 20:56+0100\n"
 "Last-Translator: SZERVÁC Attila <sas at 321.hu>\n"
 "Language-Team: Hungarian <gnome at gnome.hu>\n"
@@ -24,7 +24,6 @@
 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"
 
@@ -36,19 +35,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Figyelem: ismeretlen %s csoport\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Figyelem: túl sok csoport\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "A jelszó lejárt"
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "A jelszó inaktív"
 
-#, c-format
 msgid "Your login has expired."
 msgstr "A bejelentkezés lejárt"
 
@@ -62,11 +57,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "A jelszó %ld nap múlva lejár.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Jelszavad már csak holnapig érvényes\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Jelszavad érvényessége ma lejár\n"
 
@@ -74,7 +67,6 @@
 msgid "Unable to change tty %s"
 msgstr "Nem lehet a következő terminálra váltani: %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Környezeti túlcsordulás\n"
 
@@ -93,7 +85,6 @@
 "%d hiba az utolsó bejelentkezés óta\n"
 "A legutóbbi: %s itt: %s\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Túl sok bejelentkezés\n"
 
@@ -190,7 +181,6 @@
 msgid "%s's Password: "
 msgstr "%s jelszava: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -229,7 +219,6 @@
 "                                   számának beállítása FIGYELM_NAPOK-ra\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Add meg az új értéket vagy üss ENTER-t az alapértelmezetthez\n"
 
@@ -251,27 +240,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Hozzáférés elévülési dátum (ÉÉÉÉ-HH-NN)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Utolsó jelszóváltás\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "soha\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "jelszóváltás kötelező\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Jelszó lejár\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Jelszó inaktív\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Hozzáférés lejár\t\t\t\t\t\t: "
 
@@ -300,18 +283,14 @@
 msgstr "%s: PAM hitelesítési hiba\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: nem tudom zárolni a jelszófájlt\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: a jelszófájl nem nyitható meg\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: ismeretlen %s felhasználó\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: nincs meg az árnyék jelszófájl\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: az árnyék jelszófájl zárolása sikertelen\n"
 
@@ -320,18 +299,14 @@
 msgstr "%s: az árnyék jelszófájl megnyitása sikertelen\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: a jogosultságok eldobása meghiúsult (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: az árnyék jelszófájl újraírása sikertelen\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "%s elévülési információinak módosítása\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: a jelszófájl újraírása sikertelen\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: hiba a mezők módosításakor\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: a jelszófájl frissítése sikertelen\n"
 
@@ -340,14 +315,26 @@
 msgstr "%s: az árnyék jelszófájl frissítése sikertelen\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: az árnyék jelszófájl újraírása sikertelen\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: nincs meg az árnyék jelszófájl\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: a jelszófájl újraírása sikertelen\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: a jogosultságok eldobása meghiúsult (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: ismeretlen %s felhasználó\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "%s elévülési információinak módosítása\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: hiba a mezők módosításakor\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -392,22 +379,28 @@
 msgid "Other"
 msgstr "Egyéb"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: A felhasználóneved megállapítása sikertelen\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Az ID nem cserélhető root-ra.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: `%s' felhasználó nem módosítható NIS kliensen.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "Nem zárolható a jelszófájl; próbáld később\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: `%s' a NIS mester ehhez a klienshez.\n"
+msgid "Cannot open the password file.\n"
+msgstr "A jelszófájl nem nyitható meg.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "%s felhasználói információinak cseréje\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s nem található a /etc/passwd-ben\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Hiba a jelszó bejegyzés frissítésekor\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Nem tudom megtenni a jelszófájl módosításokat.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Nem tudom feloldani a jelszófájl zárolását.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: érvénytelen név: \"%s\"\n"
@@ -429,37 +422,25 @@
 msgstr "%s: \"%s\" illegális karaktereket tartalmaz\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: túl hosszú mezők\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: A felhasználóneved megállapítása sikertelen\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Az ID nem cserélhető root-ra.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: `%s' felhasználó nem módosítható NIS kliensen.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Nem zárolható a jelszófájl; próbáld később\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: `%s' a NIS mester ehhez a klienshez.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "A jelszófájl nem nyitható meg.\n"
+msgid "Changing the user information for %s\n"
+msgstr "%s felhasználói információinak cseréje\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s nem található a /etc/passwd-ben\n"
+msgid "%s: fields too long\n"
+msgstr "%s: túl hosszú mezők\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Hiba a jelszó bejegyzés frissítésekor\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Nem tudom megtenni a jelszófájl módosításokat.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Nem tudom feloldani a jelszófájl zárolását.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -518,6 +499,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: nem tudom megnyitni a 'gshadow' fájlt\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: hiba az árnyék fájl frissítésekor\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: Hiba a csoport bejegyzés frissítésekor\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: %d. sor: túl hosszú\n"
@@ -530,15 +519,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: %d.: ismeretlen %s csoport\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: %d. sor: a jelszó bejegyzés nem frissíthető\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: %d. sor: nem tudom frissíteni a bejegyzést\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: hibákat észleltem, a változások elvetve\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: nem tudom zárolni az árnyék fájlt\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: hiba az árnyék fájl frissítésekor\n"
 
@@ -547,18 +540,13 @@
 msgstr "%s: hiba a jelszófájl frissítésekor\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: nem tudom zárolni a jelszófájlt\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: nem tudom zárolni az árnyék fájlt\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: %d. sor: ismeretlen %s felhasználó\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: %d. sor: a jelszó bejegyzés nem frissíthető\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -593,7 +581,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s érvénytelen héj.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Használat: expiry {-f|-c}\n"
 
@@ -601,7 +588,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: ismeretlen felhasználó\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -642,7 +628,6 @@
 "értékeket.\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Név         Hibás Maximális Legutóbbi                   Ezen\n"
 
@@ -683,14 +668,38 @@
 msgstr "%s: árnyék csoport jelszavak kellenek ehhez: -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Ki vagy?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: nem szerezhető zár\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: nem tudom újraírni a fájlt\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: nem tudom újraírni az árnyék fájlt\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: nem tudom feloldani a fájlt\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: nem tudom frissíteni a bejegyzést\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: nem tudom frissíteni az árnyék bejegyzést\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "ismeretlen csoport: %s\n"
 
@@ -703,22 +712,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "%s felhasználó törlése %s csoportból\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: ismeretlen %s tag\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: Nem tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "%s csoport jelszavának cseréje\n"
 
@@ -735,35 +728,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Próbáld később\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: nem szerezhető zár\n"
+msgid "Who are you?\n"
+msgstr "Ki vagy?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: nem szerezhető árnyékzár\n"
+msgid "Adding user %s to group %s\n"
+msgstr "%s felhasználó hozzáadása %s csoporthoz\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: nem tudom frissíteni a bejegyzést\n"
+msgid "Removing user %s from group %s\n"
+msgstr "%s felhasználó törlése %s csoportból\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: nem tudom frissíteni az árnyék bejegyzést\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: ismeretlen %s tag\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: nem tudom újraírni a fájlt\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: Nem tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: nem tudom újraírni az árnyék fájlt\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: nem tudom feloldani a fájlt\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -795,14 +778,6 @@
 msgstr "%s: hiba az új csoport bejegyzés hozzáadásakor\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: %s név nem egyedi\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: %u GID nem egyedi\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: nem szerezhető be egyedi csoportazonosító\n"
 
@@ -843,6 +818,9 @@
 msgstr "%s: %s csoport létezik\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: %u GID nem egyedi\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Használat: groupdel csoport\n"
 
@@ -870,49 +848,39 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s a NIS mester\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "A tag már létezik\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "Az eltávolítandó tag nem található\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 "Használat: groupmems -a felhasználónév | -d felhasználónév | -D | -l [-g "
 "csoportnév]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "Csak a root adhat tagokat különböző csoportokhoz\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "Csoport hozzáférés kell\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "Nem a jelen csoport elsődleges tulajdonosa\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "PAM hitelesítési hiba ehhez:\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "Csoport fájl zárolása sikertelen\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "Csoport fájl megnyitása sikertelen\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "Csoport fájl bezárása sikertelen\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -922,6 +890,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Használat: groupmod [kapcsolók] CSOPORT\n"
@@ -955,10 +924,6 @@
 msgstr "Használat: %s [-r] [-s] [csoport]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Nem\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s és -r inkompatibilisek\n"
 
@@ -971,6 +936,9 @@
 msgstr "%s: %s fájl nem nyitható meg\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: %s fájl nem frissíthető\n"
+
 msgid "invalid group file entry\n"
 msgstr "érvénytelen csoport fájl bejegyzés\n"
 
@@ -978,7 +946,6 @@
 msgid "delete line '%s'? "
 msgstr "törlöd a következő sort: `%s'? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "dupla csoport bejegyzés\n"
 
@@ -1010,11 +977,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: nem tudom frissíteni %s csoport bejegyzését\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "érvénytelen árnyék csoport fájl bejegyzés\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "dupla árnyék csoport bejegyzés\n"
 
@@ -1031,10 +996,6 @@
 msgstr "%s árnyék csoport: nincs %s felhasználó\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: %s fájl nem frissíthető\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: fájlok frissítve\n"
 
@@ -1066,19 +1027,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: nem tudom törölni az árnyék csoport fájlt\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Használat: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Használat: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " csoportok="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1102,17 +1059,19 @@
 "                                rekordjainak kiírása\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Felhasználónév   Port     Innen            Legutóbb\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Felhasználónév          Port     Legutóbb\n"
 
 msgid "**Never logged in**"
 msgstr "**Sosem lépett be**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Ismeretlen felhasználó: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: váratlan argumentum: %s\n"
@@ -1129,11 +1088,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r host\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Érvénytelen bejelentkezési idő\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1141,7 +1098,6 @@
 "\n"
 "Rendszer lezárva rutin karbantartásra\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1181,7 +1137,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Próbálkozások megengedett száma átlépve (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: a PAM törlést kért\n"
 
@@ -1200,6 +1155,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: hiba a következő indításakor: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Figyelem: a bejelentkezés ismét lehetséges az átmeneti kizárás után.\n"
 
@@ -1222,14 +1181,16 @@
 "bejelentkezési idő átlépve\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Használat: newgrp [-] [csoport]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Használat: sg csoport [[-c] parancs]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Régi jelszó: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "ismeretlen UID: %u\n"
@@ -1238,11 +1199,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "ismeretlen GID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Régi jelszó: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "túl sok csoport\n"
 
@@ -1254,7 +1210,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: %s csoport nem létezik\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: nem tudom zárolni a /etc/passwd fájlt.\n"
 
@@ -1267,6 +1233,10 @@
 msgstr "%s: fájlok megnyitása sikertelen\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: hiba a fájlok frissítésekor\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: %d. sor: érvénytelen sor\n"
 
@@ -1298,11 +1268,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: %d. sor: nem tudom frissíteni a bejegyzést\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: hiba a fájlok frissítésekor\n"
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1372,11 +1337,9 @@
 msgid "New password: "
 msgstr "Új jelszó: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Próbáld újra\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1384,7 +1347,6 @@
 "\n"
 "Figyelem: Gyenge jelszó! (add meg újra, ha tényleg ezt akarod).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Nem egyeznek; próbáld újra\n"
 
@@ -1422,11 +1384,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "%s jelszava változatlan.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Jelszó módosítva.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Jelszó lejárata beállítva.\n"
 
@@ -1434,11 +1394,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Használat: %s [-q] [-r] [-s] [jelszó [árnyék]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "Érvénytelen jelszófájl bejegyzés\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "dupla jelszó bejegyzés\n"
 
@@ -1470,11 +1428,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: nem tudom frissíteni %s jelszó bejegyzését\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "érvénytelen árnyék jelszófájl bejegyzés\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "dupla árnyék jelszó bejegyzés\n"
 
@@ -1510,15 +1466,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: nem tudom törülni az árnyék jelszófájlt\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "A su-zás e hozzáféréshez ELUTASÍTVA.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Jelszó hitelesítés átlépve.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Add meg SAJÁT jelszavad a hitelesítéshez.\n"
 
@@ -1527,7 +1480,6 @@
 msgstr "%s: %s\n"
 
 # CHECK!
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1581,15 +1533,15 @@
 "%s: %s\n"
 "(Átlépve)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Nincs héj\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Nincs jelszófájl\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Nincs 'root' jelszó bejegyzés\n"
 
@@ -1633,7 +1585,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: túl sok csoport van megadva (max %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1654,6 +1606,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1706,14 +1660,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: nem kérhető le egyedi felhasználói azonosító\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: nem szerezhető be egyedi csoportazonosító\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: érvénytelen alapkönyvtár: \"%s\"\n"
@@ -1805,7 +1759,6 @@
 msgid "Creating mailbox file"
 msgstr "Postafiókfájl létrehozása"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1827,6 +1780,10 @@
 "használd a -g-t.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u nem egyedi\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1839,7 +1796,6 @@
 msgstr ""
 "%s: figyelem: a CREATE_HOME nem támogatott, használd a -m-et helyette.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1919,7 +1875,7 @@
 msgstr "%s: hiba %s könyvtár törlésekor\n"
 
 # FIXME
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2046,6 +2002,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2085,6 +2047,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s: %s név nem egyedi\n"
+
+#~ msgid "No\n"
+#~ msgstr "Nem\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/id.po
===================================================================
--- upstream/trunk/po/id.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/id.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-25 20:58+0100\n"
 "Last-Translator: Parlin Imanuel Toh <parlin_i at yahoo.com>\n"
 "Language-Team: Debian Indonesia <debid at yahoogroups.com>\n"
@@ -23,7 +23,6 @@
 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"
 
@@ -36,19 +35,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Peringatan: grup tidak dikenal %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Peringatan: terlalu banyak grup\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Kata sandi anda telah kadaluarsa."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Kata sandi anda tidak aktif."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Login anda telah kadaluarsa."
 
@@ -62,11 +57,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Kata sandi anda akan kadaluarsa dalam %ld hari.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Kata sandi anda akan kadaluarsa besok.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Kata sandi anda akan kadaluarsa hari ini.\n"
 
@@ -74,7 +67,6 @@
 msgid "Unable to change tty %s"
 msgstr "Tidak dapat mengubah tts %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Lingkungan overflow\n"
 
@@ -93,7 +85,6 @@
 "%d sejak login terakhir.\n"
 "Terakhir %s pada %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Terlalu banyak login.\n"
 
@@ -189,7 +180,6 @@
 msgid "%s's Password: "
 msgstr "Kata sandi dari %s:"
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -227,7 +217,6 @@
 "                                WARN_DAYS\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Masukkan nilai baru atau tekan ENTER untuk nilai bawaan\n"
 
@@ -249,27 +238,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Waktu Kadaluarsa Akun (TTTT-MM-HH)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Penggantian kata sandi terakhir\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "tak pernah\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "password mesti diubah\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Kata sandi kadaluarsa\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Kata sandi tak aktif\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Akun kadaluarsa\t\t\t\t\t\t: "
 
@@ -298,18 +281,14 @@
 msgstr "%s: Otentikasi PAM gagal\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: tidak dapat mengunci berkas kata sandi\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: tidak dapat membuka berkas kata sandi\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: pengguna %s tak dikenal\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: tak terdapat berkas kata sandi bayangan\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: tidak dapat mengunci berkas kata sandi bayangan\n"
 
@@ -318,18 +297,14 @@
 msgstr "%s: tidak dapat membuka berkas kata sandi bayangan\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: gagal membuang hak (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: tidak dapat menulis kembali berkas kata sandi bayangan\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Mengubah informasi umur akun untuk %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: tidak dapat menulis kembali berkas kata sandi\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: kesalahan saat mengubah ruas-ruas isian\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: tidak dapat memperbaharui berkas kata sandi\n"
 
@@ -338,14 +313,26 @@
 msgstr "%s: tidak dapat memperbaharui berkas kata sandi bayangan\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: tidak dapat menulis kembali berkas kata sandi bayangan\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: tak terdapat berkas kata sandi bayangan\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: tidak dapat menulis kembali berkas kata sandi\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: gagal membuang hak (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: pengguna %s tak dikenal\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Mengubah informasi umur akun untuk %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: kesalahan saat mengubah ruas-ruas isian\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -389,22 +376,28 @@
 msgid "Other"
 msgstr "Lain-lain"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Tidak dapat menentukan nama pengguna anda.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Tidak dapat mengubah ID menjadi root.\n"
 
-#, fuzzy, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: tidak dapat mengubah pengguna '%s' pada klien NIS.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "Tidak dapat mengunci berkas kata sandi; coba lagi nanti.\n"
 
-#, fuzzy, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: `%s' merupakan master NIS untuk klien ini.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Tidak dapat membuka berkas kata sandi.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Mengubah informasi pengguna dari %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s tidak ditemukan pada /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Kesalahan saat memperbaharui entri kata sandi.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Tidak dapat menyimpan perubahan berkas kata sandi.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Tidak dapat membuka kunci berkas kata sandi.\n"
+
 #, fuzzy, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: nama tidak sah: \"%s\"\n"
@@ -426,37 +419,25 @@
 msgstr "%s: \"%s\" berisi karakter-karakter ilegal\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: ruas terlalu panjang\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Tidak dapat menentukan nama pengguna anda.\n"
 
-#, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Tidak dapat mengubah ID menjadi root.\n"
+#, fuzzy, c-format
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: tidak dapat mengubah pengguna '%s' pada klien NIS.\n"
 
-#, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Tidak dapat mengunci berkas kata sandi; coba lagi nanti.\n"
+#, fuzzy, c-format
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: `%s' merupakan master NIS untuk klien ini.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Tidak dapat membuka berkas kata sandi.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Mengubah informasi pengguna dari %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s tidak ditemukan pada /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s: ruas terlalu panjang\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Kesalahan saat memperbaharui entri kata sandi.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Tidak dapat menyimpan perubahan berkas kata sandi.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Tidak dapat membuka kunci berkas kata sandi.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -514,6 +495,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: tidak dapat membuka berkas kata sandi bayangan\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: kesalahan saat memperbaharui berkas kata sandi bayangan\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: errot memperbaharui entri grup\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: baris %d: baris terlalu panjang\n"
@@ -526,15 +515,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: baris %d: grup %s tak dikenal\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: baris %d: tidak dapat memperbaharui entri kata sandi\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: baris %d: tak dapat memperbaharui entri\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: kesalahan terdeteksi, perubahan diabaikan\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: tidak dapat mengunci berkas kata sandi bayangan\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: kesalahan saat memperbaharui berkas kata sandi bayangan\n"
 
@@ -543,18 +536,13 @@
 msgstr "%s: kesalahan saat memperbaharui berkas kata sandi\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: tidak dapat mengunci berkas kata sandi\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: tidak dapat mengunci berkas kata sandi bayangan\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: baris %d: pengguna %s tak dikenal\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: baris %d: tidak dapat memperbaharui entri kata sandi\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -583,7 +571,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s merupakan shell yang tidak sah.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Penggunaan: expiry {-f|-c}\n"
 
@@ -591,7 +578,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: pengguna tak dikenal\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -629,7 +615,6 @@
 "                                untuk pengguna dengan nama NAMA\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Gagal    Maks.   Terakhir                 Pada\n"
 
@@ -670,14 +655,38 @@
 msgstr "%s: kata sandi bayangan grup diperlukan untuk -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Anda siapa?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: tidak mendapatkan kunci\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: tidak dapat menuliskan kembali berkas\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: tidak dapat menuliskan kembali berkas bayangan\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: tidak dapat membuka kunci berkas\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: tidak dapat memperbaharui entri\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: tidak dapat memperbaharui entri bayangan\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "grup tak dikenal: %s\n"
 
@@ -690,22 +699,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Mengeluarkan pengguna %s dari grup %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: anggota tak dikenal %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: Bukan sebuah tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Mengubah kata sandi untuk grup %s\n"
 
@@ -722,35 +715,26 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Coba lagi nanti\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: tidak mendapatkan kunci\n"
+msgid "Who are you?\n"
+msgstr "Anda siapa?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: tidak mendapatkan kunci untuk berkas bayangan\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Menambahkan pengguna %s ke grup %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: tidak dapat memperbaharui entri\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Mengeluarkan pengguna %s dari grup %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: tidak dapat memperbaharui entri bayangan\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: anggota tak dikenal %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: tidak dapat menuliskan kembali berkas\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: Bukan sebuah tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: tidak dapat menuliskan kembali berkas bayangan\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: tidak dapat membuka kunci berkas\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -781,14 +765,6 @@
 msgstr "%s: kesalahan saat menambahkan entri grup yang baru\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: nama %s tidak unik\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u tidak unik\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: tak mampu mendapatkan GID yang unik\n"
 
@@ -829,6 +805,9 @@
 msgstr "%s: grup %s telah ada\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u tidak unik\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Penggunaan: groupdel grup\n"
 
@@ -856,47 +835,41 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s merupakan master NIS\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr ""
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr ""
 
-#, c-format
 msgid "Group access is required\n"
 msgstr ""
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "PAM authentication failed for\n"
 msgstr "%s: Otentikasi PAM gagal\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to lock group file\n"
 msgstr "%s: tidak dapat mengunci berkas grup\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to open group file\n"
 msgstr "%s: tidak dapat membuka berkas grup\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Cannot close group file\n"
 msgstr "%s: tak dapat membuka berkas grup\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -906,6 +879,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Usage: groupadd [pilihan-pilihan] namagroup\n"
@@ -941,10 +915,6 @@
 msgstr "Penggunaan: %s [-r] [-s] [grup]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Tidak\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s dan -r tidak kompatible\n"
 
@@ -957,6 +927,9 @@
 msgstr "%s: tidak dapat membuka berkas %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: tidak dapat memperbaharui berkas %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "entri berkas grup tidak sah\n"
 
@@ -964,7 +937,6 @@
 msgid "delete line '%s'? "
 msgstr "hapus baris `%s'? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "entri grup berulang\n"
 
@@ -996,11 +968,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: tidak dapat memperbaharui entri untuk grup %s\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "entri berkas grup bayangan tidak sah\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "entri grup bayangan berulang\n"
 
@@ -1017,10 +987,6 @@
 msgstr "grup bayangan %s: tak ada pengguna %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: tidak dapat memperbaharui berkas %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: berkas-berkas telah diperbaharui\n"
 
@@ -1052,19 +1018,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: tidak dapat menghapus berkas grup bayangan\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Penggunaan: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Penggunaan: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " grup="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1087,17 +1049,19 @@
 "NAMA\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Nama pengguna    Port     Dari             Terakhir\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Nama pengguna           Port     Terakhir\n"
 
 msgid "**Never logged in**"
 msgstr "**Tak pernah log in**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Pengguna tak dikenal: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: argumen tak terduga: %s\n"
@@ -1114,11 +1078,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "            %s [-p] -r host\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Waktu login tidak sah\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1126,7 +1088,6 @@
 "\n"
 "Sistem ditutup untuk pengelolaan rutin\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1166,7 +1127,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Jumlah pengulangan maksimum terlampaui (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: penghentian diminta oleh PAM\n"
 
@@ -1185,6 +1145,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: gagal membuat proses: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Perhatian: login dibolehkan setelah penguncian sementara.\n"
 
@@ -1207,14 +1171,16 @@
 "waktu login telah berlebihan\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Penggunaan: newgrp [-] [grup]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Penggunaan: sg grup [[-c] perintah]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Kata sandi lama: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "UID tak dikenal: %u\n"
@@ -1223,11 +1189,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "GID tidak dikenal: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Kata sandi lama: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "terlalu banyak grup\n"
 
@@ -1239,7 +1200,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: grup %s tidak ada\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: tidak dapat mengunci /etc/passwd.\n"
 
@@ -1252,6 +1223,10 @@
 msgstr "%s: tidak dapat membuka berkas-berkas\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: kesalahan saat memperbaharui berkas-berkas\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: baris %d: baris tidak sah\n"
 
@@ -1283,11 +1258,7 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: baris %d: tak dapat memperbaharui entri\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: kesalahan saat memperbaharui berkas-berkas\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1361,11 +1332,9 @@
 msgid "New password: "
 msgstr "kata sandi baru: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Coba lagi.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1373,7 +1342,6 @@
 "\n"
 "Kata sandi lemah (masukkan lagi untuk tetap menggunakannya).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Kata sandi tidak sama; coba lagi.\n"
 
@@ -1411,11 +1379,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Kata sandi untuk %s tidak diubah.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Password telah diubah.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Kata sandi dibuat kadaluarsa.\n"
 
@@ -1423,11 +1389,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Penggunaan: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "entri kata sandi tak sah\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "entri kata sandi berduplikat\n"
 
@@ -1459,11 +1423,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: tak dapat menghapus entri passwd untuk %s\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "entri kata sandi bayangan tak sah\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "entri kata sandi bayangan terduplikasi\n"
 
@@ -1499,15 +1461,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: tak dapat menghapus berkas kata sandi bayangan\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Akses su untuk account itu DITOLAK.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Otentikasi kata sandi diabaikan.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Silakan masukkan kata sandi anda SENDIRI sebagai otentikasi.\n"
 
@@ -1515,7 +1474,7 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1570,15 +1529,15 @@
 "%s: %s\n"
 "(Diabaikan)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Tak ada shell\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Tak ada berkas kata sandi\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Tak ada entri kata sandi untuk 'root'\n"
 
@@ -1622,7 +1581,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: grup yang diberikan terlalu banyak (maks %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1643,6 +1602,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1689,15 +1650,15 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: tidak bisa mendapatkan UID yang unik\n"
 
 #, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: tak mampu mendapatkan GID yang unik\n"
+
+#, fuzzy, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: direktori awal `%s' tak sah\n"
 
@@ -1788,7 +1749,6 @@
 msgid "Creating mailbox file"
 msgstr ""
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1807,6 +1767,10 @@
 "%s: grup %s telah ada - jika ingin menambah pengguna ke grup itu, pakai -g.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u tidak unik\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1818,7 +1782,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: perhatian: CREATE_HOME tak didukung, sebaiknya gunakan -m.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1888,7 +1851,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: kesalahan saat menghapus direktori %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2003,6 +1966,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2041,6 +2010,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s: nama %s tidak unik\n"
+
+#~ msgid "No\n"
+#~ msgstr "Tidak\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/it.po
===================================================================
--- upstream/trunk/po/it.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/it.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-25 21:01+0100\n"
 "Last-Translator: Danilo Piazzalunga <danilopiazza at gmail.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -43,7 +43,6 @@
 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"
 
@@ -57,19 +56,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Attenzione: gruppo «%s» sconosciuto\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Attenzione: troppi gruppi\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "La password in uso è scaduta."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "La password in uso è inattiva."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Il login in uso è scaduto."
 
@@ -83,11 +78,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "La password in uso scadrà tra %ld giorni.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "La password in uso scadrà domani.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "La password in uso scade oggi.\n"
 
@@ -95,7 +88,6 @@
 msgid "Unable to change tty %s"
 msgstr "Impossibile cambiare i permessi al device %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Dimensione dell'ambiente eccessiva\n"
 
@@ -118,7 +110,6 @@
 "L'ultimo è stato %s su %s.\n"
 
 # NdT: Riferito al numero massimo di accessi concorrenti per un utente.
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Troppi accessi.\n"
 
@@ -213,7 +204,6 @@
 msgid "%s's Password: "
 msgstr "Password di %s: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -250,7 +240,6 @@
 "                                prima della scadenza della password\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Inserire il nuovo valore o premere INVIO per quello predefinito\n"
 
@@ -272,27 +261,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Data di scadenza dell'account (AAAA-MM-GG)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Ultimo cambio della password\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "mai\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "la password deve essere cambiata\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Scadenza della password\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Inattività della password\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Scadenza dell'account\t\t\t\t\t: "
 
@@ -321,18 +304,14 @@
 msgstr "%s: autenticazione PAM non riuscita\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: impossibile fare il lock del file delle password\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: impossibile aprire il file delle password\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: utente «%s» sconosciuto\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: manca il file delle shadow password\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: impossibile fare il lock del file delle shadow password\n"
 
@@ -341,18 +320,14 @@
 msgstr "%s: impossibile aprire il file delle shadow password\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: impossibile abbandonare i privilegi (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: impossibile riscrivere il file delle shadow password\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Modifica delle informazioni sulla durata dell'account di %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: impossibile riscrivere il file delle password\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: errore nel cambiare i campi\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: impossibile aggiornare il file delle password\n"
 
@@ -361,13 +336,25 @@
 msgstr "%s: impossibile aggiornare il file delle shadow password\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: impossibile riscrivere il file delle shadow password\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: manca il file delle shadow password\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: impossibile riscrivere il file delle password\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: impossibile abbandonare i privilegi (%s)\n"
 
+#, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: utente «%s» sconosciuto\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Modifica delle informazioni sulla durata dell'account di %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: errore nel cambiare i campi\n"
+
 # NdT: L'output è allineato se "%s" == "chfn".
 #, c-format
 msgid ""
@@ -413,22 +400,29 @@
 msgid "Other"
 msgstr "Altro"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: impossibile determinare il proprio nome utente.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Impossibile cambiare ID a root.\n"
 
-#, fuzzy, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: impossibile modificare l'utente «%s» sul client NIS.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr ""
+"Impossibile fare il lock del file delle password; riprovare più tardi.\n"
 
-#, fuzzy, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: «%s» è il NIS master per questo client.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Impossibile aprire il file delle password.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Modifica delle informazioni relative all'utente %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: impossibile trovare «%s» in /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Errore nell'aggiornare la voce nel file delle password.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Impossibile effettuare le modifiche al file delle password.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Impossibile togliere il lock dal file delle password.\n"
+
 #, fuzzy, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: nome «%s» non valido\n"
@@ -450,38 +444,25 @@
 msgstr "%s: «%s» contiene caratteri non ammessi\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: lunghezza dei campi eccessiva\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: impossibile determinare il proprio nome utente.\n"
 
-#, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Impossibile cambiare ID a root.\n"
+#, fuzzy, c-format
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: impossibile modificare l'utente «%s» sul client NIS.\n"
 
-#, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr ""
-"Impossibile fare il lock del file delle password; riprovare più tardi.\n"
+#, fuzzy, c-format
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: «%s» è il NIS master per questo client.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Impossibile aprire il file delle password.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Modifica delle informazioni relative all'utente %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: impossibile trovare «%s» in /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s: lunghezza dei campi eccessiva\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Errore nell'aggiornare la voce nel file delle password.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Impossibile effettuare le modifiche al file delle password.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Impossibile togliere il lock dal file delle password.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -539,6 +520,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: impossibile aprire il file shadow\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: errore nell'aggiornare il file shadow\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: errore nell'aggiornare la voce nel file dei gruppi\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: riga %d: riga troppo lunga\n"
@@ -551,15 +540,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: riga %d: gruppo «%s» sconosciuto\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: riga %d: impossibile aggiornare la voce nel file delle password\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: riga %d: impossibile aggiornare la voce\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: rilevato un errore; le modifiche vengono ignorate\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: impossibile fare il lock del file shadow\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: errore nell'aggiornare il file shadow\n"
 
@@ -568,18 +561,13 @@
 msgstr "%s: errore nell'aggiornare il file delle password\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: impossibile fare il lock del file delle password\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: impossibile fare il lock del file shadow\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: riga %d: utente «%s» sconosciuto\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: riga %d: impossibile aggiornare la voce nel file delle password\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -608,7 +596,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s non è una shell valida.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Uso: expiry {-f|-c}\n"
 
@@ -616,7 +603,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: utente sconosciuto\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -656,7 +642,6 @@
 
 # NdT: Vedere faillog(5) per il significato dei campi. Il campo "On"
 # è il device tty su cui è avvenuto l'ultimo accesso fallito.
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Errori   Massimo Ultimo accesso           Su\n"
 
@@ -699,14 +684,38 @@
 msgstr "%s: l'opzione -A richiede le shadow password per i gruppi\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Chi sei?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: impossibile fare il lock\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: impossibile riscrivere il file\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: impossibile riscrivere il file shadow\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: impossibile togliere il lock dal file\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: impossibile aggiornare la voce\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: impossibile aggiornare la voce nel file shadow\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "gruppo «%s» sconosciuto\n"
 
@@ -719,22 +728,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Rimozione dell'utente %s dal gruppo %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: membro «%s» sconosciuto\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: non è un terminale\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Cambio della password del gruppo %s\n"
 
@@ -751,35 +744,26 @@
 msgid "%s: Try again later\n"
 msgstr "%s: riprovare più tardi\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: impossibile fare il lock\n"
+msgid "Who are you?\n"
+msgstr "Chi sei?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: impossibile fare il lock del file shadow\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Aggiunta dell'utente %s al gruppo %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: impossibile aggiornare la voce\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Rimozione dell'utente %s dal gruppo %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: impossibile aggiornare la voce nel file shadow\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: membro «%s» sconosciuto\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: impossibile riscrivere il file\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: non è un terminale\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: impossibile riscrivere il file shadow\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: impossibile togliere il lock dal file\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -811,14 +795,6 @@
 msgstr "%s: errore nell'aggiungere la nuova voce al file dei gruppi\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: il nome «%s» non è univoco\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u non univoco\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: impossibile ottenere un GID univoco\n"
 
@@ -859,6 +835,9 @@
 msgstr "%s: gruppo «%s» già esistente\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u non univoco\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Uso: groupdel GRUPPO\n"
 
@@ -886,47 +865,41 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s è il NIS master\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr ""
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr ""
 
-#, c-format
 msgid "Group access is required\n"
 msgstr ""
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "PAM authentication failed for\n"
 msgstr "%s: autenticazione PAM non riuscita\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to lock group file\n"
 msgstr "%s: impossibile fare il lock del file dei gruppi\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to open group file\n"
 msgstr "%s: impossibile aprire il file dei gruppi\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Cannot close group file\n"
 msgstr "%s: impossibile aprire il file dei gruppi\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -936,6 +909,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Uso: groupadd [OPZIONI] GRUPPO\n"
@@ -972,10 +946,6 @@
 msgstr "Uso: %s [-r] [-s] [GRUPPO]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "No\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s e -r sono incompatibili\n"
 
@@ -988,6 +958,9 @@
 msgstr "%s: impossibile aprire il file %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: impossibile aggiornare il file %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "voce non valida nel file dei gruppi\n"
 
@@ -995,7 +968,6 @@
 msgid "delete line '%s'? "
 msgstr "eliminare la riga «%s»? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "voce duplicata nel file dei gruppi\n"
 
@@ -1027,11 +999,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: impossibile aggiornare la voce del gruppo %s\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "voce non valida nel file dei gruppi shadow\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "voce duplicata nel file dei gruppi shadow\n"
 
@@ -1048,10 +1018,6 @@
 msgstr "gruppo shadow %s: nessun utente %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: impossibile aggiornare il file %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: i file sono stati aggiornati\n"
 
@@ -1083,19 +1049,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: impossibile eliminare il file dei gruppi shadow\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Uso: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Uso: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " gruppi="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1119,17 +1081,19 @@
 "                                l'utente specificato da LOGIN\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Nome utente      Porta    Da               Ultimo accesso\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Nome utente             Porta    Ultimo accesso\n"
 
 msgid "**Never logged in**"
 msgstr "**Nessun accesso effettuato**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Utente «%s» sconosciuto\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: argomento «%s» non previsto\n"
@@ -1147,11 +1111,9 @@
 msgstr "     %s [-p] -r HOST\n"
 
 # NdT: Non è l'ora giusta per accedere da questo tty (con questo utente).
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Orario di accesso non permesso\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1159,7 +1121,6 @@
 "\n"
 "Sistema chiuso per lavori di ordinaria manutenzione\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1199,7 +1160,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Superato il numero massimo di tentativi (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: PAM ha richiesto l'uscita immediata\n"
 
@@ -1218,6 +1178,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: impossibile eseguire fork(): %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 "Attenzione: accesso nuovamente abilitato dopo una proibizione temporanea.\n"
@@ -1241,14 +1205,16 @@
 "orario di accesso terminato\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Uso: newgrp [-] [GRUPPO]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Uso: sg GRUPPO [[-c] COMANDO]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Vecchia password: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "UID %u sconosciuto\n"
@@ -1257,11 +1223,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "GID %lu sconosciuto\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Vecchia password: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "troppi gruppi\n"
 
@@ -1273,7 +1234,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: gruppo «%s» inesistente\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: impossibile fare il lock di /etc/passwd.\n"
 
@@ -1286,6 +1257,10 @@
 msgstr "%s: impossibile aprire i file\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: errore nell'aggiornare i file\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: riga %d: riga non valida\n"
 
@@ -1317,11 +1292,7 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: riga %d: impossibile aggiornare la voce\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: errore nell'aggiornare i file\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1396,11 +1367,9 @@
 msgid "New password: "
 msgstr "Nuova password: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Provare di nuovo.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1409,7 +1378,6 @@
 "Attenzione: password troppo debole (inserirla di nuovo per usarla "
 "comunque).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Non corrispondono; provare di nuovo.\n"
 
@@ -1448,11 +1416,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "La password di %s non è cambiata.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Password cambiata.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Password segnata come scaduta.\n"
 
@@ -1460,11 +1426,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Uso: %s [-q] [-r] [-s] [PASSWD [SHADOW]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "voce non valida nel file delle password\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "voce duplicata nel file delle password\n"
 
@@ -1496,11 +1460,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: impossibile aggiornare la voce relativa a %s nel file passwd\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "voce non valida nel file delle shadow password\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "voce duplicata nel file delle shadow password\n"
 
@@ -1536,15 +1498,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: impossibile eliminare il file delle shadow password\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "L'accesso all'account tramite «su» è NEGATO.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Evitata l'autenticazione tramite password.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Inserire la PROPRIA password per autenticarsi.\n"
 
@@ -1552,7 +1511,7 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1606,15 +1565,15 @@
 "%s: %s\n"
 "(Ignorato)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Nessuna shell\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Manca il file delle password\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Manca una voce per «root» nel file delle password\n"
 
@@ -1658,7 +1617,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: troppi gruppi specificati (max %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1679,6 +1638,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1727,15 +1688,15 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: impossibile ottenere un UID univoco\n"
 
 #, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: impossibile ottenere un GID univoco\n"
+
+#, fuzzy, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: directory di base «%s» non valida\n"
 
@@ -1827,7 +1788,6 @@
 msgid "Creating mailbox file"
 msgstr ""
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1847,6 +1807,10 @@
 "gruppo.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u non univoco\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1858,7 +1822,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: attenzione: CREATE_HOME non è supportata; usare -m.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1930,7 +1893,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: errore nel rimuovere la directory %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2047,6 +2010,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2086,6 +2055,12 @@
 msgstr ""
 "%s: impossibile ripristinare %s: %s (le modifiche effettuate sono in %s)\n"
 
+#~ msgid "%s: name %s is not unique\n"
+#~ msgstr "%s: il nome «%s» non è univoco\n"
+
+#~ msgid "No\n"
+#~ msgstr "No\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/ja.po
===================================================================
--- upstream/trunk/po/ja.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/ja.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-25 21:03+0100\n"
 "Last-Translator: NAKANO Takeo <nakano at webmasters.gr.jp>\n"
 "Language-Team: Japanese\n"
@@ -25,7 +25,6 @@
 msgid "crypt method not supported by libcrypt? (%s)\n"
 msgstr ""
 
-#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "設定情報用の空き容量が確保できませんでした。\n"
 
@@ -37,19 +36,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "警告: 不明なグループ %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "警告: グループが多すぎます\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "あなたのパスワードは期限が切れています。"
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "あなたのパスワードは現在使えません。"
 
-#, c-format
 msgid "Your login has expired."
 msgstr "あなたのアカウントは期限が切れました。"
 
@@ -63,11 +58,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "あなたのパスワードはあと %ld 日で期限が切れます。\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "あなたのパスワードは明日で期限が切れます。\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "あなたのパスワードは本日で期限が切れます。\n"
 
@@ -75,7 +68,6 @@
 msgid "Unable to change tty %s"
 msgstr "端末 %s に変更できません"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "環境変数領域のオーバーフロー\n"
 
@@ -94,7 +86,6 @@
 "最後のログインから %d 回失敗。\n"
 "最後のログインは %s (マシン %s)。\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "ログイン試行数が制限を越えました。\n"
 
@@ -191,7 +182,6 @@
 msgid "%s's Password: "
 msgstr "%s のパスワード: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -225,7 +215,6 @@
 "  -W, --warndays WARN_DAYS      期限切れ警告の日数を WARN_DAYS にする\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 "新しい値を入力してください。標準設定値を使うならリターンを押してください\n"
@@ -248,27 +237,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "アカウント期限切れ日付 (YYYY-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "最終パスワード変更日\t\t\t\t:"
 
-#, c-format
 msgid "never\n"
 msgstr "なし\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "パスワードは変更しなければなりません\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "パスワード期限:\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "パスワード無効化中\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "アカウント期限切れ\t\t\t\t\t\t: "
 
@@ -297,18 +280,14 @@
 msgstr "%s: PAM 認証に失敗しました\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: パスワードファイルをロックできません\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: パスワードファイルが開けません\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: ユーザ %s は不明です\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: シャドウパスワードファイルがありません\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: シャドウパスワードファイルをロックできません\n"
 
@@ -317,18 +296,14 @@
 msgstr "%s: シャドウパスワードファイルを開けません\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: 特権を落とせませんでした (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: シャドウパスワードファイルを書換えできません\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "%s の期限情報を変更中\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: パスワードファイルを書換えできません\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: フィールド変更の際にエラーが起きました\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: パスワードファイルを更新できません\n"
 
@@ -337,14 +312,26 @@
 msgstr "%s: シャドウパスワードファイルを更新できません\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: シャドウパスワードファイルを書換えできません\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: シャドウパスワードファイルがありません\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: パスワードファイルを書換えできません\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: 特権を落とせませんでした (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: ユーザ %s は不明です\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "%s の期限情報を変更中\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: フィールド変更の際にエラーが起きました\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -387,22 +374,28 @@
 msgid "Other"
 msgstr "その他"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: あなたのユーザ名を判定できません。\n"
+msgid "Cannot change ID to root.\n"
+msgstr "ID を root へ変更できません。\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: NIS クライアントではユーザ '%s' を変更できません。\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "パスワードファイルをロックできません; 後でもう一度試してください。\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: '%s' がこのクライアントの NIS マスターです。\n"
+msgid "Cannot open the password file.\n"
+msgstr "パスワードファイルを開けません。\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "%s のユーザ情報を変更中\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s が /etc/passwd 中に見付かりません\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "パスワードエントリの更新がエラーになりました。\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "パスワードファイルの変更を書き込めません。\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "パスワードファイルのロックを解除できません。\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: ユーザ名が不正です: '%s'\n"
@@ -424,37 +417,25 @@
 msgstr "%s: '%s' には利用できない文字が含まれています\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: 入力内容が長過ぎます\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: あなたのユーザ名を判定できません。\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "ID を root へ変更できません。\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: NIS クライアントではユーザ '%s' を変更できません。\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "パスワードファイルをロックできません; 後でもう一度試してください。\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: '%s' がこのクライアントの NIS マスターです。\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "パスワードファイルを開けません。\n"
+msgid "Changing the user information for %s\n"
+msgstr "%s のユーザ情報を変更中\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s が /etc/passwd 中に見付かりません\n"
+msgid "%s: fields too long\n"
+msgstr "%s: 入力内容が長過ぎます\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "パスワードエントリの更新がエラーになりました。\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "パスワードファイルの変更を書き込めません。\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "パスワードファイルのロックを解除できません。\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -513,6 +494,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: shadow ファイルを開けません\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: シャドウファイル更新の際にエラーが起きました\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: グループエントリ更新の際にエラーが起きました\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: %d 行: 行が長過ぎます\n"
@@ -525,15 +514,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: %d 行: グループ %s は不明です\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: %d 行: パスワードエントリを更新できません\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: %d 行: エントリを更新できません\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: エラーが検出されました。変更は行いません\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: シャドウファイルをロックできません\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: シャドウファイル更新の際にエラーが起きました\n"
 
@@ -542,18 +535,13 @@
 msgstr "%s: パスワードファイル更新の際にエラーが起きました\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: パスワードファイルをロックできません\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: シャドウファイルをロックできません\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: %d 行: ユーザ %s は不明です\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: %d 行: パスワードエントリを更新できません\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -588,7 +576,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s は不正なシェルです。\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "使用法: expiry {-f|-c}\n"
 
@@ -596,7 +583,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: 不明なユーザです\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -630,7 +616,6 @@
 "                                このユーザの失敗カウンタを操作する\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "ログイン名  失敗     最大    最新                     場所\n"
 
@@ -671,14 +656,38 @@
 msgstr "%s: -A にはシャドウグループパスワードが必要です\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "あなたは誰?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: ロックできません\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+msgstr "%s: シャドウをロックできません\n"
+
+#, c-format
 msgid "%s: can't open file\n"
 msgstr "%s: ファイルを開けません\n"
 
 #, c-format
+msgid "%s: can't re-write file\n"
+msgstr "%s: ファイルを書換えできません\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: シャドウファイルを書換えできません\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: ファイルのロックを解除できません\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: エントリを更新できません\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: シャドウエントリを更新できません\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "不明なグループです: %s\n"
 
@@ -691,22 +700,6 @@
 msgstr "%s: shadow ファイルを開けません\n"
 
 #, c-format
-msgid "Adding user %s to group %s\n"
-msgstr "ユーザ %s をグループ %s に追加\n"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "ユーザ %s をグループ %s から削除\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: メンバー %s は不明です\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: 端末ではありません\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "グループ %s のパスワードを変更中\n"
 
@@ -723,35 +716,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s: 後でもう一度お願いします\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: ロックできません\n"
+msgid "Who are you?\n"
+msgstr "あなたは誰?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: シャドウをロックできません\n"
+msgid "Adding user %s to group %s\n"
+msgstr "ユーザ %s をグループ %s に追加\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: エントリを更新できません\n"
+msgid "Removing user %s from group %s\n"
+msgstr "ユーザ %s をグループ %s から削除\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: シャドウエントリを更新できません\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: メンバー %s は不明です\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: ファイルを書換えできません\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: 端末ではありません\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: シャドウファイルを書換えできません\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: ファイルのロックを解除できません\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -784,14 +767,6 @@
 msgstr "%s: 新規グループエントリ追加の際にエラーが起きました\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: 名前 %s は重複しています\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: グループ ID %u が重複しています\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: 他と重ならないグループ ID を取得できません\n"
 
@@ -832,6 +807,9 @@
 msgstr "%s: グループ %s は既に存在します\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: グループ ID %u が重複しています\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "使用法: groupdel グループ\n"
 
@@ -859,48 +837,38 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s が NIS マスターです\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "メンバーは既に存在します\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "削除すべきメンバーが見付かりません\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 "使用法: groupmems -a ユーザ名 | -d ユーザ名 | -D | -l [-g グループ名]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "メンバーを別のグループに追加できるのは root だけです\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "グループアクセス権が必要です\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "現グループのプライマリな所有者ではありません\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "PAM 認証に失敗しました\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "グループファイルをロックできません\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "グループファイルを開けません\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "グループファイルをクローズできません\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -910,6 +878,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "使い方: groupmod [オプション] グループ名\n"
@@ -944,10 +913,6 @@
 msgstr "使用法: %s [-r] [-s] [group]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "No\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s と -r は同時に指定できません\n"
 
@@ -960,6 +925,9 @@
 msgstr "%s: ファイル %s を開けません\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: ファイル %s を更新できません\n"
+
 msgid "invalid group file entry\n"
 msgstr "不正なグループファイルエントリです\n"
 
@@ -967,7 +935,6 @@
 msgid "delete line '%s'? "
 msgstr "行 '%s' を削除しますか? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "グループエントリが重複しています\n"
 
@@ -999,11 +966,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: グループ %s のエントリを更新できません\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "シャドウグループファイルのエントリが正しくありません\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "シャドウグループエントリが重複しています\n"
 
@@ -1020,10 +985,6 @@
 msgstr "シャドウグループ %s: ユーザ %s は存在しません\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: ファイル %s を更新できません\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: ファイルは更新されました\n"
 
@@ -1055,19 +1016,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: シャドウグループファイルを削除できません\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "使用法: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "使用法: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " グループ="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1089,17 +1046,19 @@
 "  -u, --user LOGIN              指定ユーザ LOGIN の lastlog 記録を表示する\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "ユーザ名         ポート   場所             最近のログイン\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "ユーザ名                ポート   最近のログイン\n"
 
 msgid "**Never logged in**"
 msgstr "**一度もログインしていません**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "不明なユーザです: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: この引き数は不正です: %s\n"
@@ -1116,11 +1075,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r ホスト\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "ログイン時間が不正です\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1128,7 +1085,6 @@
 "\n"
 "システムは定期メンテナンスのため利用できません\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1168,7 +1124,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "最大試行回数 (%d) を越えました\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: PAM から中断要請がありました\n"
 
@@ -1187,6 +1142,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: fork に失敗しました: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 "警告: 一時的にロックアウトします。しばらく経ってからやり直してください。\n"
@@ -1210,14 +1169,16 @@
 "ログイン時間切れ\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "使用法: newgrp [-] [グループ]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "使用法: sg グループ [[-c] コマンド]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "古いパスワード: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "不明なユーザ ID: %u\n"
@@ -1226,11 +1187,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "不明なグループ ID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "古いパスワード: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "グループが多すぎます\n"
 
@@ -1242,7 +1198,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: グループ %s は存在しません\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: /etc/passwd をロックできません。\n"
 
@@ -1255,6 +1221,10 @@
 msgstr "%s: ファイルを開けません\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: ファイル更新のエラーです\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: %d 行: 不正な行です\n"
 
@@ -1286,11 +1256,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: %d 行: エントリを更新できません\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: ファイル更新のエラーです\n"
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1360,11 +1325,9 @@
 msgid "New password: "
 msgstr "新しいパスワード: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "もう一度お願いします。\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1372,7 +1335,6 @@
 "\n"
 "警告: 弱いパスワードです (どうしてもこれを使いたければもう一度入力)。\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "一致しません。もう一度お願いします。\n"
 
@@ -1410,11 +1372,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "%s のパスワードは変更されません。\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "パスワードは変更されました。\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "パスワードは期限付きになりました。\n"
 
@@ -1422,11 +1382,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "使用法: %s [-q] [-r] [-s] [パスワード [シャドウ]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "パスワードファイルのエントリが不正です\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "パスワードエントリが重複しています\n"
 
@@ -1458,11 +1416,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: %s のパスワードエントリを更新できません\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "不正なシャドウパスワードのエントリです\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "シャドウパスワードエントリが重複しています\n"
 
@@ -1498,15 +1454,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: シャドウパスワードファイルを削除できません\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "このアカウントへの su アクセスは禁止されています。\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "パスワード認証を迂回します。\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "「あなた自身のパスワード」を入力して認証してください。\n"
 
@@ -1514,7 +1467,6 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1567,15 +1519,15 @@
 "%s: %s\n"
 "(無視)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "シェルがありません\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "パスワードファイルがありません\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "'root' のパスワードエントリがありません\n"
 
@@ -1619,7 +1571,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: 指定したグループ数が多すぎます (最大 %d 個)。\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1640,6 +1592,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1686,14 +1640,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: 他と重ならないユーザ ID を取得できません\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: 他と重ならないグループ ID を取得できません\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: ベースディレクトリ '%s' は不正です\n"
@@ -1785,7 +1739,6 @@
 msgid "Creating mailbox file"
 msgstr "メールボックスファイルを作成します"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1807,6 +1760,10 @@
 "いてください。\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: ユーザ ID %u は重複しています\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1819,7 +1776,6 @@
 msgstr ""
 "%s: 警告: CREATE_HOME はサポートされていません。-m を用いてください。\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1897,7 +1853,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: ディレクトリ %s の削除でエラーが起きました\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2014,6 +1970,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2053,6 +2015,12 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: %s を復旧できませんでした: %s (あなたの変更は %s にあります)\n"
 
+#~ msgid "%s: name %s is not unique\n"
+#~ msgstr "%s: 名前 %s は重複しています\n"
+
+#~ msgid "No\n"
+#~ msgstr "No\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/km.po
===================================================================
--- upstream/trunk/po/km.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/km.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+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"
@@ -30,7 +30,6 @@
 msgid "crypt method not supported by libcrypt? (%s)\n"
 msgstr ""
 
-#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "មិន​អាច​បម្រុង​ទុក​ទំហំ​សម្រាប់​ព័ត៌មាន​​កំណត់​រចនាសម្ព័ន្ធទេ​ ។\n"
 
@@ -42,19 +41,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "ការ​ព្រមាន ៖ មិន​ស្គាល់​ក្រុម %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "ការព្រមាន​ ៖ មាន​ច្រើន​ក្រុម​ពេក\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "ពាក្យ​សម្ងាត់​របស់​អ្នក​បាន​ផុត​កំណត់ហើយ​ ។"
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "ពាក្យ​សម្ងាត់​របស់​អ្នកអសកម្ម​ ។"
 
-#, c-format
 msgid "Your login has expired."
 msgstr "ការចូល​របស់អ្នក​បាន​ផុត​កំណត់ហើយ​ ។"
 
@@ -68,11 +63,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "ពាក្យ​សម្ងាត់​របស់​អ្នក​នឹង​ផុត​កំណត់ក្នុងពេល​ %ld ថ្ងៃ ។\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "ពាក្យ​សម្ងាត់​របស់​អ្នក​នឹងផុត​កំណត់នៅ​ថ្ងៃ​ស្អែក​ ។​\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "ពាក្យ​សម្ងាត់​របស់​អ្នក​នឹងផុត​កំណត់នៅ​ថ្ងៃ​នេះ ។\n"
 
@@ -80,7 +73,6 @@
 msgid "Unable to change tty %s"
 msgstr "មិន​អាច​ប្តូរ​ tty %s បានឡើយ"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "​លើស​ចំណុះ​បរិស្ថាន\n"
 
@@ -102,7 +94,6 @@
 "%d ចូល​ចុងក្រោយ​បានបរាជ័យ​ ។\n"
 "ចុងក្រោម​ %s  %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "ចូល​ច្រើន​ពេក​ ។\n"
 
@@ -197,7 +188,7 @@
 msgid "%s's Password: "
 msgstr "ពាក្យសម្ងាត់​របស់ %sសម្ងាត់ ៖ "
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -231,7 +222,6 @@
 "  -W, --ថ្ងៃព្រមាន WARN_DAYS\tកំណត់ការព្រមាន​ថ្ងៃ​ផុត​កំណត់​ទៅជា​ WARN_DAYS\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "បញ្ចូល​តម្លៃ​ថ្មី​ ឬ ​សង្កត់​ បញ្ចូល សម្រាប់​លំនាំដើម​\n"
 
@@ -253,27 +243,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "កាលបរិច្ឆេទ​ការផុត​កំណត់របស់​​គណនី​ (YYYY-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "ការប្តូរ​ពាក្យ​សម្ងាត់​លើកចុង​ក្រោយ​\t\t\t\t\t ៖ "
 
-#, c-format
 msgid "never\n"
 msgstr "កុំ\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "ពាក្យ​សម្ងាត់​ត្រូវ​តែ​ប្តូរ​\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "ពាក្យ​សម្ងាត់​ផុត​កំណត់​\t\t\t\t\t ៖ "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "ពាក្យ​សម្ងាត់ អសកម្ម \t\t\t\t\t ៖ "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "គណនី​ផុត​កំណត់​\t\t\t\t\t\t ៖ "
 
@@ -302,18 +286,14 @@
 msgstr "%s ៖ PAM ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវបាន​បរាជ័យ​\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s ៖ មិនអាច​ចាក់សោ​ឯកសារ​ពាក្យ​សម្ងាត់​បានទេ​\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s ៖ មិន​អាច​បើក​ឯកសារ​ពាក្យ​សម្ងាត់​\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s ៖ មិន​ស្គាល់​អ្នកប្រើ​ %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s ៖ គ្មាន​វត្តមាន​​ឯកសារ​ពាក្យ​សម្ងាត់ស្រមោលទេ​\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s ៖ មិនអាច​ចាក់សោ​​ឯកសារ​ពាក្យ​សម្ងាត់ស្រមោល​បានទេ\n"
 
@@ -322,18 +302,14 @@
 msgstr "%s ៖ មិន​អាច​បើក​ឯកសារពាក្យ​សម្ងាត់​ស្រមោលបានទេ\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s ៖ បរាជ័យ​ក្នុងការ​ទម្លាក់​សិទ្ធ (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s ៖ មិនអាច​សរសេរ​ឯកសារពាក្យសម្ងាត់ស្រមោល​ឡើងវិញ​បានទេ​\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "ការផ្លាស់​ប្តូរ​ព័ត៌មាន​ចាស់​សម្រាប់​ %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s ៖ មិនអាច​សរសេរ​ឯកសារពាក្យសម្ងាត់​ឡើងវិញបានទេ​\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s ៖ កំហុស​ការផ្លាស់ប្តូរ​វាល​\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s ៖ មិនអាច​ធ្វើឲ្យ​ឯកសារ​ពាក្យ​សម្ងាត់​ទាន់សម័យ​បានទេ\n"
 
@@ -342,14 +318,26 @@
 msgstr "%s ៖ មិនអាច​ធ្វើ​ឲ្យ​ឯកសារពាក្យសម្ងាត់​ស្រមោលទាន់សម័យបានទេ\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s ៖ មិនអាច​សរសេរ​ឯកសារពាក្យសម្ងាត់ស្រមោល​ឡើងវិញ​បានទេ​\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s ៖ គ្មាន​វត្តមាន​​ឯកសារ​ពាក្យ​សម្ងាត់ស្រមោលទេ​\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s ៖ មិនអាច​សរសេរ​ឯកសារពាក្យសម្ងាត់​ឡើងវិញបានទេ​\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s ៖ បរាជ័យ​ក្នុងការ​ទម្លាក់​សិទ្ធ (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s ៖ មិន​ស្គាល់​អ្នកប្រើ​ %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "ការផ្លាស់​ប្តូរ​ព័ត៌មាន​ចាស់​សម្រាប់​ %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s ៖ កំហុស​ការផ្លាស់ប្តូរ​វាល​\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -392,22 +380,28 @@
 msgid "Other"
 msgstr "ផ្សេងៗ"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s ៖ មិន​អាចកំណត់​ឈ្មោះ​អ្នកប្រើ​របស់​អ្នក​បាន​ទេ ។\n"
+msgid "Cannot change ID to root.\n"
+msgstr "មិន​អាចផ្លាស់ប្តូរ​លេខ​សម្គាល់​ទៅ​ជា​ root បាន​ឡើយ​ ។\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s ៖ មិនអាចផ្លាស់​​ប្តូរ​អ្នក​ប្រើបានទេ​ '%s' លើ​ម៉ាស៊ីន​ភ្ញៀវ NIS បានទេ ។\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "មិន​អាច​ចាក់សោ​ឯកសារ​ពាក្យ​សម្ងាត់​បានទេ ។ សូមព្យាយាម​ម្តង​ទៀតនៅ​ពេល​ក្រោយ​ ។\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s ៖ '%s' ជាមេ​ NIS សម្រាប់​ម៉ាស៊ីន​ភ្ញៀវ​នេះ​ ។\n"
+msgid "Cannot open the password file.\n"
+msgstr "មិនអាច​បើក​ឯកសារ​ពាក្យសម្ងាត់​បានឡើយ ។\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "កំពុងផ្លាស់​​ប្តូរ​ព័ត៌មាន​អ្នកប្រើ​សម្រាប់​ %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s ៖ %s រក​មិន​ឃើញ​ក្នុង​ /etc/passwd ទេ\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "មានកំហុស​ក្នុងការ​ធ្វើ​ឲ្យ​​ធាតុបញ្ចូល​​ពាក្យសម្ងាត់ទាន់សម័យ ។\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "មិនអាច​ដាក់ស្នើ​ការផ្លាស់ប្ដូរ​ឯកសារពាក្យសម្ងាត់​បានឡើយ​ ។\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "មិន​អាច​ដោះសោ​ឯកសារ​ពាក្យ​សម្ងាត់បានឡើយ​ ។\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s ៖ ឈ្មោះ​មិន​ត្រឹមត្រូវ​ ៖ '%s'\n"
@@ -429,37 +423,25 @@
 msgstr "%s ៖ '%s' មាន​តួអក្សរ​មិន​ត្រឹមត្រូវ​\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s ៖ វាល គឺ​វែងវែងពេក​\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s ៖ មិន​អាចកំណត់​ឈ្មោះ​អ្នកប្រើ​របស់​អ្នក​បាន​ទេ ។\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "មិន​អាចផ្លាស់ប្តូរ​លេខ​សម្គាល់​ទៅ​ជា​ root បាន​ឡើយ​ ។\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s ៖ មិនអាចផ្លាស់​​ប្តូរ​អ្នក​ប្រើបានទេ​ '%s' លើ​ម៉ាស៊ីន​ភ្ញៀវ NIS បានទេ ។\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "មិន​អាច​ចាក់សោ​ឯកសារ​ពាក្យ​សម្ងាត់​បានទេ ។ សូមព្យាយាម​ម្តង​ទៀតនៅ​ពេល​ក្រោយ​ ។\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s ៖ '%s' ជាមេ​ NIS សម្រាប់​ម៉ាស៊ីន​ភ្ញៀវ​នេះ​ ។\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "មិនអាច​បើក​ឯកសារ​ពាក្យសម្ងាត់​បានឡើយ ។\n"
+msgid "Changing the user information for %s\n"
+msgstr "កំពុងផ្លាស់​​ប្តូរ​ព័ត៌មាន​អ្នកប្រើ​សម្រាប់​ %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s ៖ %s រក​មិន​ឃើញ​ក្នុង​ /etc/passwd ទេ\n"
+msgid "%s: fields too long\n"
+msgstr "%s ៖ វាល គឺ​វែងវែងពេក​\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "មានកំហុស​ក្នុងការ​ធ្វើ​ឲ្យ​​ធាតុបញ្ចូល​​ពាក្យសម្ងាត់ទាន់សម័យ ។\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "មិនអាច​ដាក់ស្នើ​ការផ្លាស់ប្ដូរ​ឯកសារពាក្យសម្ងាត់​បានឡើយ​ ។\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "មិន​អាច​ដោះសោ​ឯកសារ​ពាក្យ​សម្ងាត់បានឡើយ​ ។\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -518,6 +500,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s ៖ មិន​អាច​បើក​ឯកសារ​ស្រមោល​បានទេ\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s ៖ មានកំហុស​ក្នុងការ​ធ្វើឲ្យឯកសារស្រមោល​ទាន់សម័យ​\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s  ៖ មានកំហុស​ក្នុងការ​ធ្វើឲ្យ​ធាតុ​បញ្ចូល​ក្រុម​​ទាន់សម័យ\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s ៖ បន្ទាត់​ %d ៖ បន្ទាត់​វែងពេក​\n"
@@ -530,15 +520,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s ៖ បន្ទាត់​ %d ៖ មិន​ស្គាល់​ក្រុម​ %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s ៖ បន្ទាត់​ %d ៖ មិនអាច​ធ្វើឲ្យធាតុបញ្ចូល​ពាក្យសម្ងាត់​ទាន់សម័យ​បានឡើយ​\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s ៖ បន្ទាត់​ %d ៖ មិនអាចធ្វើឲ្យ​ធាតុបញ្ចូល​ទាន់សម័យបានឡើយ\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s ៖ បានរកឃើញ​កំហុស មិនអើពើនឹងការផ្លាស់ប្ដូរ​\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s ៖ មិនអាច​ចាក់​សោ​ឯកសារ​ស្រមោល​បានទេ​\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s ៖ មានកំហុស​ក្នុងការ​ធ្វើឲ្យឯកសារស្រមោល​ទាន់សម័យ​\n"
 
@@ -547,18 +541,14 @@
 msgstr "%s ៖ កំហុស​ក្នុងការធ្វើឲ្យ​ឯកសារពាក្យសម្ងាត់ទាន់សម័យ\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s ៖ មិនអាច​ចាក់សោ​ឯកសារ​ពាក្យ​សម្ងាត់​បានទេ​\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s ៖ មិនអាច​ចាក់​សោ​ឯកសារ​ស្រមោល​បានទេ​\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s ៖ បន្ទាត់​ %d ៖ មិនស្គាល់​អ្នកប្រើ​ %s\n"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s ៖ បន្ទាត់​ %d ៖ មិនអាច​ធ្វើឲ្យធាតុបញ្ចូល​ពាក្យសម្ងាត់​ទាន់សម័យ​បានឡើយ​\n"
+
+#, fuzzy
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -594,7 +584,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s គឺជា​សែល​មិន​ត្រឹមត្រូវ​ ។\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "របៀបប្រើ ៖ ការផុតកំណត់ {-f|-c}\n"
 
@@ -602,7 +591,7 @@
 msgid "%s: unknown user\n"
 msgstr "%s  ៖ មិន​ស្គាល់​អ្នក​ប្រើ​\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -635,7 +624,6 @@
 "\t\t\t\tអ្នកប្រើ​ដែល​មាន​ឈ្មោះ​ចូល \"ឈ្មោះចូល\"\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "ចូល       ភាពបរាជ័យ​នៃការចូល​ចុងក្រោយ​ជាអតិបរមា                   លើ\n"
 
@@ -676,14 +664,38 @@
 msgstr "%s ៖ បានទាមទារ​ពាក្យសម្ងាត់​ក្រុម​ស្រមោល​សម្រាប់​ -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "តើអ្នក​ជា​នណា​ ?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s ៖ មិនអាច​ចាក់សោ​បានឡើយ\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+msgstr "%s ៖ មិនអាច​ចាក់សោ​ស្រមោល​បានឡើយ​\n"
+
+#, c-format
 msgid "%s: can't open file\n"
 msgstr "%s ៖ មិន​អាច​បើក​​ឯកសារ​បានទេ\n"
 
 #, c-format
+msgid "%s: can't re-write file\n"
+msgstr "%s ៖ មិន​អាច​សរសេរ​ឯកសារ​ឡើង​វិញបានទេ​\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s ៖ មិន​អាច​សរសេរ​​​​​ឯកសារ​ស្រមោល​ឡើង​វិញ បាន​ទេ​\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s ៖ មិនអាច​ដោះសោ​ឯកសារបានទេ\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s ៖ មិន​អាចធ្វើ​ឲ្យ​ធាតុបញ្ចូល​​ទាន់សម័យ​បានទេ​\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s ៖ មិនអាច​ធ្វើឲ្យ​​ធាតុបញ្ចូល​​ស្រមោល​ទាន់សម័យបានទេ​\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "មិន​ស្គាល់​ក្រុម​ ​ ៖ %s\n"
 
@@ -696,22 +708,6 @@
 msgstr "%s ៖ មិន​អាច​បើក​ឯកសារ​ស្រមោល​បានទេ\n"
 
 #, c-format
-msgid "Adding user %s to group %s\n"
-msgstr "កំពុង​បន្ថែម​អ្នកប្រើ​ %s ទៅក្រុម​ %s\n"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "កំពុង​យក​អ្នក​ប្រើ​ %s ចេញពី​ក្រុម​ %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s ៖ មិន​ស្គាល់​សមាជិក​ %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s ៖ មិនមែន​ tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "កំពុង​ប្តូរ​ពាក្យ​សម្ងាត់​សម្រាប់​ក្រុម​ %s\n"
 
@@ -728,35 +724,26 @@
 msgid "%s: Try again later\n"
 msgstr "%s ៖ សូមព្យាយាមម្ដងទៀត​នៅពេលក្រោយ\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s ៖ មិនអាច​ចាក់សោ​បានឡើយ\n"
+msgid "Who are you?\n"
+msgstr "តើអ្នក​ជា​នណា​ ?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s ៖ មិនអាច​ចាក់សោ​ស្រមោល​បានឡើយ​\n"
+msgid "Adding user %s to group %s\n"
+msgstr "កំពុង​បន្ថែម​អ្នកប្រើ​ %s ទៅក្រុម​ %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s ៖ មិន​អាចធ្វើ​ឲ្យ​ធាតុបញ្ចូល​​ទាន់សម័យ​បានទេ​\n"
+msgid "Removing user %s from group %s\n"
+msgstr "កំពុង​យក​អ្នក​ប្រើ​ %s ចេញពី​ក្រុម​ %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s ៖ មិនអាច​ធ្វើឲ្យ​​ធាតុបញ្ចូល​​ស្រមោល​ទាន់សម័យបានទេ​\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s ៖ មិន​ស្គាល់​សមាជិក​ %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s ៖ មិន​អាច​សរសេរ​ឯកសារ​ឡើង​វិញបានទេ​\n"
+msgid "%s: Not a tty\n"
+msgstr "%s ៖ មិនមែន​ tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s ៖ មិន​អាច​សរសេរ​​​​​ឯកសារ​ស្រមោល​ឡើង​វិញ បាន​ទេ​\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s ៖ មិនអាច​ដោះសោ​ឯកសារបានទេ\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -787,14 +774,6 @@
 msgstr "%s ៖ កំហុស​ក្នុងការ​បន្ថែម​ធាតុបញ្ចូល​​ក្រុម​ថ្មី​\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s ៖ ឈ្មោះ​ %s គឺមិន​មែន​មាន​តែមួយ​ទេ\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s ៖ GID %u គឺមិនមែន​មាន​តែមួយទេ​\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s ៖ មិនអាច​យក​​ GID ​ដែលមានតែមួយ​បានឡើយ​\n"
 
@@ -835,6 +814,9 @@
 msgstr "%s ៖ មានក្រុម​ %s រួច​ហើយ​\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s ៖ GID %u គឺមិនមែន​មាន​តែមួយទេ​\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "របៀបប្រើ​ ៖ ក្រុម​ groupdel \n"
 
@@ -862,47 +844,41 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s ៖ %s គឺជា​មេ NIS\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr ""
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr ""
 
-#, c-format
 msgid "Group access is required\n"
 msgstr ""
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "PAM authentication failed for\n"
 msgstr "%s ៖ PAM ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវបាន​បរាជ័យ​\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to lock group file\n"
 msgstr "%s ៖ មិនអាច​ចាក់សោ​ឯកសារក្រុម​បានទេ\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to open group file\n"
 msgstr "%s ៖ មិនអាច​បើក​ឯកសារក្រុម​បានទេ​\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Cannot close group file\n"
 msgstr "%s ៖ មិនអាចបើក​ឯកសារក្រុម​បានឡើយ​\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -912,6 +888,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "របៀបប្រើ ៖ groupadd ក្រុម [options]​\n"
@@ -947,10 +924,6 @@
 msgstr "របៀបប្រើ ៖ %s [-r] [-s] [group]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "ទេ\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s ៖ -s និង​ -r គឺមិន​ត្រូវ​គ្នាទេ​\n"
 
@@ -963,6 +936,9 @@
 msgstr "%s ៖ មិនអាច​បើក​ឯកសារ​ %s បានទេ\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s ៖ មិនអាច​ធ្វើឲ្យឯកសារ %s ទាន់សម័យ​បានទេ\n"
+
 msgid "invalid group file entry\n"
 msgstr "ធាតុបញ្ចូល​ឯកសារក្រុម​មិនត្រឹមត្រូវ​\n"
 
@@ -970,7 +946,6 @@
 msgid "delete line '%s'? "
 msgstr "លុប​បន្ទាត់​ '%s' ឬ ? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "ធាតុបញ្ចូល​​ក្រុម​ស្ទួន​\n"
 
@@ -1002,11 +977,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s ៖ មិនអាច​ធ្វើឲ្យធាតុ​បញ្ចូល​សម្រាប់ក្រុម​ %s ទាន់សម័យ​បានទេ\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "ធាតុ​ឯកសារ​ក្រុម​ស្រមោល​មិន​ត្រឹមត្រូវ\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "ធាតុ​ក្រុម​ស្រមោល​ស្ទួន​\n"
 
@@ -1023,10 +996,6 @@
 msgstr "ក្រុម​ស្រមោល​ %s ៖ គ្មាន​អ្នក​ប្រើ​ %s ទេ\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s ៖ មិនអាច​ធ្វើឲ្យឯកសារ %s ទាន់សម័យ​បានទេ\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s ៖ មិនបានធ្វើឲ្យ​ឯកសារទាន់សម័យឡើយ​\n"
 
@@ -1058,19 +1027,16 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s ៖ មិនអាច​លុប​ឯកសារក្រុម​ស្រមោលបានទេ​\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "របៀបប្រើ ៖ លេខសម្គាល់ [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "របៀបប្រើ​ ៖ លេខសម្គាល់\n"
 
-#, c-format
 msgid " groups="
 msgstr " ក្រុម​="
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1092,17 +1058,19 @@
 "បញ្ជាក់\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "ឈ្មោះ​អ្នក​ប្រើ         ច្រក     ពី             ចុង​ក្រោយ​បំផុត\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "ឈ្មោះ​អ្នក​ប្រើ                ច្រក     ចុង​ក្រោយ​បំផុត​\n"
 
 msgid "**Never logged in**"
 msgstr "**មិន​ដែល​ចូល​សោះ**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "មិន​ស្គាល់​អ្នក​ប្រើ ៖ %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "កំណត់ត្រាចុងក្រោយ ៖ អាគុយម៉ង់​មិន​រំពឹង​ទុក​ ៖ %s\n"
@@ -1119,11 +1087,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r ម៉ាស៊ីន​\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "ពេលវេលា​ចូល​មិន​ត្រឹមត្រូវ​\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1131,7 +1097,6 @@
 "\n"
 "ប្រព័ន្ធ​បាន​បិទ​សម្រាប់​តំហែទាំ​ទម្រង់ការ\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1171,7 +1136,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "បាន​លើសពី​ចំនួន​អតិបរ​មា​នៃ​ការ​សាកល្បង​ (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "ចូល​ ៖  PAM បានស្នើឲ្យ​បោះបង់ចោល​\n"
 
@@ -1190,6 +1154,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s ៖ ការចែកជាពីរវិធី​​បានបរាជ័យ​ ៖ %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "ការព្រមាន ៖ បាន​អនុញ្ញាតឲ្យចូល​ម្តង​ទៀត​បន្ទាប់​ពី ចេញ​បណ្តោះអាសន្ន​​\n"
 
@@ -1212,14 +1180,16 @@
 "បានហួសពេលវេលា​ចូល​​\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "របៀបប្រើ ៖ newgrp [-] [group]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "របៀបប្រើ​ ៖ ក្រុម sg [[-c] command]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "ពាក្យ​សម្ងាត់​ចាស់ ៖ "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "មិន​ស្គាល់​ UID ៖ %u\n"
@@ -1228,11 +1198,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "មិន​ស្គាល់​ GID ៖ %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "ពាក្យ​សម្ងាត់​ចាស់ ៖ "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "ច្រើន​ក្រុមពេក​\n"
 
@@ -1244,7 +1209,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s ៖ មិនមានក្រុម​ %sឡើយ​\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s ៖ មិន​អាច​ចាក់​សោ​ /etc/passwd បានឡើយ ។\n"
 
@@ -1257,6 +1232,10 @@
 msgstr "%s ៖ មិន​អាច​បើក​ឯកសារបានឡើយ​\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s ៖ មានកំហុសក្នុងការ​ធ្វើឲ្យ​ឯកសារទាន់សម័យ\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s ៖ បន្ទាត់​ %d ៖ បន្ទាត់​មិន​ត្រឹមត្រូវ​\n"
 
@@ -1288,11 +1267,7 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s ៖ បន្ទាត់​ %d ៖ មិនអាចធ្វើឲ្យ​ធាតុបញ្ចូល​ទាន់សម័យបានឡើយ\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s ៖ មានកំហុសក្នុងការ​ធ្វើឲ្យ​ឯកសារទាន់សម័យ\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1361,11 +1336,9 @@
 msgid "New password: "
 msgstr "ពាក្យ​សម្ងាត់​ថ្មី​ ៖ "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "សូមព្យាយាម​ម្តង​ទៀត​ ។\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1373,7 +1346,6 @@
 "\n"
 "ការព្រមាន ៖ ពាក្យ​សម្ងាត់មិនសូវមានសុវត្ថិភាព​ (សូម​បញ្ចូល​វា​ម្តង​ទៀត​​ដើម្បី​ប្រើវា​) ។\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "ពួកវាមិនផ្គូរផ្គងគ្នាទេ ។ សូមព្យាយាម​ម្តង​ទៀត​ ។\n"
 
@@ -1411,11 +1383,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "មិនបានប្ដូរ​ពាក្យ​សម្ងាត់​សម្រាប់​ %s ឡើយ ។\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "ពាក្យ​សម្ងាត់​បាន​ប្តូរ​ ។\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "កំណត់​ពាក្យ​សម្ងាត់​ឲ្យ​ផុត​កំណត់​ ។\n"
 
@@ -1423,11 +1393,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "របៀបប្រើ ៖ %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "ធាតុបញ្ចូល​ឯកសារ​ពាក្យសម្ងាត់​មិនត្រឹមត្រូវ\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "ធាតុបញ្ចូល​ពាក្យ​សម្ងាត់​ស្ទួន​\n"
 
@@ -1459,11 +1427,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s ៖ មិនអាច​ធ្វើឲ្យ​ធាតុបញ្ចូលពាក្យសម្ងាត់​ទាន់សម័យ​សម្រាប់​​ %s បានឡើយ\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "ធាតុបញ្ចូល​ឯកសារ​ពាក្យ​សម្ងាត់​ស្រមោល​មិនត្រឹមត្រូវ​\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "ធាតុ​បញ្ចូល​ពាក្យសម្ងាត់​ស្រមោល​ស្ទួន​\n"
 
@@ -1499,15 +1465,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s ៖ មិន​អាច​លុប​ឯកសារ​ពាក្យ​សម្ងាត់​ស្រមោល​បានឡើយ\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "ដំណើរការ​ជា​ su ទៅ​កាន់​គណនី​នោះ​ DENIED ។\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវពាក្យ​សម្ងាត់ bypassed ។\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "សូម​បញ្ចូល​ពាក្យ​សម្ងាត់ផ្ទាល់ខ្លួន​របស់អ្នក​ ជា​ការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវ​ ។\n"
 
@@ -1515,7 +1478,7 @@
 msgid "%s: %s\n"
 msgstr "%s ៖ %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1568,15 +1531,15 @@
 "%s: %s\n"
 "(មិន​អើពើ​)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "គ្មានសែល​\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "គ្មាន​ឯកសារ​ពាក្យ​សម្ងាត់ឡើយ​\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "គ្មាន​ធាតុ​ពាក្យ​សម្ងាត់​សម្រាប់ 'root'​ ឡើយ\n"
 
@@ -1620,7 +1583,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s ៖ ក្រុម​ដែលបានបញ្ជាក់​ច្រើនពេក​ (អតិ​ %d) ។\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1641,6 +1604,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1687,14 +1652,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s ៖ មិនអាចយក​ UID ដែលមានតែមួយ​បានទេ\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s ៖ មិនអាច​យក​​ GID ​ដែលមានតែមួយ​បានឡើយ​\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s  ៖ ថត​មូលដ្ឋាន​មិន​ត្រឹមត្រូវ​ '%s'\n"
@@ -1786,7 +1751,6 @@
 msgid "Creating mailbox file"
 msgstr "កំពុង​បង្កើត​ឯកសារ​ប្រអប់​សំបុត្រ​"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr "រក​ក្រុម​​ 'សំបុត្រ​' មិន​ឃើញ​ឡើយ ។ កំពុង​បង្កើត​ឯកសារប្រអប់​សំបុត្រ​អ្នក​ប្រើ​ជាមួយ​របៀប​ 0600 ។\n"
@@ -1804,6 +1768,10 @@
 msgstr "%s ៖ ក្រុម​ %s មាន​រួច​ហើយ​ - ប្រសិនបើ​អ្នក​ចង់​បន្ថែម​អ្នក​ប្រើទៅ​កាន់​ក្រុម​នោះ​ ប្រើ​ -g ។\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s ៖ UID %u មិន​មែន​មាន​តែមួយទេ​\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1815,7 +1783,7 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s ៖ ការព្រមាន ៖ CREATE_HOME មិន​បាន​គាំទ្រទេ​ សូម​ប្រើ​ -m ជំនួសវិញ ។\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1890,7 +1858,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s ៖ មានកំហុស​ក្នុងការយក​ថត​ %s ចេញ\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2002,8 +1970,15 @@
 msgid "failed to rename mailbox"
 msgstr "​បរាជ័យ​ក្នុងការប្ដូរឈ្មោះប្រអប់"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+#, fuzzy
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2042,6 +2017,12 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s ៖ មិន​អាច​ស្តារ %s ៖ %s (ការប្ដូរ​របស់អ្នក​គឺនៅក្នុង​ %s)\n"
 
+#~ msgid "%s: name %s is not unique\n"
+#~ msgstr "%s ៖ ឈ្មោះ​ %s គឺមិន​មែន​មាន​តែមួយ​ទេ\n"
+
+#~ msgid "No\n"
+#~ msgstr "ទេ\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/ko.po
===================================================================
--- upstream/trunk/po/ko.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/ko.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+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"
@@ -25,7 +25,6 @@
 msgid "crypt method not supported by libcrypt? (%s)\n"
 msgstr ""
 
-#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "설정 정보를 위한 공간을 확보할 수 없습니다.\n"
 
@@ -37,19 +36,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "경고: 알 수 없는 그룹(%s)\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "경고: 그룹이 너무 많음\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "열쇠글 사용기한이 지났습니다."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "열쇠글이 사용기간 초과로 비활성화 되었습니다."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "로그인 사용기한이 지났습니다."
 
@@ -63,11 +58,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "열쇠글 사용기한이 %ld일 후에 끝납니다.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "열쇠글 사용기한이 내일 끝납니다.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "열쇠글 사용기한이 오늘 끝납니다.\n"
 
@@ -75,7 +68,6 @@
 msgid "Unable to change tty %s"
 msgstr "%s tty(단말터미널)를 바꿀 수 없습니다"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "환경 변수 오버플로우\n"
 
@@ -94,7 +86,6 @@
 "마지막 로그인 이후 %d번 실패.\n"
 "마지막 로그인은 %s, %s에서.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "로그인 횟수가 너무 많음.\n"
 
@@ -190,7 +181,7 @@
 msgid "%s's Password: "
 msgstr "%s의 열쇠글: "
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -225,7 +216,6 @@
 "  -W, --warndays <경고날수>\t만료 경고 기간을 <경고날수>으로 합니다.\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "새로운 값을 넣거나, 기본값을 원하시면 엔터를 치세요\n"
 
@@ -247,27 +237,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "계정 사용만료일(YYYY-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "마지막으로 열쇠글을 바꾼 날\t\t\t\t\t:"
 
-#, c-format
 msgid "never\n"
 msgstr "안함\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "열쇠글을 바꿔야 합니다\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "열쇠글 만료\t\t\t\t\t:"
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "열쇠글이 비활성화 기간\t\t\t\t\t:"
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "계정 만료\t\t\t\t\t\t:"
 
@@ -296,18 +280,14 @@
 msgstr "%s: PAM 인증이 실패했습니다\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: 열쇠글 파일을 잠글 수 없습니다\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: 열쇠글 파일을 열 수 없습니다\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: 알 수 없는 사용자 %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: 셰도우 열쇠글 파일이 없습니다\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: 셰도우 열쇠글 파일을 잠글 수 없습니다\n"
 
@@ -316,18 +296,14 @@
 msgstr "%s: 셰도우 열쇠글 파일을 열 수 없습니다\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: 관리자 권한을 버릴 수 없습니다(%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: 셰도우 열쇠글 파일을 다시 작성할 수 없습니다\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "%s의 사용기한 정보를 바꿉니다\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: 열쇠글 파일을 다시 작성할 수 없습니다\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: 항목을 변경하는 도중 오류가 발생했습니다\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: 열쇠글 파일을 업데이트 할 수 없습니다\n"
 
@@ -336,14 +312,26 @@
 msgstr "%s: 셰도우 열쇠글 파일을 업데이트 할 수 없습니다\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: 셰도우 열쇠글 파일을 다시 작성할 수 없습니다\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: 셰도우 열쇠글 파일이 없습니다\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: 열쇠글 파일을 다시 작성할 수 없습니다\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: 관리자 권한을 버릴 수 없습니다(%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: 알 수 없는 사용자 %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "%s의 사용기한 정보를 바꿉니다\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: 항목을 변경하는 도중 오류가 발생했습니다\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -387,22 +375,28 @@
 msgid "Other"
 msgstr "기타"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: 사용자 이름을 인식할 수 없습니다.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "아이디를 루트로 바꿀 수는 없습니다.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: NIS 클라이언트에서 '%s' 사용자를 바꿀 수 없습니다.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "열쇠글 파일을 잠글할 수 없습니다;  나중에 다시 시도하십시오.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: '%s'이(가) 현재의 클라이언트의 NIS 마스터입니다.\n"
+msgid "Cannot open the password file.\n"
+msgstr "열쇠글 파일을 열 수가 없습니다.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "%s의 사용자의 정보를 바꿉니다\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s이(가) /etc/passwd에 없습니다\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "열쇠글 입력을 업데이트하는 데 오류가 발생했습니다.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "열쇠글 파일의 바뀐 점을 적용할 수 없습니다.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "열쇠글 파일의 잠금상태를 해제할 수 없습니다.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: 잘못된 이름: '%s'\n"
@@ -424,37 +418,25 @@
 msgstr "%s: '%s'에 사용할 수 없는 글자가 들어 있습니다\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: 입력범위가 너무 깁니다\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: 사용자 이름을 인식할 수 없습니다.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "아이디를 루트로 바꿀 수는 없습니다.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: NIS 클라이언트에서 '%s' 사용자를 바꿀 수 없습니다.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "열쇠글 파일을 잠글할 수 없습니다;  나중에 다시 시도하십시오.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: '%s'이(가) 현재의 클라이언트의 NIS 마스터입니다.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "열쇠글 파일을 열 수가 없습니다.\n"
+msgid "Changing the user information for %s\n"
+msgstr "%s의 사용자의 정보를 바꿉니다\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s이(가) /etc/passwd에 없습니다\n"
+msgid "%s: fields too long\n"
+msgstr "%s: 입력범위가 너무 깁니다\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "열쇠글 입력을 업데이트하는 데 오류가 발생했습니다.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "열쇠글 파일의 바뀐 점을 적용할 수 없습니다.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "열쇠글 파일의 잠금상태를 해제할 수 없습니다.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -513,6 +495,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: 셰도우 파일을 열 수 없습니다\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: 셰도우 파일을 업데이트하는 데 오류 발생\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: 그룹 입력값을 업데이트하는 데 오류가 발생했습니다\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: line %d: 너무 깁니다\n"
@@ -525,15 +515,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: line %d: 알 수 없는 그룹 %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: line %d: 열쇠글 항목을 업데이트 할 수 없습니다\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: %d번 줄: 입력값을 업데이트 할 수 없습니다\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: 오류 발생, 바뀐 내역은 무시합니다\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: 셰도우 파일을 잠글 수 없습니다\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: 셰도우 파일을 업데이트하는 데 오류 발생\n"
 
@@ -542,18 +536,14 @@
 msgstr "%s: 열쇠글 파일을 업데이트하는 데 오류 발생\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: 열쇠글 파일을 잠글 수 없습니다\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: 셰도우 파일을 잠글 수 없습니다\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: line %d: 알 수 없는 사용자 %s\n"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: line %d: 열쇠글 항목을 업데이트 할 수 없습니다\n"
+
+#, fuzzy
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -588,7 +578,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s은(는) 사용할 수 없는 쉘입니다.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "사용법: expiry {-f|-c}\n"
 
@@ -596,7 +585,7 @@
 msgid "%s: unknown user\n"
 msgstr "%s: 알 수 없는 사용자\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -629,7 +618,6 @@
 "\t\t\t\t로그인 실패 횟수와 한계값만 관리합니다.\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "로그인       실패     최대값  최근                     사용\n"
 
@@ -670,14 +658,38 @@
 msgstr "%s: -A를 사용할 때에는 셰도우 그룹 열쇠글이 필요합니다\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "누구십니까?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: 잠금을 할 수 없습니다\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+msgstr "%s: 셰도우 잠금을 할 수 없습니다\n"
+
+#, c-format
 msgid "%s: can't open file\n"
 msgstr "%s: 파일을 열 수 없습니다\n"
 
 #, c-format
+msgid "%s: can't re-write file\n"
+msgstr "%s: 파일을 다시 쓸 수 없습니다\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: 셰도우 파일을 다시 쓸 수 없습니다\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: 파일 잠금을 해제할 수 없습니다\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: 입력값을 업데이트 할 수 없습니다\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: 셰도우 입력값을 업데이트 할 수 없습니다\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "알 수 없는 그룹: %s\n"
 
@@ -690,22 +702,6 @@
 msgstr "%s: 셰도우 파일을 열 수 없습니다\n"
 
 #, c-format
-msgid "Adding user %s to group %s\n"
-msgstr "사용자 %s을(를) %s 그룹에 등록 중\n"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "사용자 %s을(를) 그룹 %s에서 지우는 중\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: 알 수 없는 그룹 멤버 %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: tty(단말터미널)가 아님\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "%s 그룹의 열쇠글을 변경 중\n"
 
@@ -722,35 +718,26 @@
 msgid "%s: Try again later\n"
 msgstr "%s: 나중에 다시 시도하십시오\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: 잠금을 할 수 없습니다\n"
+msgid "Who are you?\n"
+msgstr "누구십니까?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: 셰도우 잠금을 할 수 없습니다\n"
+msgid "Adding user %s to group %s\n"
+msgstr "사용자 %s을(를) %s 그룹에 등록 중\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: 입력값을 업데이트 할 수 없습니다\n"
+msgid "Removing user %s from group %s\n"
+msgstr "사용자 %s을(를) 그룹 %s에서 지우는 중\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: 셰도우 입력값을 업데이트 할 수 없습니다\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: 알 수 없는 그룹 멤버 %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: 파일을 다시 쓸 수 없습니다\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: tty(단말터미널)가 아님\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: 셰도우 파일을 다시 쓸 수 없습니다\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: 파일 잠금을 해제할 수 없습니다\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -781,14 +768,6 @@
 msgstr "%s: 새 그룹을 더하는 데 오류가 발생했습니다\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: %s 란 이름이 유일하지 않습니다\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u번은 유일하지 않습니다\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: 유일한 GID를 얻을 수 없습니다\n"
 
@@ -829,6 +808,9 @@
 msgstr "%s: 그룹 %s이(가) 이미 있습니다\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u번은 유일하지 않습니다\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "사용법: groupdel 그룹명\n"
 
@@ -856,49 +838,39 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s은(는) NIS 마스터입니다\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "이미 멤버가 있습니다\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "지우려는 멤버가 없습니다\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 "사용법: groupmems -a <사용자이름> | -d <사용자이름> | -D | -l [-g <그룹이름"
 ">]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "루트 사용자만 그룹에 멤버를 더할 수 있습니다\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "그룹 접근 권한이 필요합니다\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "현재 그룹의 소유자가 아닙니다\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "다음에 대해 PAM 인증이 실패했습니다\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "그룹 파일을 잠글 수 없습니다\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "그룹 파일을 열 수 없습니다\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "그룹 파일을 닫을 수 없습니다\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -908,6 +880,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "사용법: groupmod [옵션] <그룹>\n"
@@ -941,10 +914,6 @@
 msgstr "사용법: %s [-r] [-s] [그룹]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "아니오\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s 옵션과 -r 옵션을 동시에 쓸 수 없습니다\n"
 
@@ -957,6 +926,9 @@
 msgstr "%s: %s 파일을 열 수 없습니다\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: %s 파일을 업데이트 할 수 없습니다\n"
+
 msgid "invalid group file entry\n"
 msgstr "허용되지 않는 그룹 파일 입력값입니다\n"
 
@@ -964,7 +936,6 @@
 msgid "delete line '%s'? "
 msgstr "'%s' 줄을 지울까요?"
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "그룹 입력값 복제\n"
 
@@ -996,11 +967,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: %s 그룹 입력값을 업데이트 할 수 없습니다\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "허용되지 않은 셰도우 그룹파일 입력값\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "셰도우 그룹 입력값 복제\n"
 
@@ -1017,10 +986,6 @@
 msgstr "셰도우 그룹 %s: %s(이)라는 사용자가 없습니다\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: %s 파일을 업데이트 할 수 없습니다\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: 파일이 업데이트 되었습니다\n"
 
@@ -1052,19 +1017,16 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: 셰도우 그룹 파일을 지울 수 없습니다\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "사용법: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "사용법: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " 그룹 목록="
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1085,17 +1047,19 @@
 "  -u, --user <로그인>\t<로그인> 사용자의 lastlog 기록만 표시합니다\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "사용자명         포트     ~로부터          최근정보\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "사용자이름              포트     최근정보\n"
 
 msgid "**Never logged in**"
 msgstr "**한번도 로그인한 적이 없습니다**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "알 수 없는 사용자: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: 알 수 없는 인자입니다: %s\n"
@@ -1112,11 +1076,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r 호스트\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "잘못된 로그인 시간\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1124,7 +1086,6 @@
 "\n"
 "정기 점검을 위해 시스템이 종료되었습니다\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1164,7 +1125,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "로그인 시도 횟수 최대값을 초과했습니다(%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: PAM에서 종료를 요청했습니다\n"
 
@@ -1183,6 +1143,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: fork 실패: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "경고: 로그인이 일시적으로 폐쇄된 후 다시 로그인을 허용합니다.\n"
 
@@ -1205,14 +1169,16 @@
 "로그인 시간이 지나갔습니다\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "사용법: newgrp [-] [그룹]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "사용법: sg group [[-c] 명령]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "예전 열쇠글: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "알 수 없는 UID: %u\n"
@@ -1221,11 +1187,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "알 수 없는 GID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "예전 열쇠글: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "그룹이 너무 많습니다\n"
 
@@ -1237,7 +1198,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: %s 그룹이 없습니다\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: /etc/passwd를 잠글 수 없습니다.\n"
 
@@ -1250,6 +1221,10 @@
 msgstr "%s: 파일을 열 수가 없습니다\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: 파일을 업데이트 하는 데 오류가 발생했습니다\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: %d번 줄: 유효하지 않습니다\n"
 
@@ -1281,11 +1256,7 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: %d번 줄: 입력값을 업데이트 할 수 없습니다\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: 파일을 업데이트 하는 데 오류가 발생했습니다\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1354,11 +1325,9 @@
 msgid "New password: "
 msgstr "새 열쇠글: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "다시 시도하십시오.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1366,7 +1335,6 @@
 "\n"
 "경고: 보안성이 없는 열쇠글 (그래도 사용하길 원하신다면 다시 입력하십시오).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "입력값이 일치하지 않습니다. 다시 시도하십시오.\n"
 
@@ -1404,11 +1372,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "%s의 열쇠글을 바꾸지 않았습니다.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "열쇠글을 바꿨습니다.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "열쇠글이 만기되도록 설정하였습니다.\n"
 
@@ -1416,11 +1382,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "사용법: %s [-q] [-r] [-s] [열쇠글 [shadow]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "유효하지 않은 열쇠글 파일 입력\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "열쇠글 입력값 복제\n"
 
@@ -1452,11 +1416,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: %s의 열쇠글 입력값을 업데이트 할 수 없습니다\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "허용되지 않는 셰도우 열쇠글 파일 입력값입니다\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "셰도우 열쇠글 입력값 복제\n"
 
@@ -1492,15 +1454,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: 셰도우 열쇠글 파일을 지울 수 없습니다\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "su를 통해 이 계정으로 접근하는 것이 거부되었습니다.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "열쇠글 인증이 무시되었습니다.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "인증하기 위해 본인의 열쇠글을 입력하십시오.\n"
 
@@ -1508,7 +1467,7 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1561,15 +1520,15 @@
 "%s: %s\n"
 "(무시됨)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "쉘이 없음\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "열쇠글 파일 없음\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "'루트'에 대한 열쇠글 파일 입력값이 없음\n"
 
@@ -1613,7 +1572,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: 그룹이 너무 많이 명시되었습니다 (최대 %d).\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1634,6 +1593,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1675,14 +1636,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: 유일한 UID를 얻을 수 없습니다\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: 유일한 GID를 얻을 수 없습니다\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: 기본 디렉토리 '%s' 잘못되었습니다\n"
@@ -1774,7 +1735,6 @@
 msgid "Creating mailbox file"
 msgstr "메일함 파일을 만드는 중"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr "'mail' 그룹이 없습니다. 사용자의 메일함 파일을 0600 모드로 만듭니다.\n"
@@ -1794,6 +1754,10 @@
 "십시오.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u번은 유일하지 않습니다\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1806,7 +1770,7 @@
 msgstr ""
 "%s:경고: CREATE_HOME은 지원하지 않습니다. -m 옵션을 대신 사용하십시오.\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1883,7 +1847,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: 디렉토리 %s을(를) 지우는 데 오류가 발생했습니다\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -1997,8 +1961,15 @@
 msgid "failed to rename mailbox"
 msgstr "메일함의 이름을 바꾸는 데 실패했습니다"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+#, fuzzy
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2038,6 +2009,12 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: %s을(를) 복구시킬 수 없습니다: %s (바뀐 사항은 %s에 있습니다)\n"
 
+#~ msgid "%s: name %s is not unique\n"
+#~ msgstr "%s: %s 란 이름이 유일하지 않습니다\n"
+
+#~ msgid "No\n"
+#~ msgstr "아니오\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/nb.po
===================================================================
--- upstream/trunk/po/nb.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/nb.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-25 21:07+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst at powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -29,7 +29,6 @@
 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"
 
@@ -41,19 +40,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Advarsel: ukjent gruppe %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Advarsel: for mange grupper\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Ditt passord har utgått på dato."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Ditt passord er ikke aktivert."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Din login har utgått på dato."
 
@@ -67,11 +62,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Ditt passord vil utløpe om %ld dager.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Ditt passord vil utløpe i morgen.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Ditt passord vil utløpe i dag.\n"
 
@@ -79,7 +72,6 @@
 msgid "Unable to change tty %s"
 msgstr "Kan ikke endre tty %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Omgivelsene er overfyllt\n"
 
@@ -101,7 +93,6 @@
 "%d mislykte siden forrige innlogging.\n"
 "Forrige var %s på %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "For mange innlogginger.\n"
 
@@ -196,7 +187,7 @@
 msgid "%s's Password: "
 msgstr "%s's Passord: "
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -233,7 +224,6 @@
 "                                passordet snart utløper\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 "Skriv inn de nye verdiene, eller trykk RETUR for å bruke forvalgte verdier\n"
@@ -256,27 +246,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Konto utløper (YYYY-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Siste endring av passord\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "aldri\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "passordet må endres\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Passord utløper\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Passordet inaktivt\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Kontoen utløper\t\t\t\t\t: "
 
@@ -305,18 +289,14 @@
 msgstr "%s: PAM autentisering mislyktes\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: kan ikke låse passordfila\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: kan ikke åpne passordfila\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: ukjent bruker %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: skyggepassordfila finnes ikke\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: kan ikke låse skyggepassordfila\n"
 
@@ -325,18 +305,14 @@
 msgstr "%s: kan ikke åpne skyggepassordfila\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: klarte ikke minske privilegier (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: kan ikke gjenskrive skyggepassordfila\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Endre utløpsinformasjon for %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: kan ikke gjenskrive passordfila\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: feil ved endring i feltene\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: kan ikke oppdatere passordfila\n"
 
@@ -345,14 +321,26 @@
 msgstr "%s: kan ikke oppdatere skyggepassordfila\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: kan ikke gjenskrive skyggepassordfila\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: skyggepassordfila finnes ikke\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: kan ikke gjenskrive passordfila\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: klarte ikke minske privilegier (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: ukjent bruker %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Endre utløpsinformasjon for %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: feil ved endring i feltene\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -395,22 +383,28 @@
 msgid "Other"
 msgstr "Annet"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Kan ikke avgjøre ditt brukernavn.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Kan ikke endre ID til root.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: kan ikke endre bruker «%s» på NIS-klienten.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "Kan ikke låse passordfila; forsøk senere.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: «%s» er NIS-sjefen for denne klienten.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Kan ikke åpne passordfila.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Endrer brukerinformasjon for %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s ikke funnet i /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Feil ved oppdatering av passord.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Kan ikke sende inn endringer til passordfila.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Kan ikke låse opp passordfila.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: ugyldig navn: «%s»\n"
@@ -432,37 +426,25 @@
 msgstr "%s: «%s» inneholder ugyldige tegn\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: feltene er for lange\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Kan ikke avgjøre ditt brukernavn.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Kan ikke endre ID til root.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: kan ikke endre bruker «%s» på NIS-klienten.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Kan ikke låse passordfila; forsøk senere.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: «%s» er NIS-sjefen for denne klienten.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Kan ikke åpne passordfila.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Endrer brukerinformasjon for %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s ikke funnet i /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s: feltene er for lange\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Feil ved oppdatering av passord.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Kan ikke sende inn endringer til passordfila.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Kan ikke låse opp passordfila.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -520,6 +502,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: kan ikke åpne shadow-fila\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: feil ved oppdatering av shadow-fila\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: feil ved oppdatering av gruppe-oppføring\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: linje %d: linje er for lang\n"
@@ -532,15 +522,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: linje %d: ukjent gruppe %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: linje %d: kan ikke oppdatere passordlinja\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: linje %d: kan ikke oppdatere oppføring\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: feil funnet, endringer er ikke utført\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: kan ikke låse shadow-fila\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: feil ved oppdatering av shadow-fila\n"
 
@@ -549,18 +543,14 @@
 msgstr "%s: feil ved oppdatering av passordfila\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: kan ikke låse passordfila\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: kan ikke låse shadow-fila\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: linje %d: ukjent bruker %s\n"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: linje %d: kan ikke oppdatere passordlinja\n"
+
+#, fuzzy
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -596,7 +586,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s er et ugyldig skall.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Bruk: expiry {-f|-c}\n"
 
@@ -604,7 +593,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: ukjent bruker\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -640,7 +628,6 @@
 "                                eller -l) bare for bruker BRUKER\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Logginn       Mislykt Maksimum Siste                   På\n"
 
@@ -681,14 +668,38 @@
 msgstr "%s: shadow gruppepassord kreves for -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Hvem er du?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: kan ikke låse\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: klarer ikke å omskrive fila\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: klarer ikke å omskrive shadow-fila\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: kan ikke låse opp filen\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: klarer ikke å oppdatere oppføringen\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: klarer ikke å oppdatere oppføringen i shadow-fila\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "ukjent gruppe: %s\n"
 
@@ -701,22 +712,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Fjerner brukeren %s fra gruppa %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: ukjent medlem %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: Ikke en tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Endrer passordet for gruppa %s\n"
 
@@ -733,35 +728,26 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Prøv igjen senere\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: kan ikke låse\n"
+msgid "Who are you?\n"
+msgstr "Hvem er du?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: klarer ikke å låse shadow-fila\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Legger til brukere i  %s gruppen %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: klarer ikke å oppdatere oppføringen\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Fjerner brukeren %s fra gruppa %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: klarer ikke å oppdatere oppføringen i shadow-fila\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: ukjent medlem %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: klarer ikke å omskrive fila\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: Ikke en tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: klarer ikke å omskrive shadow-fila\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: kan ikke låse opp filen\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -793,14 +779,6 @@
 msgstr "%s: feil ved oppretting av ny gruppeoppføring\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: navn %s er ikke entydig\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u er ikke entydig\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: klarer ikke å få entydig GID\n"
 
@@ -841,6 +819,9 @@
 msgstr "%s: gruppa %s finnes allerede\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u er ikke entydig\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Bruk: groupdel gruppe\n"
 
@@ -868,47 +849,41 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s er NIS sjefen\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr ""
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr ""
 
-#, c-format
 msgid "Group access is required\n"
 msgstr ""
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "PAM authentication failed for\n"
 msgstr "%s: PAM autentisering mislyktes\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to lock group file\n"
 msgstr "%s: klarer ikke å låse gruppefila\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to open group file\n"
 msgstr "%s: klarer ikke å åpne gruppefila\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Cannot close group file\n"
 msgstr "%s: kan ikke åpne gruppefila\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -918,6 +893,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Bruk: groupadd [valg] gruppe\n"
@@ -954,10 +930,6 @@
 msgstr "Bruk: %s [-r] [-s] [gruppe]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Nei\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s og -r kan ikke brukes samtidig\n"
 
@@ -970,6 +942,9 @@
 msgstr "%s: kan ikke åpne fila %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: kan ikke oppdatere fila %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "ugyldig oppføring i gruppefila\n"
 
@@ -977,7 +952,6 @@
 msgid "delete line '%s'? "
 msgstr "slette linje «%s»? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "duplisert gruppeoppføring\n"
 
@@ -1009,11 +983,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: kan ikke oppdatere oppføringen for gruppa %s\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "ugyldig oppføring i shadow-gruppefila\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "duplisert shadow-gruppeoppføring\n"
 
@@ -1030,10 +1002,6 @@
 msgstr "shadow gruppe %s: ingen bruker %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: kan ikke oppdatere fila %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: filene er blitt oppdatert\n"
 
@@ -1065,19 +1033,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: kan ikke slette shadow-gruppefila\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Bruk: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Bruk: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " grupper="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1098,17 +1062,19 @@
 "  -u, --user BRUKER             skriv oppføringer for bruker BRUKER\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Brukernavn         Port     Fra             Sist\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Brukernavn                Port     Sist\n"
 
 msgid "**Never logged in**"
 msgstr "**Aldri vært innlogget**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Ukjent bruker: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: uventet argument: %s\n"
@@ -1125,11 +1091,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "      %s [-p] -r host\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Ugyldig tidspunkt for innlogging\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1137,7 +1101,6 @@
 "\n"
 "Systemet stengt for rutinemessig vedlikehold\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1177,7 +1140,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Maks. antall forsøk er overskredet (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: PAM ber om avbrytelse\n"
 
@@ -1196,6 +1158,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: mislykket fork: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Advarsel: innlogging reaktivert etter midlertidig stenging.\n"
 
@@ -1218,14 +1184,16 @@
 "innloggingstid overskredet\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Bruk: newgrp [-] [gruppe]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Bruk: sg group [[-c] command]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Gammelt passord: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "ukjent UID: %u\n"
@@ -1234,11 +1202,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "ukjent GID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Gammelt passord: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "for mange grupper\n"
 
@@ -1250,7 +1213,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: gruppa %s finnes ikke\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: kan ikke låse /etc/passwd.\n"
 
@@ -1263,6 +1236,10 @@
 msgstr "%s: kan ikke åpne filer\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: feil ved oppdatering av filer\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: linje %d: ugyldig linje\n"
 
@@ -1294,11 +1271,7 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: linje %d: kan ikke oppdatere oppføring\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: feil ved oppdatering av filer\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1366,11 +1339,9 @@
 msgid "New password: "
 msgstr "Nytt passord: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Prøv igjen.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1378,7 +1349,6 @@
 "\n"
 "Advarsel: svakt passord (skriv det inn igjen for å bruke det likevel).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Passordene var ikke like, prøv igjen.\n"
 
@@ -1416,11 +1386,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Passordet for %s er uendret.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Passordet er endret.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Passordet vil utgå på dato.\n"
 
@@ -1428,11 +1396,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Bruk: %s [-q] [-r] [-s] [passord [shadow]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "ugyldig oppføring i passordfila\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "duplisert oppføring i passordfila\n"
 
@@ -1464,11 +1430,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: klarer ikke å endre passord-oppføringen for %s\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "ugyldig oppføring i shadow-passordfila\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "duplisert oppføring i shadow-passordfila\n"
 
@@ -1504,15 +1468,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: kan ikke slette shadow-passordfila\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "NEKTET tilgang til su til den kontoen.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Passordautentisering forbi-koblet.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Oppgi ditt EGET passord som autentisering.\n"
 
@@ -1520,7 +1481,7 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1573,15 +1534,15 @@
 "%s: %s\n"
 "(Ignorert)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Mangler skall\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Ingen passordfil.\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Ingen oppføring for «root» i passordfila\n"
 
@@ -1625,7 +1586,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: for mange grupper oppgitt (maks %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1646,6 +1607,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1689,14 +1652,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: klarer ikke å få entydig UID\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: klarer ikke å få entydig GID\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: ugyldig basismappe «%s»\n"
@@ -1788,7 +1751,6 @@
 msgid "Creating mailbox file"
 msgstr "Oppretter postkasse-fil"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1810,6 +1772,10 @@
 "gruppa, bruk -g.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u er ikke entydig\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1821,7 +1787,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: advarsel: CREATE_HOME ikke støttet, bruk -m istedenfor.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1899,7 +1864,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: feil ved fjerning av mappe %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2001,6 +1966,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2039,6 +2010,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s: navn %s er ikke entydig\n"
+
+#~ msgid "No\n"
+#~ msgstr "Nei\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/ne.po
===================================================================
--- upstream/trunk/po/ne.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/ne.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+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"
@@ -27,7 +27,6 @@
 msgid "crypt method not supported by libcrypt? (%s)\n"
 msgstr ""
 
-#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "कनफिगरेसन सूचनाको लागि खाली ठाऊँ बाँड्न सकिदैन ।\n"
 
@@ -39,19 +38,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "चेतावनी: अज्ञात समूह %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "चेतावनी: अति धेरै समूहहरू\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "तपाईँको पासवर्डको म्याद समाप्त भएको छ।"
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "तपाईँको पासवर्ड निष्क्रिय छ।"
 
-#, c-format
 msgid "Your login has expired."
 msgstr "तपाईँको लगइनको म्याद समाप्त भएको छ।"
 
@@ -65,11 +60,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "तपाईँको पासवर्डको म्याद %ld दिनमा समाप्त हुन्छ ।\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "तपाईँको पासवर्डको म्याद भोली समाप्त हुनेछ ।\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "तपाईँको पासवर्डको म्याद आज समाप्त हुनेछ ।\n"
 
@@ -77,7 +70,6 @@
 msgid "Unable to change tty %s"
 msgstr "tty %s लाई परिवर्तन गर्न असक्षम भयो"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "परिवेशको अतिप्रवाह\n"
 
@@ -99,7 +91,6 @@
 "%d अन्तिम लगइन देखिअसफल भयो ।\n"
 "अन्तिम %s मा %s थियो ।\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "अति धेरै लगइनहरू ।\n"
 
@@ -196,7 +187,7 @@
 msgid "%s's Password: "
 msgstr "'%s' को पासवर्ड: "
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -232,7 +223,6 @@
 "\t\t\t\tगर्दछ\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "नयाँ मान प्रविष्टि गर्नुहोस्, वा पूर्वनिर्धारितको लागि ENTER थिच्नुहोस्\n"
 
@@ -254,27 +244,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "लेखा समाप्ति मिति (YYYY-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "अन्तिम पासवर्ड परिवर्तन भयो\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "कहिल्यै पनि\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "पासवर्ड परिवर्तन हुनुपर्छ\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "पासवर्ड समाप्त हुन्छ\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "पासवर्ड निष्क्रिय पार्नुहोस्\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "लेखा समाप्त हुन्छ\t\t\t\t\t\t: "
 
@@ -303,18 +287,14 @@
 msgstr "%s: PAM आधिकरण असफल भयो\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: पासवर्ड फाइलमा ताल्चा मार्न सकिदैन\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: पासवर्ड फाइल खोल्न सकिएन\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: अज्ञात प्रयोगकर्ता %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: स्याडो पासवर्ड फाइल प्रस्तुत भएको छैन\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: स्याडो पासवर्ड फाइल ताल्चा मार्न सकिएन\n"
 
@@ -323,18 +303,14 @@
 msgstr "%s: स्याडो पासवर्ड फाइल खोल्न सकिएन\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: विशेषधिकारहरू छोड्न असफल भयो (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: स्याडो पासवर्ड फाइल पुन:लेखन गर्न सकिएन\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "%s का लागि अवधि सूचना परिवर्तन गरिदैछ\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: पासवर्ड फाइल पुन:लेखन गर्न सकिएन\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: त्रुटि परिवर्तन फाँट\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: पासवर्ड फाइल अद्यावधिक गर्न सकिएन\n"
 
@@ -343,14 +319,26 @@
 msgstr "%s: स्याडो पासवर्ड फाइल अद्यावधिक गर्न सकिएन\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: स्याडो पासवर्ड फाइल पुन:लेखन गर्न सकिएन\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: स्याडो पासवर्ड फाइल प्रस्तुत भएको छैन\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: पासवर्ड फाइल पुन:लेखन गर्न सकिएन\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: विशेषधिकारहरू छोड्न असफल भयो (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: अज्ञात प्रयोगकर्ता %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "%s का लागि अवधि सूचना परिवर्तन गरिदैछ\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: त्रुटि परिवर्तन फाँट\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -393,22 +381,28 @@
 msgid "Other"
 msgstr "अन्य"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: तपाईँको प्रयोगकर्ता नाम निर्धारण गर्न सकिएन ।\n"
+msgid "Cannot change ID to root.\n"
+msgstr "ID लाई मूलमा परिवर्तन गर्न सकिदैन ।\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: NIS ग्राहकमा प्रयोगकर्ता '%s' परिवर्तन गर्न सकिदैन ।\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "पासवर्ड फाइल ताल्चा मार्न सकिएन; फेरी पछि प्रयास गर्नुहोस् ।\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: '%s' यो ग्राहकको लागि NIS मास्टर हो ।\n"
+msgid "Cannot open the password file.\n"
+msgstr "पासवर्ड फाइल खोल्न सकिएन ।\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr " %s को लागि प्रयोगकर्ता सूचना परिवर्तन गरिदैछ\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s /etc/passwd मा फेला परेन\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "पासवर्ड प्रविष्टिमा त्रुटि अद्यावधिक गरिदैछ ।\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "पासवर्ड फाइल परिवर्तनहरू कमिट गर्नु सकिएन ।\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "पासवर्ड फाइलबाट ताल्चा हटाउन सकिदैन ।\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: अवैध नाम: '%s'\n"
@@ -430,37 +424,25 @@
 msgstr "%s: '%s' ले गैरकानूनी क्यारेक्टरहरू समाविष्ट गर्दछ\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: अति लामो फाँट\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: तपाईँको प्रयोगकर्ता नाम निर्धारण गर्न सकिएन ।\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "ID लाई मूलमा परिवर्तन गर्न सकिदैन ।\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: NIS ग्राहकमा प्रयोगकर्ता '%s' परिवर्तन गर्न सकिदैन ।\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "पासवर्ड फाइल ताल्चा मार्न सकिएन; फेरी पछि प्रयास गर्नुहोस् ।\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: '%s' यो ग्राहकको लागि NIS मास्टर हो ।\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "पासवर्ड फाइल खोल्न सकिएन ।\n"
+msgid "Changing the user information for %s\n"
+msgstr " %s को लागि प्रयोगकर्ता सूचना परिवर्तन गरिदैछ\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s /etc/passwd मा फेला परेन\n"
+msgid "%s: fields too long\n"
+msgstr "%s: अति लामो फाँट\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "पासवर्ड प्रविष्टिमा त्रुटि अद्यावधिक गरिदैछ ।\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "पासवर्ड फाइल परिवर्तनहरू कमिट गर्नु सकिएन ।\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "पासवर्ड फाइलबाट ताल्चा हटाउन सकिदैन ।\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -519,6 +501,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: स्याडो फाइल खोल्न सकिएन\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: स्याडो फाइल अद्यावधिक गर्दा त्रुटि\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: समूह प्रविष्टि अद्यावधिक गर्दा त्रुटि\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: रेखा %d: अति लामो रेखा\n"
@@ -531,15 +521,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: रेखा %d: अज्ञात समूह %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: रेखा %d: पासवर्ड प्रविष्टि अद्यावधिक गर्न सकिदैन\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: रेखा %d: प्रविष्टि अद्यावधिक गर्न सकिएन\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: त्रुटि पत्ता लाग्यो, परिवर्तनहरू उपेक्षा गरियो\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: स्याडो फाइल ताल्चा मार्न सकिएन\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: स्याडो फाइल अद्यावधिक गर्दा त्रुटि\n"
 
@@ -548,18 +542,14 @@
 msgstr "%s: पासवर्ड फाइल अद्यावधिक गर्दा त्रुटि\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: पासवर्ड फाइलमा ताल्चा मार्न सकिदैन\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: स्याडो फाइल ताल्चा मार्न सकिएन\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: रेखा %d: अज्ञात प्रयोगकर्ता %s\n"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: रेखा %d: पासवर्ड प्रविष्टि अद्यावधिक गर्न सकिदैन\n"
+
+#, fuzzy
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -595,7 +585,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s अवैध शेल हो ।\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "उपयोग: अवधि {-f|-c}\n"
 
@@ -603,7 +592,7 @@
 msgid "%s: unknown user\n"
 msgstr "%s: अज्ञात प्रयोगकर्ता\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -636,7 +625,6 @@
 "\t\t\t\tप्रयोगकर्ताको लागि LOGIN संगै \n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "सबैभन्दा पछि                  असफल भएको                           लगइन\n"
 
@@ -677,14 +665,38 @@
 msgstr "%s: स्याडो समूह पासवर्डहरुलाई -A को आवश्यक छ\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "तपाईँ को हो ?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: ताल्चा प्राप्त गर्न सकिएन\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+msgstr "%s: स्याडो ताल्चा प्राप्त गर्न सकिएन\n"
+
+#, c-format
 msgid "%s: can't open file\n"
 msgstr "%s: फाइल खोल्न सकिएन\n"
 
 #, c-format
+msgid "%s: can't re-write file\n"
+msgstr "%s: फाइल पुन:लेखन गर्न सकिएन\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: स्याडो फाइल पुन:लेखन गर्न सकिएन\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: फाइल अनलग गर्न सकिएन\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: प्रविष्टि अद्यावधिक गर्न सकिएन\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: स्याडो प्रविष्टि अद्यावधिक गर्न सकिएन\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "अज्ञात समूह: %s\n"
 
@@ -697,22 +709,6 @@
 msgstr "%s: स्याडो फाइल खोल्न सकिएन\n"
 
 #, c-format
-msgid "Adding user %s to group %s\n"
-msgstr "समूह %s मा प्रयोगकर्ता %s थप गरिदैछ\n"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "समूह %s बाट प्रयोगकर्ता %s हटाइदैछ\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: अज्ञात सदस्य %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: tty होइन\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "समूह %s को लागि पासवर्ड परिवर्तन गरिदैछ\n"
 
@@ -729,35 +725,26 @@
 msgid "%s: Try again later\n"
 msgstr "%s: पछि फेरी प्रयास गर्नुहोस्\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: ताल्चा प्राप्त गर्न सकिएन\n"
+msgid "Who are you?\n"
+msgstr "तपाईँ को हो ?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: स्याडो ताल्चा प्राप्त गर्न सकिएन\n"
+msgid "Adding user %s to group %s\n"
+msgstr "समूह %s मा प्रयोगकर्ता %s थप गरिदैछ\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: प्रविष्टि अद्यावधिक गर्न सकिएन\n"
+msgid "Removing user %s from group %s\n"
+msgstr "समूह %s बाट प्रयोगकर्ता %s हटाइदैछ\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: स्याडो प्रविष्टि अद्यावधिक गर्न सकिएन\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: अज्ञात सदस्य %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: फाइल पुन:लेखन गर्न सकिएन\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: tty होइन\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: स्याडो फाइल पुन:लेखन गर्न सकिएन\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: फाइल अनलग गर्न सकिएन\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -788,14 +775,6 @@
 msgstr "%s: नयाँ समूह प्रविष्टि थप गर्दा त्रुटि\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: नाम %s अद्वितिय होइन\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u अद्वितिय होइन\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: अद्वितिय GID प्राप्त गर्न सकिएन\n"
 
@@ -836,6 +815,9 @@
 msgstr "%s: समूह %s अवस्थित छ\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u अद्वितिय होइन\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "उपयोग: groupdel समूह नाम\n"
 
@@ -863,47 +845,41 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s NIS मास्टर हो\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr ""
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr ""
 
-#, c-format
 msgid "Group access is required\n"
 msgstr ""
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "PAM authentication failed for\n"
 msgstr "%s: PAM आधिकरण असफल भयो\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to lock group file\n"
 msgstr "%s: समूह फाइल ताल्चा मार्न असक्षम भयो\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to open group file\n"
 msgstr "%s: समूह फाइल खोल्न असक्षम भयो\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Cannot close group file\n"
 msgstr "%s: समूह फाइल खोल्न सकिदैन\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -913,6 +889,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "उपयोग: groupadd [विकल्प] समूह\n"
@@ -948,10 +925,6 @@
 msgstr "उपयोग: %s [-r] [-s] [group]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "होइन\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s र -r मिल्दोजुल्दो छैन\n"
 
@@ -964,6 +937,9 @@
 msgstr "%s: फाइल %s खोल्न सकिएन\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: फाइल %s अद्यावधिक गर्न सकिएन\n"
+
 msgid "invalid group file entry\n"
 msgstr "अवैध समूह फाइल प्रविष्टि\n"
 
@@ -971,7 +947,6 @@
 msgid "delete line '%s'? "
 msgstr "लाइन '%s' मेट्नुहुन्छ ? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "नक्कली समूह प्रविष्टि\n"
 
@@ -1003,11 +978,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: यस %s समूहका लागि प्रविष्टि अद्यावधिक गर्न सकिएन\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "अवैध स्याडो समूह फाइल प्रविष्टि\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "नक्कली स्याडो समूह प्रविष्टि\n"
 
@@ -1024,10 +997,6 @@
 msgstr "स्याडो समूह %s: प्रयोगकर्ता छैन %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: फाइल %s अद्यावधिक गर्न सकिएन\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: फाइलहरू अद्यावधिक हुनुपर्छ\n"
 
@@ -1059,19 +1028,16 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: स्याडो समूह फाइल मेट्न सकिएन\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "उपयोग: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "उपयोग: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " समूहहरू="
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1092,17 +1058,19 @@
 "  -u, --प्रयोगकर्ता LOGIN\t निर्दिष्ट गरिएको LOGIN संगै अन्तिम लग रेकर्डहरू मुद्रण गर्दछ\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "सबै भन्दा पछिल्लो        बाट                पोर्ट        प्रयोगकर्ता नाम\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "सबैभन्दा पछिल्लो              पोर्ट            प्रयोगकर्ता नाम\n"
 
 msgid "**Never logged in**"
 msgstr "**Never logged in**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "अज्ञात प्रयोगकर्ता: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "अन्तिम लग: अनपेक्षित तर्क: %s\n"
@@ -1119,11 +1087,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r host\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "अवैध लगइन समय\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1131,7 +1097,6 @@
 "\n"
 "रुटिन संभारको लागि प्रणाली बन्द गरियो\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1171,7 +1136,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "बढेको प्रयासहरको अधिक्तम संख्या (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "लगइन: PAM द्वारा अनुरोध गरिएको परित्याग\n"
 
@@ -1190,6 +1154,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: फोर्क गर्दा असफल: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "चेतावनी: अस्थायी लगआउट पछि लगइन पुन: सक्षम गर्नुहोस् ।\n"
 
@@ -1212,14 +1180,16 @@
 "लगइन समय बढ्यो\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "उपयोग: newgrp [-] [group]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "उपयोग: sg group [[-c] आदेश]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "पुरानो पासवर्ड: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "अज्ञात UID: %u\n"
@@ -1228,11 +1198,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "अज्ञात GID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "पुरानो पासवर्ड: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "अति धेरै समूहहरू\n"
 
@@ -1244,7 +1209,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: समूह %s अवस्थित छैन\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: /etc/passwd ताल्चा मार्न सकिएन ।\n"
 
@@ -1257,6 +1232,10 @@
 msgstr "%s: फाइलहरू खओल्न सकिएन\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: फाइलहरू अद्यावधिक गर्दा त्रुटि\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: रेखा %d: अवैध रेखा\n"
 
@@ -1288,11 +1267,7 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: रेखा %d: प्रविष्टि अद्यावधिक गर्न सकिएन\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: फाइलहरू अद्यावधिक गर्दा त्रुटि\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1361,11 +1336,9 @@
 msgid "New password: "
 msgstr "नयाँ पासवर्ड : "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "फेरी प्रयास गर्नुहोस् ।\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1373,7 +1346,6 @@
 "\n"
 "चेतावनी: कम्जोर पासवर्ड (जे भए पनि यसलाई प्रयोग गर्न फेरी यसलाई प्रविष्ट गर्नुहोस्) ।\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "तिनीहरू मेल खाँदैनन्; फेरी प्रयास गर्नुहोस् ।\n"
 
@@ -1412,11 +1384,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "%s को लागि पासवर्ड परिवर्तन हुन सकिदैन ।\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "पासवर्ड परिवर्तन भयो ।\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "समाप्तिलाई पासवर्ड सेट गरियो ।\n"
 
@@ -1424,11 +1394,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "उपयोग: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "अवैध पासवर्ड फाइल प्रविष्टि\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "नक्कली पासवर्ड प्रविष्टि\n"
 
@@ -1460,11 +1428,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: %s को लागि पासवर्ड प्रविष्टि अद्यावधिक गर्न सकिएन\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "अवैध स्याडो पासवर्ड फाइल प्रविष्टि\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "नक्कलि स्याडो पासवर्ड प्रविष्टि\n"
 
@@ -1500,15 +1466,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: स्याडो पासवर्ड फाइल मेट्न सकिएन\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "su बाट त्यो खातामा पहुँच गर्न अस्वीकार गरियो ।\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "पासवर्ड प्रमाणीकरण बाइपास गरियो ।\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr " कृपया प्रमाणीकरणको रुपमा तपाईँको आफ्नो पासवर्ड प्रविष्ट गर्नुहोस् ।\n"
 
@@ -1516,7 +1479,7 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1569,15 +1532,15 @@
 "%s: %s\n"
 "(उपेक्षा गरियो)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "शेल होइन\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "पासवर्ड फाइल होइन\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "मूलको लागि पासवर्ड प्रविष्टि छैन'\n"
 
@@ -1621,7 +1584,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: अति धेरै समूहरू निर्दिष्ट गरिएको छ (max %d) ।\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1642,6 +1605,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1687,14 +1652,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: अद्वितिय UID प्राप्त गर्न सकिएन\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: अद्वितिय GID प्राप्त गर्न सकिएन\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: अवैध डाइरेक्ट्री '%s'\n"
@@ -1786,7 +1751,6 @@
 msgid "Creating mailbox file"
 msgstr "मेल बाकस फाइल सिर्जना गर्दै"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr "समूह मेल फेला परेन । ०६०० मोड द्वारा प्रयोगकर्ता मेल बाकस फाइल सिर्जना गर्दैछ ।\n"
@@ -1806,6 +1770,10 @@
 "प्रयोग गर्नुहोस् ।\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u अद्वितिय होइन\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1817,7 +1785,7 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: चेतावनी: CREATE_HOME समर्थित छैन, कृपया सट्टामा -m प्रयोग गर्नुहोस् ।\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1892,7 +1860,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: डाइरेक्ट्री हटाउँदा त्रुटि %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2005,8 +1973,15 @@
 msgid "failed to rename mailbox"
 msgstr "मेल बक्सलाई पुन:नामकरण गर्न असफल भयो"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+#, fuzzy
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2045,6 +2020,12 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: पुन:भण्डारण गर्न सकिदैन %s: %s (तपाईँको परिवर्तनहरू %s मा छ)\n"
 
+#~ msgid "%s: name %s is not unique\n"
+#~ msgstr "%s: नाम %s अद्वितिय होइन\n"
+
+#~ msgid "No\n"
+#~ msgstr "होइन\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/nl.po
===================================================================
--- upstream/trunk/po/nl.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/nl.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-25 21:11+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -25,7 +25,6 @@
 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"
 
@@ -38,19 +37,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Waarschuwing: onbekende groep %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Waarschuwing: te veel groepen\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Uw wachtwoord is vervallen."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Uw wachtwoord is niet actief."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Uw gebruikersnaam is vervallen."
 
@@ -64,11 +59,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Uw wachtwoord vervalt binnen %ld dagen.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Uw wachtwoord vervalt morgen.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Uw wachtwoord vervalt vandaag.\n"
 
@@ -76,7 +69,6 @@
 msgid "Unable to change tty %s"
 msgstr "Kan tty %s niet veranderen"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Omgeving wordt te groot\n"
 
@@ -98,7 +90,6 @@
 "%d mislukte pogingen sinds u zich de laatste keer aanmeldde.\n"
 "De laatste mislukte poging %s was op %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Te veel aanmeldingen.\n"
 
@@ -195,7 +186,6 @@
 msgid "%s's Password: "
 msgstr "Wachtwoord van %s: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -231,7 +221,6 @@
 "                                vervallen account in op WAARSCH_DAGEN\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Voer een nieuwe waarde in of druk op Enter voor de standaardwaarde\n"
 
@@ -253,27 +242,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Vervaldatum van account (JJJJ-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Laatste wachtwoordverandering\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "nooit\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "Wachtwoord veranderd\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Wachtwoord vervalt\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Wachtwoord niet actief\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Account vervalt\t\t\t\t\t\t: "
 
@@ -302,18 +285,14 @@
 msgstr "%s: PAM-authentificatie is mislukt\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: kan wachtwoordbestand niet vergrendelen\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: kan wachtwoordbestand niet openen\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: onbekende gebruiker %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: het schaduwwachtwoordenbestand is afwezig\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: kan schaduwwachtwoordenbestand niet vergrendelen\n"
 
@@ -322,18 +301,14 @@
 msgstr "%s: kan schaduwwachtwoordenbestand niet openen\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: afgeven van rechten is mislukt (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: kan het schaduwwachtwoordbestand niet herschrijven\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Verouderingsinformatie voor %s wordt aangepast\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: kan het wachtwoordbestand niet herschrijven\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: fout bij het aanpassen van de velden\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: kan wachtwoordbestand niet bijwerken\n"
 
@@ -342,14 +317,26 @@
 msgstr "%s: kan schaduwwachtwoordbestand niet bijwerken\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: kan het schaduwwachtwoordbestand niet herschrijven\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: het schaduwwachtwoordenbestand is afwezig\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: kan het wachtwoordbestand niet herschrijven\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: afgeven van rechten is mislukt (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: onbekende gebruiker %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Verouderingsinformatie voor %s wordt aangepast\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: fout bij het aanpassen van de velden\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -393,22 +380,29 @@
 msgid "Other"
 msgstr "Varia"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Kan uw gebruikersnaam niet bepalen.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Kan ID niet veranderen naar root.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: kan gebruiker '%s' niet veranderen op NIS-client.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr ""
+"Kan het wachtwoordbestand niet vergrendelen; probeer het later nog eens.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: '%s' is de NIS-master voor deze client.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Kan het wachtwoordbestand niet openen.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "De gebruikersinformatie van %s wordt veranderd\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s is niet gevonden in /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Fout tijdens het bijwerken van de wachtwoordingang.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Kan de aanpassingen aan het wachtwoordbestand niet vastleggen.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Kan het wachtwoordbestand niet ontgrendelen.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: ongeldige naam: '%s'\n"
@@ -430,38 +424,25 @@
 msgstr "%s: '%s' bevat ongeldige tekens\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: velden zijn te lang\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Kan uw gebruikersnaam niet bepalen.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Kan ID niet veranderen naar root.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: kan gebruiker '%s' niet veranderen op NIS-client.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr ""
-"Kan het wachtwoordbestand niet vergrendelen; probeer het later nog eens.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: '%s' is de NIS-master voor deze client.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Kan het wachtwoordbestand niet openen.\n"
+msgid "Changing the user information for %s\n"
+msgstr "De gebruikersinformatie van %s wordt veranderd\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s is niet gevonden in /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s: velden zijn te lang\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Fout tijdens het bijwerken van de wachtwoordingang.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Kan de aanpassingen aan het wachtwoordbestand niet vastleggen.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Kan het wachtwoordbestand niet ontgrendelen.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -519,6 +500,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: kan het schaduwbestand niet openen\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: fout tijdens bijwerken van schaduwbestand\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr ":%s: fout tijdens bijwerken groepingang\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: regel %d: regel is te lang\n"
@@ -531,15 +520,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: regel %d: onbekende groep %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: regel %d: kan wachtwoordingang niet bijwerken\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: regel %d: kan ingang niet bijwerken\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: fouten gedetecteerd, aanpassingen genegeerd\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: kan het 'shadow'-bestand niet vergrendelen\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: fout tijdens bijwerken van schaduwbestand\n"
 
@@ -548,18 +541,13 @@
 msgstr "%s: fout tijdens bijwerken van wachtwoordbestand\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: kan wachtwoordbestand niet vergrendelen\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: kan het 'shadow'-bestand niet vergrendelen\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: regel %d: onbekende gebruiker %s\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: regel %d: kan wachtwoordingang niet bijwerken\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -594,7 +582,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s is geen geldige shell.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Gebruik: expiry {-f|-c}\n"
 
@@ -602,7 +589,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: onbekende gebruiker\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -637,7 +623,6 @@
 "                        gebruikt worden), maar enkel voor gebruiker LOGIN\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Gebruiker Missingen Maximum Laatste          Op\n"
 
@@ -678,14 +663,38 @@
 msgstr "%s: schaduw groepwachtwoorden zijn vereist voor -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Wie bent u?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: kan geen vergrendeling verkrijgen\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: kan bestand niet herschrijven\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: kan schaduwbestand niet herschrijven\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: kan bestand niet ontgrendelen\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: kan ingang niet bijwerken\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: kan schaduwingang niet bijwerken\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "onbekende groep: %s\n"
 
@@ -698,22 +707,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Gebruiker %s wordt verwijderd uit groep %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: onbekende gebruiker %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: Is geen tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Het wachtwoord voor groep %s wordt veranderd\n"
 
@@ -730,35 +723,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s: U kunt het later nog eens proberen\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: kan geen vergrendeling verkrijgen\n"
+msgid "Who are you?\n"
+msgstr "Wie bent u?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: kan geen schaduwvergrendeling verkrijgen\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Gebruiker %s wordt toegevoegd aan groep %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: kan ingang niet bijwerken\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Gebruiker %s wordt verwijderd uit groep %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: kan schaduwingang niet bijwerken\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: onbekende gebruiker %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: kan bestand niet herschrijven\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: Is geen tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: kan schaduwbestand niet herschrijven\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: kan bestand niet ontgrendelen\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -790,14 +773,6 @@
 msgstr "%s: fout tijdens toevoegen nieuwe groepingang\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: naam %s is niet uniek\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u is niet uniek\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: kan geen unieke GID verkrijgen\n"
 
@@ -838,6 +813,9 @@
 msgstr "%s: groep %s bestaat reeds\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u is niet uniek\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Gebruik: groupdel groep\n"
 
@@ -865,49 +843,39 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s is de NIS-master\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "Lid bestaat reeds\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "Te verwijderen lid kon niet gevonden worden\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 "Gebruik: groupmems -a GEBRUIKERSNAAM | -d GEBRUIKERSNAAM | -D | -l [-g "
 "GROEPNAAM]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "Alleen root kan gebruikers toevoegen aan verschillende groepen\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "Groeptoegang is vereist\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "Niet de primaire eigenaar van de huidige groep\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "PAM-authentificatie is mislukt\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "Kan groepbestand niet vergrendelen\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "Kan groepbestand niet openen\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "Kan groepbestand niet sluiten\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -917,6 +885,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Gebruik: groupmod [opties] GROEP\n"
@@ -950,10 +919,6 @@
 msgstr "Gebruik: %s [-r] [-s] [groep]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Nee\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s en -r zijn niet compatibel\n"
 
@@ -966,6 +931,9 @@
 msgstr "%s: kan bestand %s niet openen\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: kan bestand %s niet bijwerken\n"
+
 msgid "invalid group file entry\n"
 msgstr "ongeldige ingang in het groepbestand\n"
 
@@ -973,7 +941,6 @@
 msgid "delete line '%s'? "
 msgstr "regel '%s' verwijderen?"
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "dubbele groepsingang\n"
 
@@ -1005,11 +972,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: kan ingang voor groep %s niet bijwerken\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "ongeldige ingang in het schaduwgroepbestand\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "dubbele schaduwgroepingang\n"
 
@@ -1026,10 +991,6 @@
 msgstr "schaduwgroep %s: geen gebruiker %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: kan bestand %s niet bijwerken\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: de bestanden zijn bijgewerkt\n"
 
@@ -1061,19 +1022,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: kan schaduwgroepbestand niet verwijderen\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Gebruik: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Gebruik: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " groepen="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1096,17 +1053,19 @@
 "  -u, --user LOGIN    print het lastlog-record van de gebruiker LOGIN\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Gebruikersnaam   Poort    Vanaf            Laatste\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Gebruikersnaam          Poort    Laatste\n"
 
 msgid "**Never logged in**"
 msgstr "**Heeft zich nog nooit aangemeld**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Onbekende gebruiker %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: onverwachte parameter: %s\n"
@@ -1123,11 +1082,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "         %s [-p] -r computer\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Ongeldig aanmeldtijdstip\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1135,7 +1092,6 @@
 "\n"
 "Systeem gesloten wegens routineonderhoud\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1175,7 +1131,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Maximaal aantal pogingen overschreden (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: afgebroken op verzoek van PAM\n"
 
@@ -1194,6 +1149,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: afsplisten van proces is mislukt: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 "Waarschuwing: aanmelden is geheractiveerd na tijdelijke buitensluiting.\n"
@@ -1217,14 +1176,16 @@
 "aanmeldtijd overschreden\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Gebruik: newgrp [-] [groep]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Gebruik: sg groep [[-c] commando]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Oud wachtwoord: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "onbekende UID: %u\n"
@@ -1233,11 +1194,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "onbekende GID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Oud wachtwoord: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "te veel groepen\n"
 
@@ -1249,7 +1205,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: groep %s bestaan niet\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: kan /etc/passwd niet vergrendelen.\n"
 
@@ -1262,6 +1228,10 @@
 msgstr "%s: kan bestanden niet openen\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: fout tijdens bijwerken bestanden\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: regel %d: ongeldige regel\n"
 
@@ -1293,11 +1263,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: regel %d: kan ingang niet bijwerken\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: fout tijdens bijwerken bestanden\n"
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1375,11 +1340,9 @@
 msgid "New password: "
 msgstr "Nieuw wachtwoord: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Probeer het nog eens.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1388,7 +1351,6 @@
 "Waarschuwing: zwak wachtwoord (voer het nogmaals in om het toch te "
 "gebruiken).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Ze komen niet overeen; probeer het nog eens.\n"
 
@@ -1426,11 +1388,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Het wachtwoord voor %s is niet veranderd.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Wachtwoord is veranderd.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Uw wachtwoord gaat vervallen.\n"
 
@@ -1438,11 +1398,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Gebruik: %s [-q] [-r] [-s] [wachtwoord [shaduw]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "ongeldige ingang in het wachtwoordbestand\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "dubbele wachtwoordingang\n"
 
@@ -1474,11 +1432,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: kan 'passwd'-ingang voor %s niet bijwerken\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "ongeldige ingang in het schaduwwachtwoordbestand\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "dubbele schaduwwachtwoordingang\n"
 
@@ -1514,15 +1470,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: kan schaduwwachtwoordbestand niet verwijderen\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Toegang van 'su' tot die account is GEWEIGERD.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Wachtwoordauthentificatie is omzeild.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Gelieve uw EIGEN wachtwoord in te voeren voor authentificatie.\n"
 
@@ -1530,7 +1483,6 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1584,15 +1536,15 @@
 "%s: %s\n"
 "(Genegeerd)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Geen shell\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Geen wachtwoordbestand\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Geen wachtwoordingang voor 'root'\n"
 
@@ -1636,7 +1588,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: te veel groepen gespecificeerd (max %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1657,6 +1609,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1708,14 +1662,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: kan geen unieke UID verkrijgen\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: kan geen unieke GID verkrijgen\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: ongeldige basismap '%s'\n"
@@ -1807,7 +1761,6 @@
 msgid "Creating mailbox file"
 msgstr "mailbox-bestand wordt aangemaakt"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1829,6 +1782,10 @@
 "dient u -g te gebruiken.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u is niet uniek\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1842,7 +1799,6 @@
 "%s: waarschuwing: CREATE_HOME wordt niet ondersteund, u dient in plaats "
 "hiervan -m te gebruiken.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1924,7 +1880,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: fout tijdens verwijderen van map %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2044,6 +2000,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2082,6 +2044,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s: naam %s is niet uniek\n"
+
+#~ msgid "No\n"
+#~ msgstr "Nee\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/nn.po
===================================================================
--- upstream/trunk/po/nn.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/nn.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+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"
@@ -25,7 +25,6 @@
 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"
 
@@ -37,19 +36,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Åtvaring: ukjent gruppe %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Åtvaring: for mange grupper\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Passordet ditt er utgått."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Passordet ditt er inaktivt."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Innlogginga di er utgått."
 
@@ -63,11 +58,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Passordet ditt vil utgå om %ld dagar.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Passordet ditt vil utgå i morgon.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Passordet ditt vil utgå i dag.\n"
 
@@ -75,7 +68,6 @@
 msgid "Unable to change tty %s"
 msgstr "Klarer ikkje skifta tty %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Miljø overflyt\n"
 
@@ -93,7 +85,6 @@
 msgstr[0] "%d %s sidan førre innlogging. Førre var %s på %s.\n"
 msgstr[1] "%d %s sidan førre innlogging. Førre var %s på %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "For mange innloggingar.\n"
 
@@ -190,7 +181,6 @@
 msgid "%s's Password: "
 msgstr "%s sitt passord: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -209,7 +199,6 @@
 "\n"
 msgstr ""
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Skriv inn den nye verdien eller trykk Enter for standard\n"
 
@@ -231,27 +220,26 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Dato for når kontoen utgår (ÅÅÅÅ-MM-DD)"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Førre passordendring (ÅÅÅÅ-MM-DD)"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "never\n"
 msgstr "Aldri\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "Passord er endra\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Passord utgår:\t"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Passord inaktiv:\t"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Konto utgår:\t"
 
@@ -280,18 +268,14 @@
 msgstr "%s: PAM-autentisering feila\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: klarer ikkje låsa passordfil\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: klarer ikkje opna passordfil\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: ukjend brukar %s\n"
-
-#, fuzzy, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: klarer ikkje opna skuggepassordfila\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: klarer ikkje låsa skuggepassordfila\n"
 
@@ -300,18 +284,14 @@
 msgstr "%s: klarer ikkje opna skuggepassordfila\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr ""
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: klarer ikkje skriva ny skuggepassordfil\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Endrar aldringsformasjonen for %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: klarer ikkje skriva ny passordfil\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: feil ved endring av felt\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: klarer ikkje oppdatere passordfil\n"
 
@@ -319,15 +299,27 @@
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: klarer ikkje oppdatere skuggepassordfil\n"
 
+#, fuzzy, c-format
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: klarer ikkje opna skuggepassordfila\n"
+
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: klarer ikkje skriva ny skuggepassordfil\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr ""
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: klarer ikkje skriva ny passordfil\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: ukjend brukar %s\n"
 
 #, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Endrar aldringsformasjonen for %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: feil ved endring av felt\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -370,22 +362,28 @@
 msgid "Other"
 msgstr "Anna"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Klarer ikkje avgjere brukarnamnet ditt.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Klarer ikkje endra ID til root.\n"
 
-#, fuzzy, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: klarer ikkje endra brukar «%s» på NIS-klient.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "Klarer ikkje låsa passordfila, prøv igjen seinare.\n"
 
-#, fuzzy, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: «%s» er NIS-hovud for denne klienten.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Klarer ikkje opna passordfila.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Endrar brukarinformasjon for %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s ikkje funne i /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Feil ved oppdatering av passordet.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Klarer ikkje utføra endringar i passordfila.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Klarer ikkje låsa opp passordfila.\n"
+
 #, fuzzy, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: ugyldig namn: «%s»\n"
@@ -407,38 +405,26 @@
 msgstr "%s: «%s» inneheld ulovlege teikn\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: felta er for lange\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Klarer ikkje avgjere brukarnamnet ditt.\n"
 
-#, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Klarer ikkje endra ID til root.\n"
+#, fuzzy, c-format
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: klarer ikkje endra brukar «%s» på NIS-klient.\n"
 
-#, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Klarer ikkje låsa passordfila, prøv igjen seinare.\n"
+#, fuzzy, c-format
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: «%s» er NIS-hovud for denne klienten.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Klarer ikkje opna passordfila.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Endrar brukarinformasjon for %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s ikkje funne i /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s: felta er for lange\n"
 
 #, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Feil ved oppdatering av passordet.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Klarer ikkje utføra endringar i passordfila.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Klarer ikkje låsa opp passordfila.\n"
-
-#, c-format
 msgid ""
 "Usage: %s [options]\n"
 "\n"
@@ -488,6 +474,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: klarer ikkje opna skuggepassordfila\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: feil ved oppdatering av skuggepassordfila\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: feil ved oppdatering av gruppeoppføring\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: linje %d: linja er for lang\n"
@@ -500,15 +494,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: linje %d: ukjent brukar %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: linje %d: klarer ikkje oppdatere passordet\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: linje %d: kan ikkje oppdatere oppføring\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: feil funne, endringar er ikkje utført\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: klarer ikkje låsa skuggepassordfila\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: feil ved oppdatering av skuggepassordfila\n"
 
@@ -517,18 +515,13 @@
 msgstr "%s: feil ved oppdatering av passordfila\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: klarer ikkje låsa passordfil\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: klarer ikkje låsa skuggepassordfila\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: linje %d: ukjent brukar %s\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: linje %d: klarer ikkje oppdatere passordet\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -557,7 +550,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s er eit ugyldig skal.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Bruk: expiry {-f|-c}\n"
 
@@ -565,7 +557,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: ukjent brukar\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -585,7 +576,6 @@
 "\n"
 msgstr ""
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr ""
 
@@ -626,14 +616,38 @@
 msgstr "%s: skuggepassord for gruppe krevst for -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Kven er du?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: klarer ikkje få lås\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: klarer ikkje skriva ny fila\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: klarer ikkje skriva ny skuggefil\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: klarer ikkje låsa opp fil\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: klarer ikkje oppdatere oppføring\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: klarer ikkje oppdatere skuggeoppføring\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "ukjent gruppe: %s\n"
 
@@ -646,22 +660,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Fjernar brukaren %s frå gruppa %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: ukjent medlem %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: Ikkje ein tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Endrar passordet for gruppa %s\n"
 
@@ -678,35 +676,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Prøv igjen seinare\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: klarer ikkje få lås\n"
+msgid "Who are you?\n"
+msgstr "Kven er du?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: klarer ikkje få lås på skuggefil\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Legg brukaren %s til gruppa %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: klarer ikkje oppdatere oppføring\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Fjernar brukaren %s frå gruppa %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: klarer ikkje oppdatere skuggeoppføring\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: ukjent medlem %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: klarer ikkje skriva ny fila\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: Ikkje ein tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: klarer ikkje skriva ny skuggefil\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: klarer ikkje låsa opp fil\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -725,15 +713,7 @@
 msgid "%s: error adding new group entry\n"
 msgstr "%s: feil ved oppretting av ny gruppeoppføring\n"
 
-#, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: namn %s er ikkje unikt\n"
-
 #, fuzzy, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: gid %u er ikkje unikt\n"
-
-#, fuzzy, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: klarer ikkje få unikt gid\n"
 
@@ -773,7 +753,10 @@
 msgid "%s: group %s exists\n"
 msgstr "%s: gruppa %s finst allereie\n"
 
-#, c-format
+#, fuzzy, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: gid %u er ikkje unikt\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Bruk: goupdel gruppe\n"
 
@@ -801,47 +784,40 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s er NIS-hovudet\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr ""
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr ""
 
-#, c-format
 msgid "Group access is required\n"
 msgstr ""
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "PAM authentication failed for\n"
 msgstr "%s: PAM-autentisering feila\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to lock group file\n"
 msgstr "%s: klarer ikkje låsa gruppefil\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to open group file\n"
 msgstr "%s: klarer ikkje opna gruppefil\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Cannot close group file\n"
 msgstr "%s: klarer ikkje opna gruppefila\n"
 
-#, c-format
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -851,6 +827,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 
@@ -874,10 +851,6 @@
 msgid "Usage: %s [-r] [-s] [group]\n"
 msgstr "Bruk: %s [-r] [-s] [gruppe]\n"
 
-#, fuzzy, c-format
-msgid "No\n"
-msgstr "Nei"
-
 #, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s og -r er inkompatible\n"
@@ -891,6 +864,9 @@
 msgstr "%s: klarer ikkje opna fila %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: klarer ikkje oppdatere fila %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "ugyldig oppføring for gruppefil\n"
 
@@ -898,7 +874,6 @@
 msgid "delete line '%s'? "
 msgstr "slett linja «%s»? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "duplisert gruppeoppføring\n"
 
@@ -930,11 +905,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: klarer ikkje oppdatere oppføring for gruppa %s\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "ugyldig oppføring av skuggegruppefil\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "duplisert oppføring for skuggegruppe\n"
 
@@ -951,10 +924,6 @@
 msgstr "skuggegruppe %s: ingen brukar %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: klarer ikkje oppdatere fila %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: filene er oppdaterte\n"
 
@@ -986,19 +955,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: klan ikkje slette skuggegruppefil\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Bruk: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Bruk: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " grupper="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1011,17 +976,19 @@
 "\n"
 msgstr ""
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Brukarnamn       Port     Frå              Siste\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Brukarnamn              Port     Siste\n"
 
 msgid "**Never logged in**"
 msgstr "**Aldri vore innlogga**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Ukjent brukar: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr ""
@@ -1038,11 +1005,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "      %s [-p] -r vert\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Ugyldig innloggingstid\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1050,7 +1015,6 @@
 "\n"
 "Systemet stengt for rutinemessig vedlikehald\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1094,7 +1058,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr ""
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr ""
 
@@ -1113,6 +1076,10 @@
 msgid "%s: failure forking: %s"
 msgstr ""
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 "Åtvaring: innlogging gjort mogeleg igjen etter mellombels utestenging.\n"
@@ -1134,14 +1101,16 @@
 "\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Bruk: newgrp [-] [gruppe]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Bruk: sg gruppe [[-c] kommando]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Gamalt passord:"
+
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "ukjent GID: %lu\n"
@@ -1150,11 +1119,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "ukjent GID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Gamalt passord:"
-
-#, c-format
 msgid "too many groups\n"
 msgstr "for mange grupper\n"
 
@@ -1166,7 +1130,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: gruppe %s eksisterer ikkje\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: klarer ikkje låsa /etc/passwd.\n"
 
@@ -1179,6 +1153,10 @@
 msgstr "%s: klarer ikkje opna filer\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: feil ved oppdatering av filer\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: linje %d: ugyldig linje\n"
 
@@ -1210,11 +1188,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: linje %d: kan ikkje oppdatere oppføring\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: feil ved oppdatering av filer\n"
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1262,11 +1235,9 @@
 msgid "New password: "
 msgstr "Nytt passord: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Prøv igjen.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1275,7 +1246,6 @@
 "Åtvaring: Svakt passord (skriv det inn ein gong til for å bruka det "
 "likevel).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Passorda er ikkje like, prøv igjen.\n"
 
@@ -1313,11 +1283,10 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Passordet til %s er ikkje endra.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Passord er endra.\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Password set to expire.\n"
 msgstr "Passordet ditt er utgått."
 
@@ -1325,11 +1294,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Bruk: %s [-q] [-r] [-s] [passord [skugge]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "Ugyldig oppføring i passordfila\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "duplisert oppføring i passordfila\n"
 
@@ -1361,11 +1328,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: klarer ikkje oppdatere oppføring i passordfila for %s\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "ugyldig oppføring i skuggepassordfila\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "duplisert oppføring i skuggepassordfila\n"
 
@@ -1401,15 +1366,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: klarer ikkje sletta skuggepassordfil\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Tilgang til su for den kontoen er AVVIST.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Passordautentisering er forbigått.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Oppgje ditt EIGE passord for autentisering.\n"
 
@@ -1417,7 +1379,6 @@
 msgid "%s: %s\n"
 msgstr "passwd: %s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1459,15 +1420,15 @@
 "%s: %s\n"
 "(Ignorert)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Ingen skal\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Inga passordfil\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Inga passordoppføring for «root»\n"
 
@@ -1511,7 +1472,6 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: for mange grupper spesifisert (maks %d).\n"
 
-#, c-format
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1532,6 +1492,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1552,11 +1514,11 @@
 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"
+msgid "%s: can't get unique UID (no more available UIDs)\n"
+msgstr "%s: klarer ikkje få unikt gid\n"
 
 #, fuzzy, c-format
-msgid "%s: can't get unique UID\n"
+msgid "%s: can't get unique GID (no more available GIDs)\n"
 msgstr "%s: klarer ikkje få unikt gid\n"
 
 #, fuzzy, c-format
@@ -1650,7 +1612,6 @@
 msgid "Creating mailbox file"
 msgstr ""
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1669,6 +1630,10 @@
 "%s: gruppa %s finst - viss du ønskjer å leggja brukaren til denne gruppa, "
 "bruk -g.\n"
 
+#, fuzzy, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: gid %u er ikkje unikt\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1679,7 +1644,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: åtvaring: CREATE_HOME ikkje støtta, bruk -m istaden.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1748,7 +1712,6 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: feil ved fjerning av mappe %s\n"
 
-#, c-format
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -1840,6 +1803,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -1869,7 +1838,14 @@
 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"
 
+#~ msgid "%s: name %s is not unique\n"
+#~ msgstr "%s: namn %s er ikkje unikt\n"
+
 #, fuzzy
+#~ msgid "No\n"
+#~ msgstr "Nei"
+
+#, fuzzy
 #~ msgid "No password.\n"
 #~ msgstr "Inga passordfil\n"
 

Modified: upstream/trunk/po/pl.po
===================================================================
--- upstream/trunk/po/pl.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/pl.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-25 20:53+0100\n"
 "Last-Translator: Tomasz Kłoczko <kloczek at pld.org.pl>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@ -27,7 +27,6 @@
 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"
 
@@ -40,19 +39,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Ostrzeżenie: nieznana grupa %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Ostrzeżenie: zbyt wiele grup\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Twoje hasło straciło ważność."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Twoje hasło jest nieaktywne."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Twoje konto straciło ważność."
 
@@ -66,11 +61,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Twoje hasło straci ważność w ciągu %ld dni.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Jutro twoje hasło straci ważność.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Dziś twoje hasło straci ważność.\n"
 
@@ -78,7 +71,6 @@
 msgid "Unable to change tty %s"
 msgstr "Nie można zmienić tty %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Przepełnienie środowiska\n"
 
@@ -103,7 +95,6 @@
 "%d nieudanych prób logowania od ostatniego logowania.\n"
 "Ostatnie logowanie: dnia %s na terminalu %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Zbyt wiele otwartych sesji.\n"
 
@@ -199,7 +190,6 @@
 msgid "%s's Password: "
 msgstr "Hasło użytkownika %s: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -238,7 +228,6 @@
 "                                upływem ważności hasła\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Wpisz nową wartość lub wciśnij ENTER by przyjąć wartość domyślną\n"
 
@@ -260,27 +249,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Data utraty ważności konta (RRRR-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Ostatnia zmiana hasła\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "nigdy\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "Hasło musi zostać zmienione\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Hasło traci ważność\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Hasło nieaktywne\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Konto traci ważność\t\t\t\t\t: "
 
@@ -309,18 +292,14 @@
 msgstr "%s: błąd podczas uwierzytelniania przez PAM\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: nie można zablokować pliku z hasłami\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: nie można otworzyć pliku z hasłami\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: nieznany użytkownik %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: brak pliku z ukrytymi hasłami\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: nie można zablokować pliku z ukrytymi hasłami\n"
 
@@ -329,18 +308,14 @@
 msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: niepowiodło się porzucenie uprawnień (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: nie można przepisać pliku z ukrytymi hasłami\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Zmieniam informację o użytkowniku %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: nie można przepisać pliku z hasłami\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: błąd podczas zmieniania pól\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: nie można zaktualizować pliku z hasłami\n"
 
@@ -349,14 +324,26 @@
 msgstr "%s: nie można zaktualizować pliku z ukrytymi hasłami\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: nie można przepisać pliku z ukrytymi hasłami\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: brak pliku z ukrytymi hasłami\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: nie można przepisać pliku z hasłami\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: niepowiodło się porzucenie uprawnień (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: nieznany użytkownik %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Zmieniam informację o użytkowniku %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: błąd podczas zmieniania pól\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -400,22 +387,28 @@
 msgid "Other"
 msgstr "Inne"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Nie można ustalić twojej nazwy użytkownika.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Nie można zmienić ID na root.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: nie można zmienić użytkownika '%s' na kliencie NIS.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "Nie można zablokować pliku z hasłami; spróbuj później.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: '%s' jest nadrzędnym serwerem NIS dla tego klienta.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Nie można otworzyć pliku z hasłami.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Zmieniam informację o użytkowniku %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: nie znaleziono %s w /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Błąd podczas aktualizacji wpisu do bazy haseł.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Wprowadzenie zmian do pliku passwd jest niemożliwe.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Nie można usunąć blokady z pliku z hasłami.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: nieprawidłowa nazwa: '%s'\n"
@@ -437,37 +430,25 @@
 msgstr "%s: '%s' zawiera nieprawidłowe znaki\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: pola zbyt długie\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Nie można ustalić twojej nazwy użytkownika.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Nie można zmienić ID na root.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: nie można zmienić użytkownika '%s' na kliencie NIS.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Nie można zablokować pliku z hasłami; spróbuj później.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: '%s' jest nadrzędnym serwerem NIS dla tego klienta.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Nie można otworzyć pliku z hasłami.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Zmieniam informację o użytkowniku %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: nie znaleziono %s w /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s: pola zbyt długie\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Błąd podczas aktualizacji wpisu do bazy haseł.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Wprowadzenie zmian do pliku passwd jest niemożliwe.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Nie można usunąć blokady z pliku z hasłami.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -526,6 +507,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: błąd podczas aktualizacji pliku z ukrytymi hasłami\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: błąd podczas aktualizacji wpisu grupy\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: linia %d: linia zbyt długa\n"
@@ -538,15 +527,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: linia %d: nieznana grupa %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: linia %d: nie można zaktualizować wpisu do bazy haseł\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: linia %d: nie można zaktualizować wpisu\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: wykryto błąd, zignorowano modyfikacje\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: nie można zablokować pliku z ukrytymi hasłami\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: błąd podczas aktualizacji pliku z ukrytymi hasłami\n"
 
@@ -555,18 +548,13 @@
 msgstr "%s: błąd podczas aktualizacji pliku z hasłami\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: nie można zablokować pliku z hasłami\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: nie można zablokować pliku z ukrytymi hasłami\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: linia %d: nieznany użytkownik %s\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: linia %d: nie można zaktualizować wpisu do bazy haseł\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -601,7 +589,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s jest nieprawidłową powłoką.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Użycie: expiry {-f|-c}\n"
 
@@ -609,7 +596,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: nieznany użytkownik\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -644,7 +630,6 @@
 "                        -m lub -l) tylko dla użytkownika o loginie LOGIN\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Nieudane Maks.   Ostanio                  Na\n"
 
@@ -685,14 +670,38 @@
 msgstr "%s: plik z ukrytymi hasłami grup wymagany dla -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Kim jesteś?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: nie można zablokować\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: nie można przepisać pliku\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: nie można przepisać pliku z ukrytymi hasłami\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: nie można usunąć blokady z pliku\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: nie można zaktualizować wpisu\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: nie można zaktualizować wpisu do pliku z ukrytymi hasłami\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "nieznana grupa: %s\n"
 
@@ -705,22 +714,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Usuwam użytkownika %s z grupy %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: nieznany członek %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: To nie tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Zmieniam hasło dla grupy %s\n"
 
@@ -737,35 +730,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Spróbuj ponownie później\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: nie można zablokować\n"
+msgid "Who are you?\n"
+msgstr "Kim jesteś?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: nie można zablokować pliku z ukrytymi hasłami\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Dodaję nowego użytkownika %s do grupy %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: nie można zaktualizować wpisu\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Usuwam użytkownika %s z grupy %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: nie można zaktualizować wpisu do pliku z ukrytymi hasłami\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: nieznany członek %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: nie można przepisać pliku\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: To nie tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: nie można przepisać pliku z ukrytymi hasłami\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: nie można usunąć blokady z pliku\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -796,14 +779,6 @@
 msgstr "%s: błąd podczas dodawania nowej grupy\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: nazwa %s nie jest niepowtarzalny\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u nie jest niepowtarzalny\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: nie można uzyskać niepowtarzalnego GID\n"
 
@@ -844,6 +819,9 @@
 msgstr "%s: grupa %s istnieje\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u nie jest niepowtarzalny\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Użycie: groupdel grupa\n"
 
@@ -871,47 +849,37 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s jest głównym serwerem NIS\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "Członek grupy już istnieje\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "Nie znaleziony członek grupy do usunięcia\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "Tylko root może dodać członka do różnych grup\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "Wymagane prawa dostępu do grupy\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "Nie jesteś głównym właścicielem bieżącej grupy\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "Błąd uwierzytelniania przez PAM dla\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "Nie można zablokować pliku z grupami\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "Nie można otworzyć pliku z grupami\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "Nie można zamknąć pliku z grupami\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -921,6 +889,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Użycie: groupmod [opcje] GRUPA\n"
@@ -956,10 +925,6 @@
 msgstr "Użycie: %s [-r] [-s] [grupa]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Nie\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s i -r są niekompatybilne\n"
 
@@ -972,6 +937,9 @@
 msgstr "%s: nie można otworzyć pliku %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: nie można zaktualizować pliku %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "nieprawidłowy wpis do pliku grup\n"
 
@@ -979,7 +947,6 @@
 msgid "delete line '%s'? "
 msgstr "usunąć linię '%s'? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "powtórzony wpis w pliku grup\n"
 
@@ -1011,11 +978,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: nie można zaktualizować wpisu dla grupy %s\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "nieprawidłowy wpis w pliku z ukrytymi hasłami grup\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "powtórzony wpis w pliku z ukrytymi hasłami grup\n"
 
@@ -1034,10 +999,6 @@
 msgstr "grupa %s: użytkownik %s z pliku ukrytych haseł grup nie istnieje\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: nie można zaktualizować pliku %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: pliki zostały zaktualizowane\n"
 
@@ -1069,19 +1030,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: nie można skasować pliku z ukrytymi hasłami grup\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Użycie: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Użycie: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " grupy="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1103,17 +1060,19 @@
 "                        o loginie LOGIN\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Użytkownik       Port     Z                Ostatnio\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Użytkownik             Port     Ostatnio\n"
 
 msgid "**Never logged in**"
 msgstr "**Nigdy nie zalogowany**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Nieznany użytkownik: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: nieoczekiwany argument: %s\n"
@@ -1130,11 +1089,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "        %s [-p] -r host\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Nieprawidłowy czas logowania\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1142,7 +1099,6 @@
 "\n"
 "System zamknięty do rutynowej konserwacji.\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1182,7 +1138,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Maksymalna ilość prób przekroczona (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: przerwanie wywołane przez PAM\n"
 
@@ -1201,6 +1156,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: failure forking: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Ostrzeżenie: logowanie ponownie odblokowanie po czasowej blokadzie.\n"
 
@@ -1223,14 +1182,16 @@
 "przekroczony czas logowania\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Użycie: newgrp [-] [grupa]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Użycie: sg grupa [[-c] polecenie]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Stare hasło: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "nieznany UID: %u\n"
@@ -1239,11 +1200,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "nieznany GID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Stare hasło: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "zbyt wiele grup\n"
 
@@ -1255,7 +1211,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: grupa %s nie istnieje\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: nie można zablokować /etc/passwd.\n"
 
@@ -1268,6 +1234,10 @@
 msgstr "%s: nie można otworzyć plików\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: błąd podczas aktualizowania plików\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: linia %d: nieprawidłowa linia\n"
 
@@ -1299,11 +1269,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: linia %d: nie można zaktualizować wpisu\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: błąd podczas aktualizowania plików\n"
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1377,11 +1342,9 @@
 msgid "New password: "
 msgstr "Nowe hasło: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Spróbuj ponownie.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1389,7 +1352,6 @@
 "\n"
 "Ostrzeżenie: słabe hasło (wpisz je ponowie jeśli jednak chcesz go użyć).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Nie zgadzają się; spróbuj ponownie.\n"
 
@@ -1427,11 +1389,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Hasło dla %s pozostaje niezmienione.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Hasło zmienione.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Hasłu zaznaczone jako przeterminowane.\n"
 
@@ -1439,11 +1399,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Użycie: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "nieprawidłowy wpis do pliku z hasłami\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "powtórzony wpis w pliku z hasłami\n"
 
@@ -1475,11 +1433,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: nie można zaktualizować wpisu w pliku z hasłami dla %s\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "nieprawidłowy wpis w pliku z hasłami\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "powtórzony wpis w pliku z ukrytymi hasłami\n"
 
@@ -1515,15 +1471,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: nie można skasować pliku z ukrytymi hasłami\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Dostęp do polecenia su z tego konta ZABRONIONY.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Uwierzytelnianie na podstawie hasła pominięte.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Proszę wpisz swoje WŁASNE hasło jako hasło uwierzytelniające.\n"
 
@@ -1531,7 +1484,6 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1583,15 +1535,15 @@
 "%s: %s\n"
 "(Zignorowano)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Brak powłoki\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Brak pliku z hasłami\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Brak wpisu do bazy haseł dla 'root'\n"
 
@@ -1635,7 +1587,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: podano zbyt wiele grup (maks %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1656,6 +1608,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1706,14 +1660,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: nie można uzyskać niepowtarzalnego UID\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: nie można uzyskać niepowtarzalnego GID\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: nieprawidłowy katalog bazowy '%s'\n"
@@ -1805,7 +1759,6 @@
 msgid "Creating mailbox file"
 msgstr "Tworzenie pliku mailbox"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1826,6 +1779,10 @@
 "%s: grupa %s istnieje - aby dodać tego użytkownika do tej grupy, użyj -g.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u nie jest niepowtarzalny\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1837,7 +1794,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: uwaga: CREATE_HOME nie jest obsługiwane, użyj opcji -m.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1916,7 +1872,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: błąd podczas usuwania katalogu %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2033,6 +1989,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2071,6 +2033,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s: nazwa %s nie jest niepowtarzalny\n"
+
+#~ msgid "No\n"
+#~ msgstr "Nie\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/pt.po
===================================================================
--- upstream/trunk/po/pt.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/pt.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-26 22:45+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -24,7 +24,6 @@
 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"
 
@@ -37,19 +36,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Aviso: grupo desconhecido %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Aviso: demasiados grupos\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "A sua password expirou."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "A sua password está inactiva."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "O seu login expirou."
 
@@ -63,11 +58,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "A sua password vai expirar em %ld dias.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "A sua password vai expirar amanhã.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "A sua password vai expirar hoje.\n"
 
@@ -75,7 +68,6 @@
 msgid "Unable to change tty %s"
 msgstr "Foi impossível mudar o tty %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Overflow do ambiente\n"
 
@@ -93,7 +85,6 @@
 msgstr[0] "%d falha desde o último login. O último foi %s em %s.\n"
 msgstr[1] "%d falhas desde o último login. O último foi %s em %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Demasiados logins.\n"
 
@@ -190,7 +181,6 @@
 msgid "%s's Password: "
 msgstr "Password de %s: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -228,7 +218,6 @@
 "                                para aviso de expirar\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Introduza o novo valor, ou pressione ENTER para o valor por omissão\n"
 
@@ -250,27 +239,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Data de Caducidade da Conta (YYYY-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Última alteração da password\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "nunca\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "a password tem de ser alterada\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "A password expira em\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Password inactiva\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "A conta expira\t\t\t\t\t\t: "
 
@@ -299,18 +282,14 @@
 msgstr "%s: A autenticação PAM falhou\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: não é possível obter acesso exclusivo ao ficheiro de passwords\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: não é possível abrir o ficheiro de passwords\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: utilizador desconhecido %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: o ficheiro de passwords shadow não está presente\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr ""
 "%s: não é possível obter acesso exclusivo ao ficheiro de passwords shadow\n"
@@ -320,18 +299,14 @@
 msgstr "%s: não é possível abrir o ficheiro de passwords shadow\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: falhou baixar privilégios (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: não é possível reescrever o ficheiro de passwords shadow\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "A alterar a informação de envelhecimento de %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: não é possível reescrever o ficheiro de passwords\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: erro na alteração de campos\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: não é possível actualizar o ficheiro de passwords\n"
 
@@ -340,14 +315,26 @@
 msgstr "%s: não é possível actualizar o ficheiro de passwords shadow\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: não é possível reescrever o ficheiro de passwords shadow\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: o ficheiro de passwords shadow não está presente\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: não é possível reescrever o ficheiro de passwords\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: falhou baixar privilégios (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: utilizador desconhecido %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "A alterar a informação de envelhecimento de %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: erro na alteração de campos\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -392,22 +379,31 @@
 msgid "Other"
 msgstr "Outra Informação"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Não é possível determinar o seu nome de utilizador.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Não é possível alterar o ID para root.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: não é possível alterar o utilizador '%s' no cliente NIS.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr ""
+"Não é possível obter acesso exclusivo ao ficheiro de passwords; tente "
+"novamente mais tarde.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: '%s' é o NIS master para este cliente.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Não é possível abrir o ficheiro de passwords.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "A alterar a informação de utilizador de %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s não foi encontrado em /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Erro ao actualizar o registo da password.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr ""
+"Não é possível gravar as alteração efectuadas ao ficheiros de passwords.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Não é possível libertar o ficheiro de passwords.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: nome inválido: '%s'\n"
@@ -429,40 +425,25 @@
 msgstr "%s: '%s' contém caracteres não permitidos.\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: valores demasiado grandes\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Não é possível determinar o seu nome de utilizador.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Não é possível alterar o ID para root.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: não é possível alterar o utilizador '%s' no cliente NIS.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr ""
-"Não é possível obter acesso exclusivo ao ficheiro de passwords; tente "
-"novamente mais tarde.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: '%s' é o NIS master para este cliente.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Não é possível abrir o ficheiro de passwords.\n"
+msgid "Changing the user information for %s\n"
+msgstr "A alterar a informação de utilizador de %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s não foi encontrado em /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s: valores demasiado grandes\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Erro ao actualizar o registo da password.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr ""
-"Não é possível gravar as alteração efectuadas ao ficheiros de passwords.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Não é possível libertar o ficheiro de passwords.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -521,6 +502,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: não é possível abrir o ficheiro shadow\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: erro a actualizar o ficheiro shadow\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: erro ao actualizar o registo do grupo\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: linha %d: linha demasiado grande\n"
@@ -533,15 +522,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: linha %d: grupo %s desconhecido\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: linha %d: não é possível actualizar o registo da password\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: linha %d: não é possível actualizar o registo\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: foi detectado um erro, as alterações foram ignoradas\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: não é possível obter acesso exclusivo ao ficheiro shadow\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: erro a actualizar o ficheiro shadow\n"
 
@@ -550,18 +543,13 @@
 msgstr "%s: erro a actualizar o ficheiro de passwords\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: não é possível obter acesso exclusivo ao ficheiro de passwords\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: não é possível obter acesso exclusivo ao ficheiro shadow\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: linha %d: utilizador %s desconhecido\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: linha %d: não é possível actualizar o registo da password\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -597,7 +585,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s é uma shell inválida.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Utilização: expiry {-f|-c}\n"
 
@@ -605,7 +592,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: utilizador desconhecido\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -644,7 +630,6 @@
 "                                utilizador com o login LOGIN\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Falhas   Máximo  Última                   Em\n"
 
@@ -685,14 +670,38 @@
 msgstr "%s: passwords shadow de grupo necessárias para -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Quem é você?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: não é possível obter acesso exclusivo\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: não é possível reescrever o ficheiro\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: não é possível reescrever o ficheiro de shadow\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: não é possível libertar o ficheiro\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: não é possível actualizar o registo\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: não é possível actualizar o registo do shadow\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "grupo desconhecido: %s\n"
 
@@ -705,22 +714,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "A remover o utilizador %s do grupo %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: membro desconhecido %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: Não é um tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "A alterar a password para o grupo %s\n"
 
@@ -737,35 +730,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Tente de novo mais tarde\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: não é possível obter acesso exclusivo\n"
+msgid "Who are you?\n"
+msgstr "Quem é você?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: não é possível obter acesso exclusivo a shadow\n"
+msgid "Adding user %s to group %s\n"
+msgstr "A adicionar o utilizador %s ao grupo %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: não é possível actualizar o registo\n"
+msgid "Removing user %s from group %s\n"
+msgstr "A remover o utilizador %s do grupo %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: não é possível actualizar o registo do shadow\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: membro desconhecido %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: não é possível reescrever o ficheiro\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: Não é um tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: não é possível reescrever o ficheiro de shadow\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: não é possível libertar o ficheiro\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -796,14 +779,6 @@
 msgstr "%s: erro ao adicionar o registo do novo grupo\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: o nome %s não é único\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u não é único\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: não é possível obter um GID único\n"
 
@@ -845,6 +820,9 @@
 msgstr "%s: o grupo %s existe\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u não é único\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Utilização: groupdel grupo\n"
 
@@ -872,49 +850,39 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s é o NIS master\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "O membro já existe\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "O membro a remover não foi encontrado\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 "Utilização: groupmems -a nomeutilizador | -d nomeutilizador | -D | -l [-g "
 "nomegrupo]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "Apenas o root pode acrescentar membros a diferentes grupos\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "É necessário acesso ao grupo\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "Não é o dono primário do actual grupo\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "A autenticação PAM falhou para\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "Não é possível obter acesso exclusivo ao ficheiro dos grupos\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "Não é possível abrir o ficheiro dos grupos\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "Não é possível abrir o ficheiro dos grupos\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -924,6 +892,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Utilização: groupmod [opções] GRUPO\n"
@@ -958,10 +927,6 @@
 msgstr "Utilização: %s [-r] [-s] [grupo]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Não\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s e -r são incompatíveis\n"
 
@@ -974,6 +939,9 @@
 msgstr "%s: não é possível abrir o ficheiro %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: não é possível actualizar o ficheiro %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "um registo no ficheiro dos grupos é inválido\n"
 
@@ -981,7 +949,6 @@
 msgid "delete line '%s'? "
 msgstr "apagar a linha '%s'? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "registo de grupo duplicado\n"
 
@@ -1013,11 +980,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: não é possível actualizar o registo do grupo %s\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "o registo no ficheiro de shadow dos grupos é inválido\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "registo de grupo em shadow duplicado\n"
 
@@ -1034,10 +999,6 @@
 msgstr "grupo shadow %s: o utilizador %s não existe\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: não é possível actualizar o ficheiro %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: os ficheiros foram actualizados\n"
 
@@ -1070,19 +1031,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: não é possível apagar o ficheiro de shadow dos grupos.\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Utilização: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Utilização: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " grupos="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1106,17 +1063,19 @@
 "                                utilizador LOGIN\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Utilizador       Porto    De               Último\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Utilizador              Port     Último\n"
 
 msgid "**Never logged in**"
 msgstr "**Nunca entrou no sistema**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Utilizador Deconhecido: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: argumento inesperado: %s\n"
@@ -1133,11 +1092,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "            %s [-p] -r host\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Tempo de login inválido\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1145,7 +1102,6 @@
 "\n"
 "Sistema encerrado para manutenção de rotina\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1185,7 +1141,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Número máximo de tentativas excedidas (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: abortar pedido por PAM\n"
 
@@ -1204,6 +1159,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: falha no fork: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Aviso: o login foi novamente permitido após um tempo de bloqueio.\n"
 
@@ -1226,14 +1185,16 @@
 "tempo para login excedido\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Utilização: newgrp [-] [grupo]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Utilização: sg grupo [[-c] comando]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Password antiga: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "GID desconhecido: %u\n"
@@ -1242,11 +1203,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "GID desconhecido: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Password antiga: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "demasiados grupos\n"
 
@@ -1258,7 +1214,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: o grupo %s não existe.\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\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"
 
@@ -1272,6 +1238,10 @@
 msgstr "%s: não é possível abrir ficheiros\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: erro ao actualizar ficheiros\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: linha %d: linha inválida\n"
 
@@ -1303,11 +1273,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: linha %d: não é possível actualizar o registo\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: erro ao actualizar ficheiros\n"
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1382,11 +1347,9 @@
 msgid "New password: "
 msgstr "Nova password: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Tente de novo.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1394,7 +1357,6 @@
 "\n"
 "Aviso: password fraca (introduza-a de novo para usá-la mesmo assim).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Não coincidem; tente de novo.\n"
 
@@ -1432,11 +1394,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "A password de %s não foi alterada.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Password alterada.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Password definida para expirar.\n"
 
@@ -1444,11 +1404,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Utilização: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "registo no ficheiro de passwords inválido\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "registo de password duplicado\n"
 
@@ -1480,11 +1438,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: não é possível actualizar o registo em passwd de %s\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "registo no ficheiro de shadow de passwords inválido\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "registo de shadow da password duplicado\n"
 
@@ -1520,15 +1476,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: não é possível apagar o ficheiro de shadow de passwords\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Acesso a su para essa conta foi NEGADO.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Autenticação por password foi ultrapassada.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Por favor introduza a SUA password como autenticação.\n"
 
@@ -1536,7 +1489,6 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1589,15 +1541,15 @@
 "%s: %s\n"
 "(Ignorado)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Sem shell\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Ficheiro de passwords não existe\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Não está definida nenhuma password para 'root'\n"
 
@@ -1641,7 +1593,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: estão especificados demasiados grupos (max %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1662,6 +1614,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1716,14 +1670,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: não é possível obter um UID único\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: não é possível obter um GID único\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: directório base inválido '%s'\n"
@@ -1818,7 +1772,6 @@
 msgid "Creating mailbox file"
 msgstr "Criar ficheiro mailbox"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1840,6 +1793,10 @@
 "utilize -g.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u não é único\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1852,7 +1809,6 @@
 msgstr ""
 "%s: aviso: CREATE_HOME não é suportado, por favor em vez disso utilize -m.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1932,7 +1888,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: erro ao remover o directório %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2054,6 +2010,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2090,6 +2052,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s: o nome %s não é único\n"
+
+#~ msgid "No\n"
+#~ msgstr "Não\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/pt_BR.po
===================================================================
--- upstream/trunk/po/pt_BR.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/pt_BR.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-26 11:23+0100\n"
 "Last-Translator: André Luís Lopes <andrelop at debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -24,7 +24,6 @@
 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"
 
@@ -37,19 +36,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Aviso : grupo desconhecido %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Aviso : muitos grupos\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Sua senha expirou."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Sua senha está inativa."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Seu login expirou."
 
@@ -63,11 +58,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Sua senha irá expirar em %ld dias.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Sua senha irá expirar amanhã.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Sua senha irá expirar hoje.\n"
 
@@ -75,7 +68,6 @@
 msgid "Unable to change tty %s"
 msgstr "Não foi possível mudar tty %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Overflow de ambiente\n"
 
@@ -97,7 +89,6 @@
 "%d falhas desde o último login.\n"
 "O último foi %s em %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Muitos logins.\n"
 
@@ -194,7 +185,7 @@
 msgid "%s's Password: "
 msgstr "Senha de %s : "
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -231,7 +222,6 @@
 "                                   AVISO_DIAS\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Informe o novo valor ou pressione ENTER para aceitar o padrão\n"
 
@@ -253,27 +243,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Data de Expiração de Senha (YYYY-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Última mudança de senha\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "nunca\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "Senha modificada\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Senha expira\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Senha inativa\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Conta expira\t\t\t\t\t\t: "
 
@@ -302,18 +286,14 @@
 msgstr "%s : autenticação PAM falhou\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s : não foi possível obter lock em arquivo de senhas\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s : não foi possível abrir o arquivo de senhas\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s : usuário %s desconhecido\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s : o arquivo de senhas shadow não está presente\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s : não foi possível obter lock em arquivos de senhas shadow\n"
 
@@ -322,18 +302,14 @@
 msgstr "%s : não foi possível abrir arquivo de senhas shadow\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: falha ao abandonar privilégios (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s : não foi possível reescrever arquivo de senhas shadow\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Mudando a informação de idade para %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s : não foi possível reescrever arquivo de senhas\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s : erro modificando campos\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s : não foi possível atualizar arquivo de senhas\n"
 
@@ -342,14 +318,26 @@
 msgstr "%s : não foi possível atualizar arquivos de senhas shadow\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s : não foi possível reescrever arquivo de senhas shadow\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s : o arquivo de senhas shadow não está presente\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s : não foi possível reescrever arquivo de senhas\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: falha ao abandonar privilégios (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s : usuário %s desconhecido\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Mudando a informação de idade para %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s : erro modificando campos\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -394,22 +382,30 @@
 msgid "Other"
 msgstr "Outro"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s : Não foi possível determinar seu nome de usuário.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Não foi possível mudar o ID para root.\n"
 
-#, fuzzy, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s : não foi possível mudar o usuário `%s' no cliente NIS.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr ""
+"Não foi possível fazer local em arquivo de senhas; tente novamente mais "
+"tarde.\n"
 
-#, fuzzy, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s : `%s' é o mestre NIS para este cliente.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Não foi possível abrir arquivo de senhas.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Modificando as informações de usuário para %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s : %s não encontrado em /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Erro atualizando a entrada de senha.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Não foi possível gravar as mudanças no arquivo de senhas.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Não foi possível remover o locak do arquivo de senhas.\n"
+
 #, fuzzy, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s : nome inválido : \"%s\"\n"
@@ -431,39 +427,25 @@
 msgstr "%s : \"%s\" contém caracteres ilegais\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s : campos muito extensos\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s : Não foi possível determinar seu nome de usuário.\n"
 
-#, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Não foi possível mudar o ID para root.\n"
+#, fuzzy, c-format
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s : não foi possível mudar o usuário `%s' no cliente NIS.\n"
 
-#, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr ""
-"Não foi possível fazer local em arquivo de senhas; tente novamente mais "
-"tarde.\n"
+#, fuzzy, c-format
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s : `%s' é o mestre NIS para este cliente.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Não foi possível abrir arquivo de senhas.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Modificando as informações de usuário para %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s : %s não encontrado em /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s : campos muito extensos\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Erro atualizando a entrada de senha.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Não foi possível gravar as mudanças no arquivo de senhas.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Não foi possível remover o locak do arquivo de senhas.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -524,6 +506,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s : não foi possível abrir arquivo shadow\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s : erro atualizando arquivo shadow\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s : erro atualizando entrada de grupo\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s : linha %d : linha muito extensa\n"
@@ -536,15 +526,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s : linha %d : grupo %s desconhecido\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s : linha %d : não foi possível atualizar entrada de senha\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s : linha %d : não foi possível atualizar entrada\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s : erro detectado, mudanças ignoradas\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s : nao foi possível obter lock em arquivo shadow\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s : erro atualizando arquivo shadow\n"
 
@@ -553,18 +547,13 @@
 msgstr "%s : erro atualizando arquivo de senhas\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s : não foi possível obter lock em arquivo de senhas\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s : nao foi possível obter lock em arquivo shadow\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s : linha %d : usuário %s desconhecido\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s : linha %d : não foi possível atualizar entrada de senha\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -593,7 +582,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s é um shell inválido.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Uso : expiry {-f|-c}\n"
 
@@ -601,7 +589,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s : usuário desconhecido\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -634,7 +621,6 @@
 "                        as opções -r, -m ou -l) para usuário com LOGIN\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Falhas   Máximo  Último                   Em\n"
 
@@ -675,14 +661,38 @@
 msgstr "%s : senhas de grupo shadow requeridas para -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Quem é você ?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s : não foi possível obter lock\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s : não foi possível regravar arquivo\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s : não foi possível regravar arquivo shadow\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s : não foi possível remover o lock do arquivo\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s : não foi possível atualizar entrada\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s : não foi possível atualizar entrada shadow\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "grupo desconhecido : %s\n"
 
@@ -695,22 +705,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Removendo usuário %s do grupo %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s : membro %s desconecido\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s : Não é um tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Mudando a senha para o grupo %s\n"
 
@@ -727,35 +721,26 @@
 msgid "%s: Try again later\n"
 msgstr "%s : Tente novamente mais tarde\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s : não foi possível obter lock\n"
+msgid "Who are you?\n"
+msgstr "Quem é você ?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s : nõ foi possível obter lock shadow\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Adicionando usuário %s ao grupo %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s : não foi possível atualizar entrada\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Removendo usuário %s do grupo %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s : não foi possível atualizar entrada shadow\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s : membro %s desconecido\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s : não foi possível regravar arquivo\n"
+msgid "%s: Not a tty\n"
+msgstr "%s : Não é um tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s : não foi possível regravar arquivo shadow\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s : não foi possível remover o lock do arquivo\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -786,14 +771,6 @@
 msgstr "%s : erro adicionando nova entrada de grupo\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s : o nome %s não é único\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s : GID %u não é único\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s : não foi possível obter GID único\n"
 
@@ -834,6 +811,9 @@
 msgstr "%s : grupo %s existe\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s : GID %u não é único\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Uso : groupdel grupo\n"
 
@@ -861,47 +841,41 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s : %s é o mestre NIS\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr ""
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr ""
 
-#, c-format
 msgid "Group access is required\n"
 msgstr ""
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "PAM authentication failed for\n"
 msgstr "%s : autenticação PAM falhou\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to lock group file\n"
 msgstr "%s : não foi possível obter lock em arquivo de grupo\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to open group file\n"
 msgstr "%s : não foi possível abrir arquivo de grupo\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Cannot close group file\n"
 msgstr "%s : não foi possível abrir arquivo de grupo\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -911,6 +885,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Uso: groupadd [opções] grupo\n"
@@ -946,10 +921,6 @@
 msgstr "Uso : %s [-r] [-s] [grupo]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Não\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s : -s e -r são incompatíveis\n"
 
@@ -962,6 +933,9 @@
 msgstr "%s : não foi possível abrir arquivo %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s : não foi possível atualizar arquivo %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "entrada inválida no arquivo de grupo\n"
 
@@ -969,7 +943,6 @@
 msgid "delete line '%s'? "
 msgstr "remover a linha `%s' ? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "entrada de grupo duplicada\n"
 
@@ -1001,11 +974,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s : não foi possível atualizar entrada para grupo %s\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "entrada inválida no arquivo de grupo shadow\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "entrada de grupo shadow duplicada\n"
 
@@ -1022,10 +993,6 @@
 msgstr "grupo shadow %s : nenhum usuário %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s : não foi possível atualizar arquivo %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s : os arquivos foram atualizados\n"
 
@@ -1057,19 +1024,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s : não foi possível remover arquivo de grupo shadow\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Uso : id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Uso : id\n"
 
-#, c-format
 msgid " groups="
 msgstr " grupos="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1093,17 +1056,19 @@
 "                                LOGIN especificado\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Nome de Usuário         Porta     De             Último\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Nome de Usuário               Porta    Último\n"
 
 msgid "**Never logged in**"
 msgstr "**Nunca logou**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Usuário Desconhecido : %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: argumento inesperado: %s\n"
@@ -1120,11 +1085,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "      %s [-p] -r host\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Hora de login inválida\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1132,7 +1095,6 @@
 "\n"
 "Sistema fechado para manutenção de rotina\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1172,7 +1134,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Número máximo de tentativas excedido (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: abortar requesitado pelo PAM\n"
 
@@ -1191,6 +1152,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: falha iniciando: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Aviso : login rehabilitado após travamento temporário.\n"
 
@@ -1213,14 +1178,16 @@
 "tempo de login excedido\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Uso : newgrp [-] [grupo]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Uso : sg group [[-c] comando]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Senha antiga : "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "GID desconhecido : %u\n"
@@ -1229,11 +1196,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "GID desconhecido : %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Senha antiga : "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "muitos grupos\n"
 
@@ -1245,7 +1207,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s : grupo %s não existe\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s : não foi possível obter de /etc/passwd.\n"
 
@@ -1259,6 +1231,10 @@
 msgstr "%s : não foi possível abrir arquivos\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s : erro atualizando arquivos\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s : linha %d : linha inválida\n"
 
@@ -1290,11 +1266,7 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s : linha %d : não foi possível atualizar entrada\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s : erro atualizando arquivos\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1368,11 +1340,9 @@
 msgid "New password: "
 msgstr "Nova senha : "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Tente novamente.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1380,7 +1350,6 @@
 "\n"
 "Aviso : senha fraca (informe-a novamente para usá-la de qualquer forma).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "As senhas não são iguais; tente novamente.\n"
 
@@ -1419,11 +1388,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "A senha para %s não foi modificada.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Senha modificada.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Senha configurada para expirar.\n"
 
@@ -1431,11 +1398,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Uso : %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "entrada de arquivo de senha inválida\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "entrada de senha duplicada\n"
 
@@ -1467,11 +1432,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s : não foi possível atualizar entrada passwd para %s\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "entrada de arquivos de senhas shadow inválida\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "entrada de senha shadow inválida\n"
 
@@ -1507,15 +1470,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s : não foi possível remover arquivo de senhas shadow\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Acesso ao su para esta conta NEGADO.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Autenticação por senha contornada.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Por favor, informe sua PRÓPRIA senha como autenticação.\n"
 
@@ -1523,7 +1483,7 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1576,15 +1536,15 @@
 "%s : %s\n"
 "(Ignorado)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Sem shell\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Sem arquivo de senhas\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Nenhuma entrada de senha para 'root'\n"
 
@@ -1628,7 +1588,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s : muitos grupos especificados *máimo %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1649,6 +1609,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1701,15 +1663,15 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s : não foi possível obter UID único\n"
 
 #, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s : não foi possível obter GID único\n"
+
+#, fuzzy, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s : diretório base `%s'inválido\n"
 
@@ -1800,7 +1762,6 @@
 msgid "Creating mailbox file"
 msgstr ""
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1820,6 +1781,10 @@
 "grupo, utilize -g.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s : UID %u não é único\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1831,7 +1796,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s : aviso CREATE_HOME não é suportado, por favor, utilize -m.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1901,7 +1865,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s : erro removendo diretório %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2019,6 +1983,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2057,6 +2027,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s : o nome %s não é único\n"
+
+#~ msgid "No\n"
+#~ msgstr "Não\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/ro.po
===================================================================
--- upstream/trunk/po/ro.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/ro.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-26 18:18+0100\n"
 "Last-Translator: Sorin Batariuc <sorin at bonbon.net>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
@@ -26,7 +26,6 @@
 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"
 
@@ -39,19 +38,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Avertisment: grup necunoscut %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Avertisment: prea multe grupuri\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Parola dvs a expirat."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Parola dvs este inactivă."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Autentificarea dvs a expirat."
 
@@ -65,11 +60,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Parola dvs va expira în %ld zile.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Parola dvs va expira mâine.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Parola dvs va expira azi.\n"
 
@@ -77,7 +70,6 @@
 msgid "Unable to change tty %s"
 msgstr "Nu pot schimba tty %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Inundaţie de mediu\n"
 
@@ -99,7 +91,6 @@
 "%d eşuări de la ultima autentificare.\n"
 "Ultima oară a fost %s în %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Prea multe autentificări.\n"
 
@@ -196,7 +187,7 @@
 msgid "%s's Password: "
 msgstr "Parola pentru %s: "
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -234,7 +225,6 @@
 "                                 expirare la AVERTIZ_ZILE\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Introduceţi noua valoare, sau apăsaţi ENTER pentru cea implicită\n"
 
@@ -256,27 +246,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Data expirării contului (AAAA-LL-ZZ)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Ultima schimbare de parolă\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "Niciodată\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "parola trebuie schimbată\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Parola expiră\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Parolă inactivă\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Contul expiră\t\t\t\t\t: "
 
@@ -305,18 +289,14 @@
 msgstr "%s: autentificare PAM eşuată\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: nu pot închide fişierul passwd\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: nu pot deschide fişierul passwd\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: utilizator necunoscut %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: fişierul shadow nu este prezent\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s nu pot încuia fişierul shadow\n"
 
@@ -325,18 +305,14 @@
 msgstr "%s: nu pot deschide fişierul shadow\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s : eşuare în abandonarea privilegiilor (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: nu pot rescrie fişierul shadow\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Modific informaţia de temporalitate pentru %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: nu pot rescrie fişierul passwd\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: eroare la modificarea câmpurilor\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: nu pot actualiza fişierul passwd\n"
 
@@ -345,14 +321,26 @@
 msgstr "%s: nu pot actualiza fişierul shadow\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: nu pot rescrie fişierul shadow\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: fişierul shadow nu este prezent\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: nu pot rescrie fişierul passwd\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s : eşuare în abandonarea privilegiilor (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: utilizator necunoscut %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Modific informaţia de temporalitate pentru %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: eroare la modificarea câmpurilor\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -397,22 +385,28 @@
 msgid "Other"
 msgstr "Altele"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Nu vă pot determina numele de utilizator.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Nu pot schimba identificatorul la root.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: nu pot schimba utilizatorul '%s' pe un client NIS.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "Nu pot încuia fişierul passwd; încercaţi mai târziu.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: '%s' este stăpânul NIS pentru acest client.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Nu pot deschide fişierul passwd.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Modificare informaţii utilizator pentru %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s negăsit în /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Eroare la actualizarea intrării în passwd.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Nu pot face modificările în fişierul passwd.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Nu pot debloca fişierul passwd.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: nume nevalid: '%s'\n"
@@ -434,37 +428,25 @@
 msgstr "%s: '%s' conţine caractere ilegale\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: câmpuri prea lungi\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Nu vă pot determina numele de utilizator.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Nu pot schimba identificatorul la root.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: nu pot schimba utilizatorul '%s' pe un client NIS.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Nu pot încuia fişierul passwd; încercaţi mai târziu.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: '%s' este stăpânul NIS pentru acest client.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Nu pot deschide fişierul passwd.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Modificare informaţii utilizator pentru %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s negăsit în /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s: câmpuri prea lungi\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Eroare la actualizarea intrării în passwd.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Nu pot face modificările în fişierul passwd.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Nu pot debloca fişierul passwd.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -524,6 +506,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: nu pot deschide fişierul shadow\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: eroare la actualizarea fişierului shadow\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: eroare la actualizarea intrărilor de grupuri\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: linia %d: linie prea lungă\n"
@@ -536,15 +526,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: linia %d: grup necunoscut %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: linia %d: nu pot actualiza intrarea în passwd\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: linia %d: nu pot actualiza intrarea\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: a fost detectată o eroare, schimbările sunt ignorate\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: nu pot închide fişierul shadow\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: eroare la actualizarea fişierului shadow\n"
 
@@ -553,18 +547,14 @@
 msgstr "%s: eroare la actualizarea fişierului passwd\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: nu pot închide fişierul passwd\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: nu pot închide fişierul shadow\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: linia %d: utilizator necunoscut %s\n"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: linia %d: nu pot actualiza intrarea în passwd\n"
+
+#, fuzzy
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -602,7 +592,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s este o consolă nevalidă.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Utilizare: expiry {-f|-c}\n"
 
@@ -610,7 +599,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: utilizator necunoscut\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -648,7 +636,6 @@
 "                                -l) doar pentru utilizatorul LOGIN\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Autentificare       Eşuări Maximum Ultima dată                   La\n"
 
@@ -689,14 +676,38 @@
 msgstr "%s: sunt cerute parole criptate de grup pentru -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Cine sunteţi?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: nu pot obţine închiderea\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: nu pot rescrie fişierul\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: nu pot rescrie fişierul shadow\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: nu pot descuia fişierul\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: nu pot actualiza intrarea\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: nu pot actualiza intrarea shadow\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "grup necunoscut: %s\n"
 
@@ -709,22 +720,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Şterg utilizatorul %s din grupul %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: membru necunoscut %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: nu este un tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Schimbare parolă pentru grupul %s\n"
 
@@ -741,35 +736,26 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Mai încercaţi mai târziu\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: nu pot obţine închiderea\n"
+msgid "Who are you?\n"
+msgstr "Cine sunteţi?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: nu pot obţine închiderea shadow\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Adaug utilizatorul %s la grupul %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: nu pot actualiza intrarea\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Şterg utilizatorul %s din grupul %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: nu pot actualiza intrarea shadow\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: membru necunoscut %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: nu pot rescrie fişierul\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: nu este un tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: nu pot rescrie fişierul shadow\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: nu pot descuia fişierul\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -801,14 +787,6 @@
 msgstr "%s: eroare la adăugarea unei noi intrări de grup\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: numele %s nu este unic\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u nu este unic\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: nu pot prelua GID unic\n"
 
@@ -849,6 +827,9 @@
 msgstr "%s: grupul %s există\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u nu este unic\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Utilizare: groupdel grup\n"
 
@@ -876,47 +857,41 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s este stăpân NIS\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr ""
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr ""
 
-#, c-format
 msgid "Group access is required\n"
 msgstr ""
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "PAM authentication failed for\n"
 msgstr "%s: autentificare PAM eşuată\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to lock group file\n"
 msgstr "%s: nu pot încuia fişierul de grupuri\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to open group file\n"
 msgstr "%s: nu pot deschide fişierul de grupuri\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Cannot close group file\n"
 msgstr "%s: nu pot deschide fişierul de grupuri\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -926,6 +901,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Utilizare: groupadd [opţiuni] grup\n"
@@ -961,10 +937,6 @@
 msgstr "Utilizare: %s [-r] [-s] [grup]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Nu\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s şi -r sunt incompatibile\n"
 
@@ -977,6 +949,9 @@
 msgstr "%s: nu pot deschide fişierul %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: nu pot actualiza fişierul %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "intrare nevalidă în fişierul de grupuri\n"
 
@@ -984,7 +959,6 @@
 msgid "delete line '%s'? "
 msgstr "şterg linia '%s'? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "intrare de grup duplicată\n"
 
@@ -1016,11 +990,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: nu pot actualiza intrarea pentru grupul %s\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "intrare nevalidă în fişierul gshadow\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "intrare duplicată în gshadow\n"
 
@@ -1037,10 +1009,6 @@
 msgstr "gshadow %s: nici un utilizator %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: nu pot actualiza fişierul %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: fişierele au fost actualizate\n"
 
@@ -1072,19 +1040,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: nu pot şterge fişierul gshadow\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Utilizare: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Utilizare: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " grupuri="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1109,17 +1073,19 @@
 "                                utilizatorul cu autentificarea specificată\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Nume utilizator       Port      De la          Cel mai recent\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Nume utilizator                Port      Cel mai recent\n"
 
 msgid "**Never logged in**"
 msgstr "**Niciodată autentificat**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Utilizator necunoscut: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: argument neaşteptat: %s\n"
@@ -1136,11 +1102,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r gazdă\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Timp de autentificare nevalid\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1148,7 +1112,6 @@
 "\n"
 "Sistem închis pentru întreţinere de rutină\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1188,7 +1151,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Numărul maxim de încercări a depăşit (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "autentificare: renunţare cerută de PAM\n"
 
@@ -1207,6 +1169,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s : eşuare la bifurcare: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Avertisment: autentificare reactivată după blocarea temporară.\n"
 
@@ -1229,14 +1195,16 @@
 "depăşirea timpului de autentificare\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Utilizare: newgrp [-] [grup]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Utilizare: sg grup [[-c] comanda]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Parola veche: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "UID necunoscut: %u\n"
@@ -1245,11 +1213,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "GID necunoscut: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Parola veche: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "prea multe grupuri\n"
 
@@ -1261,7 +1224,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: grupul %s nu există\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: nu pot încuia /etc/passwd.\n"
 
@@ -1274,6 +1247,10 @@
 msgstr "%s: nu pot deschide fişierele\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: eroare la actualizarea fişierelor\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: linia %d: linie nevalidă\n"
 
@@ -1305,11 +1282,7 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: linia %d: nu pot actualiza intrarea\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: eroare la actualizarea fişierelor\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1382,11 +1355,9 @@
 msgid "New password: "
 msgstr "Parola nouă: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Mai încercaţi.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1395,7 +1366,6 @@
 "Avertisment: parolă slabă (mai introduceţi-o odată pentru a o folosi "
 "oricum).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Nu se potrivesc, mai încercaţi odată.\n"
 
@@ -1434,11 +1404,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Parola pentru %s este neschimbată.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Parolă schimbată.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Parola setata pentru expirare.\n"
 
@@ -1446,11 +1414,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Folosire: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "intrare nevalidă în fişierul passwd\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "intrare duplicată în passwd\n"
 
@@ -1482,11 +1448,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: nu pot actualiza intrarea passwd pentru %s\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "intrare nevalidă în fişierul shadow\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "intrare duplicată în shadow\n"
 
@@ -1522,15 +1486,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: nu pot şterge fişierul shadow\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Acces INTERZIS către su spre acest cont.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Autentificare cu parolă ocolită.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Vă rog introduceţi PROPRIA parolă pentru autentificare.\n"
 
@@ -1538,7 +1499,7 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1592,15 +1553,15 @@
 "%s: %s\n"
 "(Ignorat)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Fără consolă\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Fără fişier passwd\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Fără intrare în passwd pentru 'root'\n"
 
@@ -1644,7 +1605,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: prea multe grupuri specificate (maximum %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1665,6 +1626,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1718,14 +1681,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: nu pot prelua UID\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: nu pot prelua GID unic\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: director de bază nevalid '%s'\n"
@@ -1817,7 +1780,6 @@
 msgid "Creating mailbox file"
 msgstr "Crearea fişierului căsuţă pentru mesaje"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1839,6 +1801,10 @@
 "folosiţi -g.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u nu este unic\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1850,7 +1816,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: avertisment: CREATE_HOME nu este suportat, vă rog folosiţi -m.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1930,7 +1895,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: eroare la ştergerea directorului %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2050,6 +2015,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2088,6 +2059,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s: numele %s nu este unic\n"
+
+#~ msgid "No\n"
+#~ msgstr "Nu\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/ru.po
===================================================================
--- upstream/trunk/po/ru.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/ru.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-26 20:19+0100\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -28,7 +28,6 @@
 msgid "crypt method not supported by libcrypt? (%s)\n"
 msgstr ""
 
-#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Не удалось выделить память для загрузки конфигурации.\n"
 
@@ -41,19 +40,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Внимание: неизвестная группа %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Внимание: слишком много групп\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Срок действия вашего пароля истёк."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Действие вашего пароля приостановлено."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Срок действия вашей учётной записи истёк."
 
@@ -67,11 +62,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Срок действия вашего пароля истекает через %ld дней.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Срок действия вашего пароля истекает завтра.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Срок действия вашего пароля истекает сегодня.\n"
 
@@ -79,7 +72,6 @@
 msgid "Unable to change tty %s"
 msgstr "Не удалось сменить терминал %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Слишком большое количество переменных среды выполнения\n"
 
@@ -102,7 +94,6 @@
 "Последняя была %s на %s.\n"
 msgstr[2] "%d неудачных попыток входа в систему. Последняя была %s на %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Слишком много попыток входа в систему.\n"
 
@@ -199,7 +190,6 @@
 msgid "%s's Password: "
 msgstr "Пароль пользователя %s: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -236,7 +226,6 @@
 "                                предупреждения в WARN_DAYS\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 "Введите новое значение или нажмите ВВОД для выбора значения по умолчанию\n"
@@ -259,27 +248,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Дата истечения срока действия учётной записи (ГГГГ-ММ-ДД)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Последний раз пароль был изменён\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "никогда\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "пароль должен быть изменён\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Срок действия пароля истекает\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Пароль будет деактивирован через (дней)\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Срок действия учётной записи истекает\t\t\t\t\t\t: "
 
@@ -309,18 +292,14 @@
 msgstr "%s: проверка подлинности PAM завершилась неудачно\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: не удалось заблокировать файл паролей\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: не удалось открыть файл паролей\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: неизвестный пользователь %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: отсутствует теневой файл паролей\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: не удалось заблокировать теневой файл паролей\n"
 
@@ -329,18 +308,14 @@
 msgstr "%s: не удалось открыть теневой файл паролей\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: не удалось снизить уровень привилегий (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: не удалось перезаписать теневой файл паролей\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Изменение информации о сроках действия для %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: не удалось перезаписать файл паролей\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: ошибка при изменении полей\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: не удалось обновить файл паролей\n"
 
@@ -349,14 +324,26 @@
 msgstr "%s: не удалось обновить теневой файл паролей\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: не удалось перезаписать теневой файл паролей\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: отсутствует теневой файл паролей\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: не удалось перезаписать файл паролей\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: не удалось снизить уровень привилегий (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: неизвестный пользователь %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Изменение информации о сроках действия для %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: ошибка при изменении полей\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -401,22 +388,28 @@
 msgid "Other"
 msgstr "Другое"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Не удалось определить имя пользователя.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Не удалось получить права суперпользователя.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: невозможно изменить пользователя '%s' на клиенте NIS.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "Не удалось заблокировать файл паролей, попробуйте позже.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: '%s' -- сервер NIS для этого клиента.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Не удалось открыть файл паролей.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Изменение информации о пользователе %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s не найден в /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Не удалось обновить запись в файле паролей.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Не удалось сохранить изменения в файле паролей.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Не удалось разблокировать файл паролей.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: неверное имя: '%s'\n"
@@ -438,37 +431,25 @@
 msgstr "%s: '%s' содержит недопустимые символы\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: поля слишком длинны\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Не удалось определить имя пользователя.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Не удалось получить права суперпользователя.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: невозможно изменить пользователя '%s' на клиенте NIS.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Не удалось заблокировать файл паролей, попробуйте позже.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: '%s' -- сервер NIS для этого клиента.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Не удалось открыть файл паролей.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Изменение информации о пользователе %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s не найден в /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s: поля слишком длинны\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Не удалось обновить запись в файле паролей.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Не удалось сохранить изменения в файле паролей.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Не удалось разблокировать файл паролей.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -527,6 +508,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: не удалось открыть теневой файл паролей\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: не удалось обновить теневой файл паролей\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: не удалось обновить запись в файле групп\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: строка %d: слишком длинная строка\n"
@@ -539,15 +528,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: строка %d: неизвестная группа %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: строка %d: не удалось обновить поле пароля\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: строка %d: не удалось обновить запись\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: обнаружена ошибка, изменения не были сохранены\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: не удалось заблокировать теневой файл паролей\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: не удалось обновить теневой файл паролей\n"
 
@@ -556,18 +549,13 @@
 msgstr "%s: не удалось обновить файл паролей\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: не удалось заблокировать файл паролей\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: не удалось заблокировать теневой файл паролей\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: строка %d: неизвестный пользователь %s\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: строка %d: не удалось обновить поле пароля\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -602,7 +590,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s не является командной оболочкой.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Использование: expiry {-f|-c}\n"
 
@@ -610,7 +597,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: неизвестный пользователь\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -645,7 +631,6 @@
 "                        или -l) только для учётной записи с заданным ИМЕНЕМ\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Уч.запись      Неуд. попыток  Максимум  Последний раз\n"
 
@@ -688,14 +673,38 @@
 msgstr "%s: для -A требуется поддержка теневого файла групп\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Вы кто?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: не удалось осуществить блокировку\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+msgstr "%s: не удалось осуществить файла shadow\n"
+
+#, c-format
 msgid "%s: can't open file\n"
 msgstr "%s: не удалось открыть файл\n"
 
 #, c-format
+msgid "%s: can't re-write file\n"
+msgstr "%s: не удалось перезаписать файл\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: не удалось перезаписать файл shadow\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: не удалось разблокировать файл\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: не удалось обновить файл\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: не удалось обновить shadow\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "неизвестная группа: %s\n"
 
@@ -708,22 +717,6 @@
 msgstr "%s: не удалось открыть теневой файл паролей\n"
 
 #, c-format
-msgid "Adding user %s to group %s\n"
-msgstr "Добавление пользователя %s в группу %s\n"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Удаление пользователя %s из группы %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: неизвестный член группы %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: Не tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Изменение пароля для группы %s\n"
 
@@ -740,35 +733,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Попробуйте позже\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: не удалось осуществить блокировку\n"
+msgid "Who are you?\n"
+msgstr "Вы кто?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: не удалось осуществить файла shadow\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Добавление пользователя %s в группу %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: не удалось обновить файл\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Удаление пользователя %s из группы %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: не удалось обновить shadow\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: неизвестный член группы %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: не удалось перезаписать файл\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: Не tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: не удалось перезаписать файл shadow\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: не удалось разблокировать файл\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -799,14 +782,6 @@
 msgstr "%s: не удалось добавить новую группу\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: имя %s уже существует\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u уже существует\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: не удалось найти уникальный GID\n"
 
@@ -847,6 +822,9 @@
 msgstr "%s: группа %s существует\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u уже существует\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Использование: groupdel группа\n"
 
@@ -874,49 +852,39 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s -- сервер NIS\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "Член уже существует\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "Не найден член для удаления\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 "Использование: groupmems -a ИМЯ_ПОЛЬЗОВАТЕЛЯ | -d ИМЯ_ПОЛЬЗОВАТЕЛЯ | -D | -l "
 "[-g ИМЯ_ГРУППЫ]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "Только суперпользователь может добавлять членов в различные группы\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "Требуется доступ к группе\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "Не первичный владелец текущей группы\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "Проверка подлинности PAM завершилась неудачно для\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "Не удалось заблокировать файл group\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "Не удалось открыть файл group\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "Не удалось закрыть файл group\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -926,6 +894,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Использование: groupmod [параметры] ГРУППА\n"
@@ -960,10 +929,6 @@
 msgstr "Использование: %s [-r] [-s] [group]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Нет\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s и -r не могут использоваться одновременно\n"
 
@@ -976,6 +941,9 @@
 msgstr "%s: не удалось открыть файл %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: не удалось обновить файл %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "неверная запись в файле групп\n"
 
@@ -983,7 +951,6 @@
 msgid "delete line '%s'? "
 msgstr "удалить строку '%s'? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "повторяющаяся запись в файле групп\n"
 
@@ -1015,11 +982,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: не удалось обновить запись для группы %s\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "неверная запись в теневом файле групп\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "повторяющаяся запись в теневом файле групп\n"
 
@@ -1036,10 +1001,6 @@
 msgstr "теневая группа %s: пользователь %s не существует\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: не удалось обновить файл %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: файлы были изменены\n"
 
@@ -1071,19 +1032,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: не удалось удалить теневой файл групп\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Использование: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Использование: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " группы="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1104,17 +1061,19 @@
 "  -u, --user ИМЯ        показать запись lastlog для учётной записи ИМЯ\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Пользователь     Порт     С                Последний раз\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Пользователь            Порт     Последний раз\n"
 
 msgid "**Never logged in**"
 msgstr "**Никогда не входил в систему**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Неизвестный пользователь: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: неожиданный параметр: %s\n"
@@ -1131,11 +1090,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "                    %s [-p] -r имя хоста\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Вход в систему сейчас запрещён\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1143,7 +1100,6 @@
 "\n"
 "Система закрыта для проведения технического обслуживания\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1183,7 +1139,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Превышено максимальное число попыток (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: аварийное завершение работы по запросу PAM\n"
 
@@ -1202,6 +1157,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: ошибка при вызове fork: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Внимание: вход в систему снова возможен.\n"
 
@@ -1224,14 +1183,16 @@
 "время входа в систему истекло\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Использование: newgrp [-] [группа]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Использование: sg группа [[-c] команда]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Старый пароль: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "неизвестный GID: %u\n"
@@ -1240,11 +1201,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "неизвестный GID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Старый пароль: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "слишком много групп\n"
 
@@ -1256,7 +1212,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: группа %s не существует\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: не удалось заблокировать /etc/passwd.\n"
 
@@ -1269,6 +1235,10 @@
 msgstr "%s: не удалось открыть файлы\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: ошибка обновления файлов\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: строка %d: ошибка в строке\n"
 
@@ -1300,11 +1270,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: строка %d: не удалось обновить запись\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: ошибка обновления файлов\n"
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1378,11 +1343,9 @@
 msgid "New password: "
 msgstr "Новый пароль: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Попробуйте ещё раз.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1391,7 +1354,6 @@
 "Внимание: слишком простой пароль (чтобы всё равно использовать этот пароль, "
 "введите его ещё раз).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Пароли не совпадают, попробуйте ещё раз.\n"
 
@@ -1429,11 +1391,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Пароль для %s не был изменён.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Пароль изменён.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Срок действия пароля истёк.\n"
 
@@ -1442,11 +1402,9 @@
 msgstr ""
 "Использование: %s [-q] [-r] [-s] [файл паролей [теневой файл паролей]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "неверная запись в файле паролей\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "повторяющаяся запись в файле паролей\n"
 
@@ -1478,11 +1436,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: не удалось обновить запись в файле паролей для %s\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "неверная запись в теневом файле паролей\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "повторяющаяся запись в теневом файле паролей\n"
 
@@ -1518,15 +1474,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: не удалось удалить теневой файл паролей\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Переключение на эту учётную запись ЗАПРЕЩЕНО.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Проверка подлинности по паролю пропущена.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Введите ваш СОБСТВЕННЫЙ пароль.\n"
 
@@ -1534,7 +1487,6 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1590,15 +1542,15 @@
 "%s: %s\n"
 "(Игнорировано)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Отсутствует командная оболочка\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Отсутствует файл паролей\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Отсутствует запись для суперпользователя в файле паролей\n"
 
@@ -1643,7 +1595,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: указано слишком много групп (максимум %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1664,6 +1616,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1716,14 +1670,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: не удалось найти уникальный UID\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: не удалось найти уникальный GID\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: неверный базовый каталог '%s'\n"
@@ -1815,7 +1769,6 @@
 msgid "Creating mailbox file"
 msgstr "Создание почтового ящика"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1837,6 +1790,10 @@
 "используйте -g.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u уже существует\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1848,7 +1805,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: внимание: CREATE_HOME не поддерживается, используйте -m.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1928,7 +1884,6 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: не удалось удалить каталог %s\n"
 
-#, c-format
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2050,6 +2005,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2090,6 +2051,12 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: не удалось восстановить %s: %s (ваши изменения в %s)\n"
 
+#~ msgid "%s: name %s is not unique\n"
+#~ msgstr "%s: имя %s уже существует\n"
+
+#~ msgid "No\n"
+#~ msgstr "Нет\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/sk.po
===================================================================
--- upstream/trunk/po/sk.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/sk.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-26 20:45+0100\n"
 "Last-Translator: Peter Mann <Peter.Mann at tuke.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -22,7 +22,6 @@
 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"
 
@@ -35,19 +34,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Upozornenie: skupina %s je neznáma\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Upozornenie: príliš mnoho skupín\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Uplynula platnosť vášho hesla."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Vaše heslo je nečinné."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Uplynula platnosť vášho účtu."
 
@@ -61,11 +56,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Za %ld dní uplynie platnosť vášho hesla.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Zajtra uplynie platnosť vášho hesla.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Dnes uplynie platnosť vášho hesla.\n"
 
@@ -73,7 +66,6 @@
 msgid "Unable to change tty %s"
 msgstr "Nedá sa zmeniť TTY %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Preplnenie prostredia\n"
 
@@ -98,7 +90,6 @@
 "%d chybných pokusov o prihlásenie od posledného prihlásenia.\n"
 "Posledné bolo %s na %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Príliš mnoho prihlásení.\n"
 
@@ -194,7 +185,7 @@
 msgid "%s's Password: "
 msgstr "Heslo používateľa %s:"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -231,7 +222,6 @@
 "UPOZ_DNÍ\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 "Zadajte novú hodnotu alebo stlačte ENTER pre použitie predvolenej hodnoty\n"
@@ -254,27 +244,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Uplynutie platnosti účtu (YYYY-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Posledná zmena hesla\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "nikdy\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "heslo sa musí zmeniť\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Platnosť hesla uplynie\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Nečinné heslo\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Platnosť účtu uplynie\t\t\t\t\t\t: "
 
@@ -304,18 +288,14 @@
 msgstr "%s: PAM autentifikácia zlyhala\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: súbor s heslami sa nedá zamknúť\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: súbor s heslami sa nedá otvoriť\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: používateľ %s je neznámy\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: súbor s tieňovými heslami nie je dostupný\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: súbor s tieňovými heslami sa nedá zamknúť\n"
 
@@ -324,18 +304,14 @@
 msgstr "%s: súbor s tieňovými heslami sa nedá otvoriť\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: zlyhalo odstránenie právomocí (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: súbor s tieňovými heslami sa nedá prepísať\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Mením časové informácie pre používateľa %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: súbor s heslami sa nedá prepísať\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: chyba pri zmene položiek\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: súbor s heslami sa nedá aktualizovaťt\n"
 
@@ -344,14 +320,26 @@
 msgstr "%s: súbor s tieňovými heslami sa nedá aktualizovať\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: súbor s tieňovými heslami sa nedá prepísať\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: súbor s tieňovými heslami nie je dostupný\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: súbor s heslami sa nedá prepísať\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: zlyhalo odstránenie právomocí (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: používateľ %s je neznámy\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Mením časové informácie pre používateľa %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: chyba pri zmene položiek\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -398,22 +386,28 @@
 msgid "Other"
 msgstr "Ostatné"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: vaše používateľské meno sa nedá zistiť.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "ID sa nedá zmeniť na root.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: na NIC klientovi sa nedá zmeniť používateľ '%s'.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "Nedá sa zamknúť súbor s heslami; skúste to neskôr.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: '%s' je hlavným NIS serverom pre tohto klienta.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Súbor s heslami sa nedá otvoriť.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Mením informácie o používateľovi %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s sa nenachádza v /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Chyba pri aktualizácii záznamu hesla.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Nedajú sa vykonať zmeny v súbore s heslami.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Súbor s heslami sa nedá odomknúť.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: chybné meno: '%s'\n"
@@ -435,37 +429,25 @@
 msgstr "%s: '%s' obsahuje chybné znaky\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: položka je príliš dlhá\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: vaše používateľské meno sa nedá zistiť.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "ID sa nedá zmeniť na root.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: na NIC klientovi sa nedá zmeniť používateľ '%s'.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Nedá sa zamknúť súbor s heslami; skúste to neskôr.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: '%s' je hlavným NIS serverom pre tohto klienta.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Súbor s heslami sa nedá otvoriť.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Mením informácie o používateľovi %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s sa nenachádza v /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s: položka je príliš dlhá\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Chyba pri aktualizácii záznamu hesla.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Nedajú sa vykonať zmeny v súbore s heslami.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Súbor s heslami sa nedá odomknúť.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -524,6 +506,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: súbor s tieňovými heslami sa nedá otvoriť\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: chyba pri aktualizácii súboru s tieňovými heslami\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: položka súboru so skupinami sa nedá aktualizovať\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: riadok %d je príliš dlhý\n"
@@ -536,15 +526,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: riadok %d: skupina %s je neznáma\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: riadok %d: záznam hesla sa nedá aktualizovať\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: riadok %d: položka sa nedá aktualizovať\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: zistená chyba, zmeny budú zamietnuté\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: súbor s tieňovými heslami sa nedá zamknúť\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: chyba pri aktualizácii súboru s tieňovými heslami\n"
 
@@ -553,18 +547,14 @@
 msgstr "%s: chyba pri aktualizácii súboru s heslami\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: súbor s heslami sa nedá zamknúť\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: súbor s tieňovými heslami sa nedá zamknúť\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: riadok %d: používateľ %s je neznámy\n"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: riadok %d: záznam hesla sa nedá aktualizovať\n"
+
+#, fuzzy
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -601,7 +591,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "Shell %s je neplatný.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Použitie: expiry {-f|-c}\n"
 
@@ -609,7 +598,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: neznámy používateľ\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -643,7 +631,6 @@
 "                        -r, -m or -l) pre používateľa s loginom LOGIN\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Chybné   Najviac Posledné                 Na\n"
 
@@ -684,14 +671,38 @@
 msgstr "%s: prepínač -A funguje iba s tieňovými heslami skupín\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Kto ste?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: nedá sa získať zámok\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: súbor sa nedá prepísať\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: súbor s tieňovými heslami sa nedá prepísať\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: súbor sa nedá odomknúť\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: položka sa nedá aktualizovať\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: položka súboru s tieňovými heslami sa nedá aktualizovať\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "skupina %s je neznáma\n"
 
@@ -704,22 +715,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Odstraňujem používateľa %s zo skupiny %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: člen %s je neznámy\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: Nejedná sa o tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Mením heslo skupiny %s\n"
 
@@ -736,35 +731,26 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Skúste to neskôr\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: nedá sa získať zámok\n"
+msgid "Who are you?\n"
+msgstr "Kto ste?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: nedá sa získať zámok pre súbor s tieňovými heslami\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Pridávam používateľa %s do skupiny %s.\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: položka sa nedá aktualizovať\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Odstraňujem používateľa %s zo skupiny %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: položka súboru s tieňovými heslami sa nedá aktualizovať\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: člen %s je neznámy\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: súbor sa nedá prepísať\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: Nejedná sa o tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: súbor s tieňovými heslami sa nedá prepísať\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: súbor sa nedá odomknúť\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -796,14 +782,6 @@
 msgstr "%s: chyba pri pridávaní položky do súboru so skupinami\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: meno %s nie je jedinečné\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u nie je jedinečný\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: nedá sa vytvoriť jedinečný GID\n"
 
@@ -844,6 +822,9 @@
 msgstr "%s: skupina %s už existuje\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u nie je jedinečný\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Použitie: groupdel skupina\n"
 
@@ -871,48 +852,42 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s je hlavným NIS serverom\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr ""
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr ""
 
-#, c-format
 msgid "Group access is required\n"
 msgstr ""
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr ""
 
 #  c-format
-#, fuzzy, c-format
+#, fuzzy
 msgid "PAM authentication failed for\n"
 msgstr "%s: PAM autentifikácia zlyhala\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to lock group file\n"
 msgstr "%s: súbor so skupinami sa nedá zamknúť\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to open group file\n"
 msgstr "%s: súbor so skupinami sa nedá otvoriť\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Cannot close group file\n"
 msgstr "%s: súbor so skupinami sa nedá otvoriť\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -922,6 +897,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Použitie: groupadd [voľby] skupina\n"
@@ -959,10 +935,6 @@
 msgstr "Použitie: %s [-r] [-s] [súbor_so_skupinami]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Nie\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s a -r nie sú zlučiteľné\n"
 
@@ -975,6 +947,9 @@
 msgstr "%s: súbor %s sa nedá otvoriť\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: súbor %s sa nedá aktualizovať\n"
+
 msgid "invalid group file entry\n"
 msgstr "chybná položka v súbore so skupinami\n"
 
@@ -982,7 +957,6 @@
 msgid "delete line '%s'? "
 msgstr "zmazať riadok '%s'? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "v súbore so skupinami sa vyskytuje zdvojená položka\n"
 
@@ -1014,11 +988,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: položka skupiny %s sa nedá odstrániť\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "chybná položka v súbore s tieňovými skupinami\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "v súbore s tieňovými skupinami sa vyskytuje zdvojená položka\n"
 
@@ -1035,10 +1007,6 @@
 msgstr "tieňová skupina %s: používateľ %s neexistuje\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: súbor %s sa nedá aktualizovať\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: súbory boli aktualizované\n"
 
@@ -1070,19 +1038,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: súbor s tieňovými heslami skupín sa nedá zmazať\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Použitie: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Použitie: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " skupiny="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1104,17 +1068,19 @@
 "  -u, --user LOGIN      vypíše posledné prihlásenia používateľa uvedeného\n"
 "                        ako LOGIN\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Používateľ       Port     Z                Naposledy\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Používateľ              Port     Naposledy\n"
 
 msgid "**Never logged in**"
 msgstr "**Nebol nikdy prihlásený**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Používateľ %s je neznámy.\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: neočakávaný argument: %s\n"
@@ -1131,11 +1097,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "          %s [-p] -r počítač\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Chybný čas prihlásenia\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1143,7 +1107,6 @@
 "\n"
 "Systém je uzavretý kvôli pravidelnej údržbe.\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1183,7 +1146,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Prekročený maximálny počet pokusov (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "prihlásenie: PAM prerušenie\n"
 
@@ -1202,6 +1164,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: chybné vetvenie: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Upozornenie: po dočasnom zákaze je prihlasovanie opäť povolené.\n"
 
@@ -1224,14 +1190,16 @@
 "čas na prihlásenie uplynul\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Použitie: newgrp [-] [skupina]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Použitie: sg skupina [[-c] príkaz]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Staré heslo: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "neznámy UID: %u\n"
@@ -1240,11 +1208,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "neznámy GID %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Staré heslo: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "príliš mnoho skupín\n"
 
@@ -1256,7 +1219,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: skupina %s neexistuje\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: súbor /etc/passwd sa nedá zamknúť\n"
 
@@ -1269,6 +1242,10 @@
 msgstr "%s: súbory sa nedajú otvoriť\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: chyba pri aktualizácii súborov\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: riadok %d: chybný riadok\n"
 
@@ -1300,11 +1277,7 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: riadok %d: položka sa nedá aktualizovať\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: chyba pri aktualizácii súborov\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1375,11 +1348,9 @@
 msgid "New password: "
 msgstr "Nové heslo: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Skúste to znova.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1387,7 +1358,6 @@
 "\n"
 "Upozornenie: slabé heslo (ak ho chcete naozaj použiť, znova ho zadajte).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Nezhodujú sa; skúste to znova.\n"
 
@@ -1425,11 +1395,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Heslo používateľa %s nebolo zmenené.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Heslo bolo zmenené.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Uplynula platnosť vášho hesla.\n"
 
@@ -1438,11 +1406,9 @@
 msgstr ""
 "Použitie: %s [-q] [-r] [-s] [súbor_s_heslami [súbor_s_tieňovými_heslami]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "chybná položka v súbore s heslami\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "duplikovaná položka v súbore s heslami\n"
 
@@ -1474,11 +1440,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: položka súboru s heslami pre používateľe %s sa nedá aktualizovať\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "chybná položka v súbore s tieňovými heslami\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "duplikovaná položka v súbore s tieňovými heslami\n"
 
@@ -1514,15 +1478,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: nemôžete zmazať súbor s tieňovými heslami\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Z tohto účtu je prístup k su ZAKÁZANÝ.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Overenie hesla vynechané.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Pre overenie zadajte VAŠE vlastné heslo.\n"
 
@@ -1530,7 +1491,7 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1584,15 +1545,15 @@
 "%s: %s\n"
 "(Ignorujem)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Žiadny shell\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Súbor s heslami neexistuje\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "V databáze nie je položka pre používateľa 'root'\n"
 
@@ -1636,7 +1597,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: bolo zadaných príliš veľa skupín (max %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1657,6 +1618,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1705,14 +1668,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: nedá sa vytvoriť jedinečný UID\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: nedá sa vytvoriť jedinečný GID\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: chybný základný adresár '%s'\n"
@@ -1804,7 +1767,6 @@
 msgid "Creating mailbox file"
 msgstr "Vytvára sa mailbox súbor"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1826,6 +1788,10 @@
 "skupiny, použijte -g.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u nie je jedinečný\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1837,7 +1803,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: varovanie: CREATE_HOME nie je podporované, použijte prepínač -m.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1915,7 +1880,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: chyba pri mazaní adresára %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2038,6 +2003,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2076,6 +2047,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s: meno %s nie je jedinečné\n"
+
+#~ msgid "No\n"
+#~ msgstr "Nie\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/sq.po
===================================================================
--- upstream/trunk/po/sq.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/sq.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -2,13 +2,13 @@
 # Copyright (C) 2004 Free Software Foundation, Inc.
 # Elian Myftiu <elian at lycos.com>, 2004.
 # , fuzzy
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.3\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+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"
@@ -26,7 +26,6 @@
 msgid "crypt method not supported by libcrypt? (%s)\n"
 msgstr ""
 
-#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr ""
 
@@ -38,19 +37,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Kujdes: grup i panjohur %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Kujdes: ka shumë grupe\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Fjalëkalimi yt ka skaduar."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Fjalëkalimi yt nuk është aktiv."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Login-i yt ka skaduar."
 
@@ -64,11 +59,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr ""
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr ""
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr ""
 
@@ -76,7 +69,6 @@
 msgid "Unable to change tty %s"
 msgstr ""
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr ""
 
@@ -94,7 +86,6 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr ""
 
@@ -189,7 +180,6 @@
 msgid "%s's Password: "
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -208,7 +198,6 @@
 "\n"
 msgstr ""
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 
@@ -230,27 +219,22 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr ""
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr ""
 
-#, c-format
 msgid "never\n"
 msgstr ""
 
-#, c-format
 msgid "password must be changed\n"
 msgstr ""
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Fjalëkalimi yt nuk është aktiv."
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr ""
 
@@ -279,51 +263,55 @@
 msgstr ""
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr ""
 
 #, c-format
-msgid "%s: unknown user %s\n"
+msgid "%s: can't lock shadow password file\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the shadow password file is not present\n"
+msgid "%s: can't open shadow password file\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock shadow password file\n"
+msgid "%s: can't rewrite shadow password file\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't open shadow password file\n"
+msgid "%s: can't rewrite password file\n"
 msgstr ""
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: can't update password file\n"
 msgstr ""
 
 #, c-format
-msgid "Changing the aging information for %s\n"
+msgid "%s: can't update shadow password file\n"
 msgstr ""
 
 #, c-format
-msgid "%s: error changing fields\n"
+msgid "%s: the shadow password file is not present\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't update password file\n"
+msgid "%s: failed to drop privileges (%s)\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't update shadow password file\n"
+msgid "%s: unknown user %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
+msgid "Changing the aging information for %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
+msgid "%s: error changing fields\n"
 msgstr ""
 
 #, c-format
@@ -367,72 +355,66 @@
 msgid "Other"
 msgstr ""
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
+msgid "Cannot change ID to root.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
+msgid "Cannot lock the password file; try again later.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
+msgid "Cannot open the password file.\n"
 msgstr ""
 
 #, c-format
-msgid "Changing the user information for %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
 msgstr ""
 
-#, c-format
-msgid "%s: invalid name: '%s'\n"
+msgid "Error updating the password entry.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: invalid room number: '%s'\n"
+msgid "Cannot commit password file changes.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: invalid work phone: '%s'\n"
+msgid "Cannot unlock the password file.\n"
 msgstr ""
 
 #, c-format
-msgid "%s: invalid home phone: '%s'\n"
+msgid "%s: invalid name: '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "%s: '%s' contains illegal characters\n"
+msgid "%s: invalid room number: '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "%s: fields too long\n"
+msgid "%s: invalid work phone: '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "Cannot change ID to root.\n"
+msgid "%s: invalid home phone: '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
+msgid "%s: '%s' contains illegal characters\n"
 msgstr ""
 
 #, c-format
-msgid "Cannot open the password file.\n"
+msgid "%s: Cannot determine your user name.\n"
 msgstr ""
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
 msgstr ""
 
 #, c-format
-msgid "Error updating the password entry.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
 msgstr ""
 
 #, c-format
-msgid "Cannot commit password file changes.\n"
+msgid "Changing the user information for %s\n"
 msgstr ""
 
 #, c-format
-msgid "Cannot unlock the password file.\n"
+msgid "%s: fields too long\n"
 msgstr ""
 
 #, c-format
@@ -486,6 +468,14 @@
 msgstr ""
 
 #, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr ""
+
+#, c-format
+msgid "%s: error updating group file\n"
+msgstr ""
+
+#, c-format
 msgid "%s: line %d: line too long\n"
 msgstr ""
 
@@ -497,12 +487,16 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "Kujdes: grup i panjohur %s\n"
 
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "Kujdes: grup i panjohur %s\n"
+
 #, c-format
-msgid "%s: line %d: cannot update password entry\n"
+msgid "%s: error detected, changes ignored\n"
 msgstr ""
 
 #, c-format
-msgid "%s: error detected, changes ignored\n"
+msgid "%s: can't lock shadow file\n"
 msgstr ""
 
 #, c-format
@@ -514,18 +508,13 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock password file\n"
+msgid "%s: line %d: unknown user %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock shadow file\n"
+msgid "%s: line %d: cannot update password entry\n"
 msgstr ""
 
-#, c-format
-msgid "%s: line %d: unknown user %s\n"
-msgstr ""
-
-#, c-format
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -554,7 +543,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr ""
 
@@ -562,7 +550,6 @@
 msgid "%s: unknown user\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -582,7 +569,6 @@
 "\n"
 msgstr ""
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr ""
 
@@ -623,42 +609,50 @@
 msgstr ""
 
 #, c-format
-msgid "Who are you?\n"
+msgid "%s: can't get lock\n"
 msgstr ""
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't open file\n"
 msgstr ""
 
 #, c-format
-msgid "unknown group: %s\n"
+msgid "%s: can't re-write file\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't close file\n"
+msgid "%s: can't re-write shadow file\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't close shadow file\n"
+msgid "%s: can't unlock file\n"
 msgstr ""
 
 #, c-format
-msgid "Adding user %s to group %s\n"
+msgid "%s: can't update entry\n"
 msgstr ""
 
 #, c-format
-msgid "Removing user %s from group %s\n"
+msgid "%s: can't update shadow entry\n"
 msgstr ""
 
 #, c-format
-msgid "%s: unknown member %s\n"
+msgid "unknown group: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: Not a tty\n"
+msgid "%s: can't close file\n"
 msgstr ""
 
 #, c-format
+msgid "%s: can't close shadow file\n"
+msgstr ""
+
+#, c-format
 msgid "Changing the password for group %s\n"
 msgstr ""
 
@@ -675,35 +669,25 @@
 msgid "%s: Try again later\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
+msgid "Who are you?\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
+msgid "Adding user %s to group %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't update entry\n"
+msgid "Removing user %s from group %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
+msgid "%s: unknown member %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't re-write file\n"
+msgid "%s: Not a tty\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr ""
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -723,14 +707,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr ""
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr ""
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr ""
 
@@ -771,6 +747,9 @@
 msgstr ""
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr ""
+
 msgid "Usage: groupdel group\n"
 msgstr ""
 
@@ -798,47 +777,36 @@
 msgid "%s: %s is the NIS master\n"
 msgstr ""
 
-#, c-format
 msgid "Member already exists\n"
 msgstr ""
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr ""
 
-#, c-format
 msgid "Group access is required\n"
 msgstr ""
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr ""
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr ""
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr ""
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr ""
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -848,6 +816,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 
@@ -872,10 +841,6 @@
 msgstr ""
 
 #, c-format
-msgid "No\n"
-msgstr ""
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr ""
 
@@ -888,6 +853,9 @@
 msgstr ""
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr ""
+
 msgid "invalid group file entry\n"
 msgstr ""
 
@@ -895,7 +863,6 @@
 msgid "delete line '%s'? "
 msgstr ""
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr ""
 
@@ -927,11 +894,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr ""
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr ""
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr ""
 
@@ -948,10 +913,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr ""
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr ""
 
@@ -983,19 +944,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: id\n"
 msgstr ""
 
-#, c-format
 msgid " groups="
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1008,11 +965,9 @@
 "\n"
 msgstr ""
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr ""
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr ""
 
@@ -1020,6 +975,10 @@
 msgstr ""
 
 #, c-format
+msgid "Unknown user or range: %s\n"
+msgstr ""
+
+#, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr ""
 
@@ -1035,17 +994,14 @@
 msgid "       %s [-p] -r host\n"
 msgstr ""
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1081,7 +1037,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr ""
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr ""
 
@@ -1098,6 +1053,10 @@
 msgid "%s: failure forking: %s"
 msgstr ""
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 
@@ -1118,14 +1077,16 @@
 "\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr ""
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "   Zgjidh një fjalëkalim të ri.\n"
+
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "Kujdes: grup i panjohur %s\n"
@@ -1134,11 +1095,6 @@
 msgid "unknown GID: %lu\n"
 msgstr ""
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "   Zgjidh një fjalëkalim të ri.\n"
-
-#, c-format
 msgid "too many groups\n"
 msgstr ""
 
@@ -1151,6 +1107,16 @@
 msgstr ""
 
 #, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr ""
 
@@ -1163,6 +1129,10 @@
 msgstr ""
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr ""
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr ""
 
@@ -1194,11 +1164,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr ""
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr ""
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1242,17 +1207,14 @@
 msgid "New password: "
 msgstr ""
 
-#, c-format
 msgid "Try again.\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
 msgstr ""
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr ""
 
@@ -1290,11 +1252,10 @@
 msgid "The password for %s is unchanged.\n"
 msgstr ""
 
-#, c-format
 msgid "Password changed.\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Password set to expire.\n"
 msgstr "Fjalëkalimi yt ka skaduar."
 
@@ -1302,11 +1263,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr ""
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr ""
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr ""
 
@@ -1338,11 +1297,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr ""
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr ""
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr ""
 
@@ -1378,15 +1335,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr ""
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr ""
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr ""
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr ""
 
@@ -1394,7 +1348,6 @@
 msgid "%s: %s\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1434,15 +1387,15 @@
 "(Ignored)\n"
 msgstr ""
 
-#, c-format
 msgid "No shell\n"
 msgstr ""
 
-#, c-format
 msgid "No password file\n"
 msgstr ""
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr ""
 
@@ -1483,7 +1436,6 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1504,6 +1456,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1524,11 +1478,11 @@
 msgstr ""
 
 #, c-format
-msgid "%s: UID %u is not unique\n"
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't get unique UID\n"
+msgid "%s: can't get unique GID (no more available GIDs)\n"
 msgstr ""
 
 #, c-format
@@ -1622,7 +1576,6 @@
 msgid "Creating mailbox file"
 msgstr ""
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1640,6 +1593,10 @@
 msgstr ""
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr ""
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1649,7 +1606,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1717,7 +1673,6 @@
 msgid "%s: error removing directory %s\n"
 msgstr ""
 
-#, c-format
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -1809,6 +1764,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"

Modified: upstream/trunk/po/sv.po
===================================================================
--- upstream/trunk/po/sv.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/sv.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-26 22:48+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -25,7 +25,6 @@
 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"
 
@@ -37,19 +36,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Varning: okänd grupp %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Varning: för många grupper\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Ditt lösenord har upphört att gälla."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Ditt lösenord är inaktivt."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Ditt inloggningskonto har upphört att gälla."
 
@@ -63,11 +58,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Ditt lösenord upphör att gälla om %ld dagar.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Ditt lösenord upphör att gälla imorgon.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Ditt lösenord upphör att gälla idag.\n"
 
@@ -75,7 +68,6 @@
 msgid "Unable to change tty %s"
 msgstr "Kunde inte ändra tty %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Överskott av miljövariabler\n"
 
@@ -97,7 +89,6 @@
 "%d misslyckanden sedan förra inloggningen\n"
 "Senast var %s den %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "För många inloggningsförsök.\n"
 
@@ -192,7 +183,6 @@
 msgid "%s's Password: "
 msgstr "%s lösenord: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -227,7 +217,6 @@
 "                                utgångsdatum till VARN_DAG\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Ange det nya värdet eller tryck ENTER för standardvärdet\n"
 
@@ -249,27 +238,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Utlöpsdatum för kontot (ÅÅÅÅ-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Senaste lösenordsändringen\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "aldrig\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "lösenordet måste ändras\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Lösenordet löper ut\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Lösenordet inaktivt\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Kontot löper ut\t\t\t\t\t\t: "
 
@@ -298,18 +281,14 @@
 msgstr "%s: PAM autentisering misslyckades\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: kan inte låsa lösenordsfilen\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: kan inte öppna lösenordsfilen\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: okänd användare %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: skugglösenordsfilen finns inte\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: kan inte låsa skugglösenordsfilen\n"
 
@@ -318,18 +297,14 @@
 msgstr "%s: kan inte öppna skugglösenordsfilen\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: misslyckades med att kasta rättigheterna (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: kan inte skriva om skugglösenordsfilen\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Ändrar åldersinformationen för %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: kan inte skriva om lösenordsfilen\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: fel vid ändring av fält\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: kan inte uppdatera lösenordsfilen\n"
 
@@ -338,14 +313,26 @@
 msgstr "%s: kan inte uppdatera skugglösenordsfilen\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: kan inte skriva om skugglösenordsfilen\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: skugglösenordsfilen finns inte\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: kan inte skriva om lösenordsfilen\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: misslyckades med att kasta rättigheterna (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: okänd användare %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Ändrar åldersinformationen för %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: fel vid ändring av fält\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -389,22 +376,28 @@
 msgid "Other"
 msgstr "Övrigt"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Kan inte fastställa ditt användarnamn.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Kan inte ändra ID till root.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: kan inte ändra användare \"%s\" på en NIS-klient.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "Kan inte låsa lösenordsfilen, försök igen senare.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: \"%s\" är NIS-master för denna klient.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Kan inte öppna lösenordsfilen.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Ändrar användarinformationen för %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s finns inte i /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Fel vid uppdatering av lösenordsposten.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Kan inte genomföra ändringarna i lösenordsfilen.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Kan inte låsa upp lösenordsfilen.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: ogiltigt namn: \"%s\"\n"
@@ -426,37 +419,25 @@
 msgstr "%s: \"%s\" innehåller ogiltiga tecken\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: fälten för långa\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Kan inte fastställa ditt användarnamn.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Kan inte ändra ID till root.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: kan inte ändra användare \"%s\" på en NIS-klient.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Kan inte låsa lösenordsfilen, försök igen senare.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: \"%s\" är NIS-master för denna klient.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Kan inte öppna lösenordsfilen.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Ändrar användarinformationen för %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s finns inte i /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s: fälten för långa\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Fel vid uppdatering av lösenordsposten.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Kan inte genomföra ändringarna i lösenordsfilen.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Kan inte låsa upp lösenordsfilen.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -515,6 +496,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: kan inte öppna skuggfilen\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: fel vid uppdatering av skuggfil\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: fel vid uppdatering av grupp-post\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: rad %d: raden för lång\n"
@@ -527,15 +516,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: rad %d: okänd grupp %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: rad %d: kan inte uppdatera lösenordsposten\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: rad %d: kan inte uppdatera post\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: ett fel upptäcktes, ändringar ignorerade\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: kan inte låsa skuggfilen\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: fel vid uppdatering av skuggfil\n"
 
@@ -544,18 +537,13 @@
 msgstr "%s: fel vid uppdatering av lösenordsfil\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: kan inte låsa lösenordsfilen\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: kan inte låsa skuggfilen\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: rad %d: okänd användare %s\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: rad %d: kan inte uppdatera lösenordsposten\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -590,7 +578,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s är ett ogiltigt skal.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Användning: expiry {-f|-c}\n"
 
@@ -598,7 +585,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: okänd användare\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -633,7 +619,6 @@
 "                        för användaren KONTO\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Användare       Fel      Max Senaste                  På\n"
 
@@ -674,14 +659,38 @@
 msgstr "%s: lösenord för skuggrupper krävs för -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Vem är du?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: kan inte hämta lås\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: kan inte skriva om fil\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: kan inte skriva om skuggfil\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: kan inte låsa upp fil\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: kan inte uppdatera post\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: kan inte uppdatera skuggpost\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "okänd grupp: %s\n"
 
@@ -694,22 +703,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Ta bort användaren %s från gruppen %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: okänd medlem %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: Inte en tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Ändrar lösenordet för gruppen %s\n"
 
@@ -726,35 +719,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Försök igen senare\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: kan inte hämta lås\n"
+msgid "Who are you?\n"
+msgstr "Vem är du?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: kan inte få skugglås\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Lägger till användaren %s till gruppen %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: kan inte uppdatera post\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Ta bort användaren %s från gruppen %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: kan inte uppdatera skuggpost\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: okänd medlem %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: kan inte skriva om fil\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: Inte en tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: kan inte skriva om skuggfil\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: kan inte låsa upp fil\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -786,14 +769,6 @@
 msgstr "%s: fel vid tilläggning av ny grupp-post\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: namnet %s är inte unikt\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u är inte unik\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: kan inte hämta unikt GID\n"
 
@@ -834,6 +809,9 @@
 msgstr "%s: gruppen %s finns redan\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u är inte unik\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Användning: groupdel grupp\n"
 
@@ -861,49 +839,39 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s är NIS master\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "Medlemmen finns redan\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "Medlemmen som skulle tas bort kunde inte hittas\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 "Användning: groupmems -a användarnamn | -d användarnamn | -D | -l [-g "
 "gruppnamn]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "Endast root kan lägga till medlemmar till olika grupper\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "Grupptillgång krävs\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "Inte primär ägare av aktuell grupp\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "PAM-autentisering misslyckades för\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "Kunde inte låsa gruppfilen\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "Kunde inte öppna gruppfilen\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "Kan inte stänga gruppfilen\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -913,6 +881,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Användning: groupmod [flaggor] GRUPP\n"
@@ -946,10 +915,6 @@
 msgstr "Användning: %s [-r] [-s] [grupp]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Nej\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s och -r är inkompatibla\n"
 
@@ -962,6 +927,9 @@
 msgstr "%s: kan inte öppna filen %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: kan inte uppdatera filen %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "ogiltig post i gruppfil\n"
 
@@ -969,7 +937,6 @@
 msgid "delete line '%s'? "
 msgstr "ta bort rad \"%s\"? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "dubblerade grupposter\n"
 
@@ -1001,11 +968,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: kan inte uppdatera post för gruppen %s\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "ogiltig post i fil för skuggrupper\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "duplikata poster i skuggrupp\n"
 
@@ -1022,10 +987,6 @@
 msgstr "skuggrupp %s: ingen användare %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: kan inte uppdatera filen %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: filerna har uppdaterats\n"
 
@@ -1057,19 +1018,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: kan inte radera shadowgruppfilen\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Usage: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Användning: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " grupper="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1091,17 +1048,19 @@
 "                        angiven med LOGIN\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Användarnamn      Port     Från             Senast\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Användarnamn        Port     Senast\n"
 
 msgid "**Never logged in**"
 msgstr "**Aldrig varit inloggad**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Okänd användare: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: oväntat argument: %s\n"
@@ -1118,11 +1077,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r värd\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Ogiltig inloggningstid\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1130,7 +1087,6 @@
 "\n"
 "Systemet nedstängt för rutinmässigt underhåll\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1170,7 +1126,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Maximalt antal försök överskreds (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: avbryt begärdes av PAM\n"
 
@@ -1189,6 +1144,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: fel vid processdelning: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Varning: inloggning återaktiverad efter temporär nedstängning.\n"
 
@@ -1211,14 +1170,16 @@
 "inloggningstid överskriden\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Användning: newgrp [-] [grupp]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Användning: sg grupp [[-c] kommando]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Gammalt lösenord: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "okänt UID: %u\n"
@@ -1227,11 +1188,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "okänt GID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Gammalt lösenord: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "för många grupper\n"
 
@@ -1243,7 +1199,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: gruppen %s finns inte\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: kan inte låsa /etc/passwd.\n"
 
@@ -1256,6 +1222,10 @@
 msgstr "%s: kan inte öppna filer\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: fel vid uppdatering av filer\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: rad %d: ogiltig rad\n"
 
@@ -1287,11 +1257,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: rad %d: kan inte uppdatera post\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: fel vid uppdatering av filer\n"
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1363,11 +1328,9 @@
 msgid "New password: "
 msgstr "Nytt lösenord: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Försök igen.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1375,7 +1338,6 @@
 "\n"
 "Varning: svagt lösenord (ange det igen för att använda det ändå).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "De stämde inte, försök igen.\n"
 
@@ -1413,11 +1375,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Lösenordet för %s är oförändrat.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Lösenordet ändrat.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Lösenord satt till att löpa ut.\n"
 
@@ -1425,11 +1385,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Användning: %s [-q] [-r] [-s] [lösenord [skugga]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "ogiltig post i lösenordsfil\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "duplikata lösenordsposter\n"
 
@@ -1461,11 +1419,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: kan inte uppdatera lösenordspost för %s\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "ogiltig post i skugglösenordsfil\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "duplikat post för skugglösenord\n"
 
@@ -1501,15 +1457,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: kan inte ta bort skugglösenordsfilen\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Tillgång med su till det kontot NEKAS.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Lösenordsautentisering kringgådd.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Vänligen ange ditt EGNA lösenord för autentisering.\n"
 
@@ -1517,7 +1470,6 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1571,15 +1523,15 @@
 "%s: %s\n"
 "(Ignorerad)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Inget skal\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Ingen lösenordsfil\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Ingen lösenordspost för \"root\"\n"
 
@@ -1623,7 +1575,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: för många grupper specifierade (max %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1644,6 +1596,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1695,14 +1649,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: kan inte få tag i unikt UID\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: kan inte hämta unikt GID\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: ogiltig baskatalog \"%s\"\n"
@@ -1794,7 +1748,6 @@
 msgid "Creating mailbox file"
 msgstr "Skapar postlådefil"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1816,6 +1769,10 @@
 "gruppen, använd -g.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u är inte unikt\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1827,7 +1784,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: varning: CREATE_HOME stöds inte, vänligen använd -m istället.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1906,7 +1862,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: fel vid borttagning av katalogen %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2025,6 +1981,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2063,6 +2025,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s: namnet %s är inte unikt\n"
+
+#~ msgid "No\n"
+#~ msgstr "Nej\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/tl.po
===================================================================
--- upstream/trunk/po/tl.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/tl.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-26 21:34+0100\n"
 "Last-Translator: Eric Pareja <xenos at upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl at banwa.upm.edu.ph>\n"
@@ -28,7 +28,6 @@
 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"
 
@@ -42,19 +41,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Babala: hindi kilalang grupo %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Babala: labis ang dami ng mga grupo\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Lumampas sa taning ang inyong kontrasenyas."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Ang inyong kontrasenyas ay hindi aktibo."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Lumampas sa taning ang inyong login."
 
@@ -68,11 +63,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Ang inyong kontrasenyas ay may taning na %ld na araw.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Hanggang bukas ang taning ng inyong kontrasenyas.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Mapapaso ang inyong kontrasenyas ngayong araw na ito.\n"
 
@@ -80,7 +73,6 @@
 msgid "Unable to change tty %s"
 msgstr "Hindi mabago ang tty %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Umapaw ang kapaligiran\n"
 
@@ -106,7 +98,6 @@
 "May %d na kabiguan magmula ng huling pagpasok.\n"
 "Ang huli ay %s noong %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Labis ang mga login.\n"
 
@@ -203,7 +194,6 @@
 msgid "%s's Password: "
 msgstr "Kontrasenyas ni %s: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -240,7 +230,6 @@
 "                                WARN_DAYS\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Ibigay ang bagong halaga, o pindutin ang ENTER para sa default\n"
 
@@ -262,27 +251,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Hangganan ng Account (YYYY-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Huling Pagpalit ng Password : "
 
-#, c-format
 msgid "never\n"
 msgstr "Hindi kailanman\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "kailangan palitan ang password\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Taning ng Password:\t"
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Inaktibong Password:\t"
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Mapapaso ang Account:\t"
 
@@ -311,18 +294,14 @@
 msgstr "%s: bigo ang pagpapakilalang PAM\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: hindi maaldaba ang talaksan ng mga kontrasenyas\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: hindi mabuksan ang talaksang password\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: di kilalang gumagamit %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: wala ang talaksan ng shadow password\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: hindi maaldaba ang talaksang shadow password\n"
 
@@ -331,18 +310,14 @@
 msgstr "%s: hindi mabuksan ang talaksang shadow password\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: bigo sa pagtanggal ng mga pribilehiyo (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: hindi maisulat-muli ang talaksang shadow password\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Pinapalitan ang impormasyong pagtanda para kay %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: hindi maisulat-muli ang talaksang password\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: error sa pagbabago ng mga field\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: hindi maapdeyt ang talaksang password\n"
 
@@ -351,14 +326,26 @@
 msgstr "%s: hindi maapdeyt ang talaksang shadow password\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: hindi maisulat-muli ang talaksang shadow password\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: wala ang talaksan ng shadow password\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: hindi maisulat-muli ang talaksang password\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: bigo sa pagtanggal ng mga pribilehiyo (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: di kilalang gumagamit %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Pinapalitan ang impormasyong pagtanda para kay %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: error sa pagbabago ng mga field\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -404,22 +391,28 @@
 msgid "Other"
 msgstr "Iba pa"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Hindi makilala ang inyong pangalan.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Hindi mabago ang ID sa root.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: hindi mapalitan ang gumagamit '%s' sa NIS client.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "Hindi maaldaba ang talaksang password; subukan muli mamaya.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: '%s' ay ang NIS master ng klienteng ito.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Hindi mabuksan ang talaksang password\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Pinapalitan ang impormasyon tungkol sa gumagamit na si %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: hindi nahanap ang %s sa /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Error sa pag-apdeyt ng password entry.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Hindi maisulat ang pagbabago sa talaksang password.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Hindi maalis ang aldaba sa talaksang password.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: hindi tanggap na pangalan: '%s'\n"
@@ -441,37 +434,25 @@
 msgstr "%s: '%s' ay may hindi legal na mga karakter\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: mahaba masyado ang mga field\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Hindi makilala ang inyong pangalan.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Hindi mabago ang ID sa root.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: hindi mapalitan ang gumagamit '%s' sa NIS client.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Hindi maaldaba ang talaksang password; subukan muli mamaya.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: '%s' ay ang NIS master ng klienteng ito.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Hindi mabuksan ang talaksang password\n"
+msgid "Changing the user information for %s\n"
+msgstr "Pinapalitan ang impormasyon tungkol sa gumagamit na si %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: hindi nahanap ang %s sa /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s: mahaba masyado ang mga field\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Error sa pag-apdeyt ng password entry.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Hindi maisulat ang pagbabago sa talaksang password.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Hindi maalis ang aldaba sa talaksang password.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -530,6 +511,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: hindi mabuksan ang talaksang shadow\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: error sa pag-apdeyt ng talaksang shadow\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: error sa pag-apdeyt ng ipinasok sa grupo\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: linya %d: sobrang haba ng linya\n"
@@ -542,15 +531,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: linya %d: di kilalang grupo %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: linya %d: hindi ma-apdeyt password entry\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: linya %d: hindi ma-apdeyt ang ipinasok\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: may error na naganap, di pinansin ang mga pagbabago\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: hindi maaldaba ang talaksang shadow\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: error sa pag-apdeyt ng talaksang shadow\n"
 
@@ -559,18 +552,13 @@
 msgstr "%s: error sa pag-apdeyt ng talaksang password\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: hindi maaldaba ang talaksan ng mga kontrasenyas\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: hindi maaldaba ang talaksang shadow\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: linya %d: di kilalang gumagamit %s\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: linya %d: hindi ma-apdeyt password entry\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -605,7 +593,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "Ang %s ay hindi tanggap na shell.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Pag-gamit: expiry {-f|-c}\n"
 
@@ -613,7 +600,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: hindi kilalang gumagamit\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -652,7 +638,6 @@
 "                        -l na opsiyon) para sa gumagamit ng LOGIN lamang\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Kabiguan Maximum Pinakahuli               On\n"
 
@@ -693,14 +678,38 @@
 msgstr "%s: kailangan ng password ng grupong shadow para sa -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Sino ka?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: hindi makakuha ng aldaba\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: hindi maisulat muli ang talaksan\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: hindi maisulat muli ang talaksang shadow\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: hindi matanggal ang aldaba ng talaksan\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: hindi ma-apdeyt ang entry\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: hindi ma-apdeyt ang entry na shadow\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "di kilalang grupo: %s\n"
 
@@ -713,22 +722,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Tinatanggal ang gumagamit na si %s mula sa grupong %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: di kilalang miyembro %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: Hindi tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Pinapalitan ang password ng grupong %s\n"
 
@@ -745,35 +738,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Subukan muli mamaya\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: hindi makakuha ng aldaba\n"
+msgid "Who are you?\n"
+msgstr "Sino ka?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: hindi makuha ang aldaba ng shadow\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Dinadagdag ang gumagamit na si %s sa grupong %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: hindi ma-apdeyt ang entry\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Tinatanggal ang gumagamit na si %s mula sa grupong %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: hindi ma-apdeyt ang entry na shadow\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: di kilalang miyembro %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: hindi maisulat muli ang talaksan\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: Hindi tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: hindi maisulat muli ang talaksang shadow\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: hindi matanggal ang aldaba ng talaksan\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -803,14 +786,6 @@
 msgstr "%s: error sa pagdagdag ng entry ng bagong grupo\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: hindi kakaiba ang pangalang %s\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: hindi kakaiba ang gid na %u\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: hindi makakuha ng kakaibang GID\n"
 
@@ -851,6 +826,9 @@
 msgstr "%s: mayroon nang grupong %s\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: hindi kakaiba ang gid na %u\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Pag-gamit: groupdel grupo\n"
 
@@ -878,49 +856,39 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s ay ang NIS master\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "Mayroon nang kasapi na ganito\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "Hindi mahanap ang kasapi na tatanggalin\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 "Pag-gamit: groupmems -a pangalan | -d pangalan | -D | -l [-g pangalan-ng-"
 "grupo]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "Ang root lamang ang maaaring magdagdag ng kasapi sa ibang mga grupo\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "Kinakailangan ng akses sa grupo\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "Hindi pangunahing may-ari ng kasalukuyang grupo\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "Bigo ang pagpapakilalang PAM para kay\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "Hindi maaldaba ang talaksang grupo\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "Hindi mabuksan ang talaksang grupo\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "Hindi maisara ang talaksang grupo\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -930,6 +898,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Pag-gamit: groupmod [mga opsiyon] GRUPO\n"
@@ -963,10 +932,6 @@
 msgstr "Pag-gamit: %s [-r] [-s] [grupo]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Hindi\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s at -r ay hindi maaring magkasabay\n"
 
@@ -979,6 +944,9 @@
 msgstr "%s: hindi mabuksan ang talaksang %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: hindi ma-apdeyt ang talaksang %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "hindi tanggap na entry ng talaksang grupo\n"
 
@@ -986,7 +954,6 @@
 msgid "delete line '%s'? "
 msgstr "burahin ang linyang '%s'? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "pangalawang entry ng grupo\n"
 
@@ -1018,11 +985,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: hindi ma-apdeyt ang ipinasok para sa grupong %s\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "hindi tanggap na entry sa talaksang shadow group\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "dalawahan ang shadow group entry\n"
 
@@ -1039,10 +1004,6 @@
 msgstr "grupong shadow %s: walang gumagamit na %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: hindi ma-apdeyt ang talaksang %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: ang mga talaksan ay na-apdeyt\n"
 
@@ -1074,19 +1035,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: hindi matanggal ang talaksang grupo na shadow\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Pag-gamit: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Pag-gamit: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " mga grupo="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1109,17 +1066,19 @@
 "  -u, --user LOGIN      ipakita lamang ang gumagamit na LOGIN\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Pangalan         Puerta   Mula            Hulihan\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Pangalan                Puerta  Hulihan\n"
 
 msgid "**Never logged in**"
 msgstr "**Di pumasok kailanman**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Di kilalang Gumagamit: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: hindi inaasahang argumento: %s\n"
@@ -1136,11 +1095,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r host\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Di tamang oras ng pagpasok\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1148,7 +1105,6 @@
 "\n"
 "Sarado ang sistema para sa kinagawiang pagtaguyod\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1188,7 +1144,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Lumampas sa bilang ng maaaring pagsubok : (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: hiniling na mag-abort ng PAM\n"
 
@@ -1207,6 +1162,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: bigo sa pag-fork: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Babala: pagpasok ay enabled muli matapos ng panandalian pagbawal.\n"
 
@@ -1229,14 +1188,16 @@
 "lumampas sa taning ng pagpasok\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Pag-gamit: newgrp [-] [grupo]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Pag-gamit: sg grupo [[-c] utos]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Lumang kontrasenyas:"
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "di kilalang GID: %u\n"
@@ -1245,11 +1206,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "di kilalang GID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Lumang kontrasenyas:"
-
-#, c-format
 msgid "too many groups\n"
 msgstr "labis ang dami ng mga grupo\n"
 
@@ -1261,7 +1217,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: walang grupong %s\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: hindi maaldaba ang /etc/passwd.\n"
 
@@ -1274,6 +1240,10 @@
 msgstr "%s: hindi mabuksan ang mga talaksan\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: error sa pag-apdeyt ng mga talaksan\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: linya %d: hindi tanggap na linya\n"
 
@@ -1305,11 +1275,7 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: linya %d: hindi ma-apdeyt ang ipinasok\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: error sa pag-apdeyt ng mga talaksan\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1380,11 +1346,9 @@
 msgid "New password: "
 msgstr "Bagong password: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Subukan muli.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1392,7 +1356,6 @@
 "\n"
 "Babala: mahinang password (ibigay ito muli upang gamitin pa rin).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Hindi sila magkapareho; subukan muli.\n"
 
@@ -1431,11 +1394,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Ang password ni %s ay hindi napalitan.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Napalitan ang password.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Itinakdang lumampas sa taning ang password.\n"
 
@@ -1443,11 +1404,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Pag-gamit: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "hindi tanggap na ipinasok sa talaksang password\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "nadobleng ipinasok sa password\n"
 
@@ -1479,11 +1438,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: hindi maapdeyt ang ipinasok sa passwd para kay %s\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "hindi tanggap na ipinasok sa talaksang password na shadow\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "nadobleng ipinasok sa talaksang password ng shadow\n"
 
@@ -1519,15 +1476,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: hindi matanggal ang talaksang password ng shadow\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Ang paggamit ng su sa account na iyan ay IPINAGBAWAL.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Linampasan ang password authentication.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Ibigay ang inyong SARILING kontrasenyas bilang authentication.\n"
 
@@ -1535,7 +1489,6 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1590,15 +1543,15 @@
 "%s: %s\n"
 "(Di pinansin)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Walang shell\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Walang talaksang password\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Walang ipinasok sa password para sa 'root'\n"
 
@@ -1642,7 +1595,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: sobrang dami ng grupo ang nakatakda (max %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1663,6 +1616,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1714,14 +1669,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: hindi makakuha ng kakaibang UID\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: hindi makakuha ng kakaibang GID\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: hindi tanggap na batayang directory '%s'\n"
@@ -1813,7 +1768,6 @@
 msgid "Creating mailbox file"
 msgstr "Inililikha ang talaksang mailbox"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1835,6 +1789,10 @@
 "sa grupong iyon, gamitin ang -g.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: hindi kakaiba ang UID %u\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1846,7 +1804,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: babala: CREATE_HOME hindi suportado, gamitin na lamang ang -m.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1924,7 +1881,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: error sa pagtanggal ng directory %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2047,6 +2004,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2085,6 +2048,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s: hindi kakaiba ang pangalang %s\n"
+
+#~ msgid "No\n"
+#~ msgstr "Hindi\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/tr.po
===================================================================
--- upstream/trunk/po/tr.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/tr.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-26 22:50+0100\n"
 "Last-Translator: Mehmet Türker <mturker at innova.com.tr>\n"
 "Language-Team: Türkçe <tr at li.org>\n"
@@ -27,7 +27,6 @@
 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"
 
@@ -40,19 +39,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Uyarı: bilinmeyen grup %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Uyarı: grup sayısı çok fazla\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Parolanızın kullanım süresi doldu."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Parolanız etkin değil."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Hesabınızın kullanım süresi doldu."
 
@@ -66,11 +61,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Parolanızın kullanım süresi %ld gün sonra dolacaktır.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Parolanızın kullanım süresi yarın dolacaktır.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Parolanızın kullanım süresi bugün dolacaktır.\n"
 
@@ -78,7 +71,6 @@
 msgid "Unable to change tty %s"
 msgstr "Geçilemeyen tty: %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Ortam taşması\n"
 
@@ -96,7 +88,6 @@
 msgstr[0] ""
 "Son girişten beri %d başarısız girişim.  En sonuncusu %s üzerinde %s idi.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Çok fazla oturum.\n"
 
@@ -193,7 +184,6 @@
 msgid "%s's Password: "
 msgstr "%s kullanıcı parolası: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -237,7 +227,6 @@
 "belirle\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Yeni değeri girin, veya varsayılan değer için ENTER'a basın\n"
 
@@ -259,27 +248,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Hesap Bitimi Tarihi (YYYY-AA-GG)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Son Parola Değişimi\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "Hiçbir zaman\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "Parola değiştirilmeli\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Parola Kullanım Süresi Dolumu\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Parola Pasif\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Hesap Bitimi\t\t\t\t\t\t: "
 
@@ -308,18 +291,14 @@
 msgstr "%s: PAM yetkilendirmesi başarısız oldu\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: parola dosyası kilitlenemedi\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: parola dosyası açılamadı\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: bilinmeyen kullanıcı %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: shadow parola dosyası açılamadı\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: gölge parola dosyası kilitlenemedi\n"
 
@@ -328,18 +307,14 @@
 msgstr "%s: gölge parola dosyası açılamadı\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: ayrıcalıklar iptal edilemedi (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: gölge parola dosyasının üzerine yazılamadı\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "%s için ömür bilgisi değiştiriliyor\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: parola dosyasına yazılamadı\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: alanları değiştirirken hata oluştu\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: parola dosyası güncellenemedi\n"
 
@@ -348,14 +323,26 @@
 msgstr "%s: gölge parola dosyası güncellenemedi\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: gölge parola dosyasının üzerine yazılamadı\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: shadow parola dosyası açılamadı\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: parola dosyasına yazılamadı\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: ayrıcalıklar iptal edilemedi (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: bilinmeyen kullanıcı %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "%s için ömür bilgisi değiştiriliyor\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: alanları değiştirirken hata oluştu\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -398,22 +385,28 @@
 msgid "Other"
 msgstr "Diğer"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Kullanıcı isminiz belirlenemedi.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "ID root kullanıcısı olarak değiştirilemiyor.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: kullanıcı `%s' NIS istemcisinde değiştirilemedi.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "Parola dosyası kilitlenemiyor, daha sonra tekrar deneyin.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: `%s' bu istemci için NIS efendisidir.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Parola dosyası açılamıyor.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "%s için kullanıcı bilgileri değiştiriliyor\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s /etc/passwd içinde bulunamadı\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Parola kaydı güncellenmesinde hata.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Parola dosyası değişiklikleri işlenemiyor.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Parola dosyası kilidi açılamıyor.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: geçersiz isim: '%s'\n"
@@ -435,37 +428,25 @@
 msgstr "%s: '%s' geçersiz karakterler içeriyor\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: alanlar çok uzun\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Kullanıcı isminiz belirlenemedi.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "ID root kullanıcısı olarak değiştirilemiyor.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: kullanıcı `%s' NIS istemcisinde değiştirilemedi.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Parola dosyası kilitlenemiyor, daha sonra tekrar deneyin.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: `%s' bu istemci için NIS efendisidir.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Parola dosyası açılamıyor.\n"
+msgid "Changing the user information for %s\n"
+msgstr "%s için kullanıcı bilgileri değiştiriliyor\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s /etc/passwd içinde bulunamadı\n"
+msgid "%s: fields too long\n"
+msgstr "%s: alanlar çok uzun\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Parola kaydı güncellenmesinde hata.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Parola dosyası değişiklikleri işlenemiyor.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Parola dosyası kilidi açılamıyor.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -524,6 +505,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: gölge dosyası açılamıyor\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: gölge (shadow9 dosyası güncellenmesinde hata\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: grup kaydı güncellenirken hata oluştu\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: satır %d: satır çok uzun\n"
@@ -536,15 +525,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: satır %d: bilinmeyen kullanıcı %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: satır %d: parola kaydı güncellenemiyor\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: satır %d: kayıt güncellenemiyor\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: hata algılandı, değişiklikler görmezden gelindi\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: gölge dosyası kilitlenemiyor\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: gölge (shadow9 dosyası güncellenmesinde hata\n"
 
@@ -553,18 +546,13 @@
 msgstr "%s: parola dosyası güncellenmesinde hata\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: parola dosyası kilitlenemedi\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: gölge dosyası kilitlenemiyor\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: satır %d: bilinmeyen kullanıcı %s\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: satır %d: parola kaydı güncellenemiyor\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -599,7 +587,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s geçersiz bir kabuk.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Kullanım: expiry {-f|-c}\n"
 
@@ -607,7 +594,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: bilinmeyen kullanıcı\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -646,7 +632,6 @@
 "                                veya -l seçenekleri ile kullanıldıysa)\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Oturum Aç       Failures Maximum Latest                   Açık\n"
 
@@ -687,14 +672,38 @@
 msgstr "%s: -A için gölge grup parolaları gerekli\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Siz kimsiniz?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: kilitlenemiyor\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: dosya tekrar yazılamıyor\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: gölge dosyası tekrar yazılamıyor\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: dosya kilidi açılamıyor\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: kayıt güncellenemiyor\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: gölge kaydı güncellenemiyor\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "bilinmeyen grup: %s\n"
 
@@ -707,22 +716,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "%s kullanıcısı %s grubundan çıkarılıyor\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: bilinmeyen üye %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: Bir tty değil\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "%s grubu için parola değiştiriliyor\n"
 
@@ -739,35 +732,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Daha sonra tekrar deneyin\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: kilitlenemiyor\n"
+msgid "Who are you?\n"
+msgstr "Siz kimsiniz?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: gölge kilidi koyulamıyor\n"
+msgid "Adding user %s to group %s\n"
+msgstr "%s kullanıcısı %s grubuna ekleniyor\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: kayıt güncellenemiyor\n"
+msgid "Removing user %s from group %s\n"
+msgstr "%s kullanıcısı %s grubundan çıkarılıyor\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: gölge kaydı güncellenemiyor\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: bilinmeyen üye %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: dosya tekrar yazılamıyor\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: Bir tty değil\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: gölge dosyası tekrar yazılamıyor\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: dosya kilidi açılamıyor\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -799,14 +782,6 @@
 msgstr "%s: yeni grup kaydı eklenirken hata oluştu\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: %s ismi tek değil\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u tek değil\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: tek (benzersiz) bir GID alınamadı\n"
 
@@ -847,6 +822,9 @@
 msgstr "%s: grup %s zaten var\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u tek değil\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Kullanım: groupdel grup_adı\n"
 
@@ -874,48 +852,38 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s NIS efendisidir\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "Üye zaten mevcut\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "Silinecek üye bulunamadı\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 "Kullanım: groupmems -a kullanıcıadı | -d kullanıcıadı | -D | -l[-g grupadı]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "Sadece root kullacısı üyeleri başka gruplara ekleyebilir\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "Grup hakkı gerekli\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "Şu anki grubun birincil sahibi değil\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "PAM yetkilendirmesi başarısız oldu\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "Grup dosyası kilitlenemiyor\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "Grup dosyası açılamıyor\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "Grup dosyası kapatılamıyor\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -925,6 +893,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Usage: groupmod [seçenekler] GRUP\n"
@@ -957,10 +926,6 @@
 msgstr "Kullanım: %s [-r] [-s] [grup]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Hayır\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s ve -r uyumsuz\n"
 
@@ -973,6 +938,9 @@
 msgstr "%s: %s dosyası açılamıyor\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: %s dosyası güncellenemiyor\n"
+
 msgid "invalid group file entry\n"
 msgstr "geçersiz grup dosyası kaydı\n"
 
@@ -980,7 +948,6 @@
 msgid "delete line '%s'? "
 msgstr "`%s' satırı silinsin mi? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "mükerrer grup kaydı\n"
 
@@ -1012,11 +979,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: %s grubu için kayıt güncellenemiyor\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "geçersiz gölge grup dosyası kaydı\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "mükerrer gölge grup kaydı\n"
 
@@ -1033,10 +998,6 @@
 msgstr "gölge grubu %s: kullanıcı %s mevcut değil\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: %s dosyası güncellenemiyor\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: dosyalar güncellendi\n"
 
@@ -1068,19 +1029,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: gölge grup dosyası silinemiyor\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Kullanım: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Kullanım: id\n"
 
-#, c-format
 msgid " groups="
 msgstr ".gruplar="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1104,17 +1061,19 @@
 "                                kastlog yıtlarını gösterir\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Kullanıcı adı         Port     Kimden             Sonuncu\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Kullanıcı adı                Port     Sonuncu\n"
 
 msgid "**Never logged in**"
 msgstr "**Hiç giriş yapmadı**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Bilinmeyen Kullanıcı: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: bilinmeyen argüman: %s\n"
@@ -1131,11 +1090,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "          %s [-p] -r host\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Geçersiz giriş zamanı\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1143,7 +1100,6 @@
 "\n"
 "Sistem rutin bakımlar için kapalı\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1183,7 +1139,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Maksimum giriş denemesi sayısı aşıldı (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "Giriş PAM tarafından iptal edildi\n"
 
@@ -1202,6 +1157,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: çatallama hatası: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 "Uyarı: geçici bir kilitlenme sonrasında giriş tekrar olanaklı kılındı.\n"
@@ -1225,14 +1184,16 @@
 "oturum açma süresi aşıldı\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Kullanım: newgrp [-] [grup]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Kullanım: sg grup [[-c] komut]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Eski parola: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "bilinmeyen UID: %u\n"
@@ -1241,11 +1202,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "bilinmeyen GID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Eski parola: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "çok fazla grup\n"
 
@@ -1257,7 +1213,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: grup %s mevcut değil\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: /etc/passwd kilitlenemiyor.\n"
 
@@ -1270,6 +1236,10 @@
 msgstr "%s: dosyalar açılamıyor\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: dosyaların güncellenmesinde hata oluştu\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: satır %d: geçersiz satır\n"
 
@@ -1301,11 +1271,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: satır %d: kayıt güncellenemiyor\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: dosyaların güncellenmesinde hata oluştu\n"
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1381,11 +1346,9 @@
 msgid "New password: "
 msgstr "Yeni parola: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Yeniden deneyin.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1393,7 +1356,6 @@
 "\n"
 "Uyarı: zayıf parola (yine de kullanmak için aynısını tekrar girin).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Eşleşmediler, tekrar deneyin.\n"
 
@@ -1431,11 +1393,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "%s için parola değişmedi\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Parola değişti \n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Parolanızın kullanım süresi doldu.\n"
 
@@ -1443,11 +1403,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Kullanım: %s [-q] [-r] [-s] [parola [gölge]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "geçersiz parola dosyası kaydı\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "mükerrer parola kaydı\n"
 
@@ -1479,11 +1437,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: %s için passwd kaydı güncellenemedi\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "geçersiz gölge parola dosyası kaydı\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "mükerrer gölge parola kaydı\n"
 
@@ -1519,15 +1475,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: gölge parola dosyası silinemiyor\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Bu hesap için 'su'ya erişim ENGELLENDİ.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Parola yetkilendirmesi atlandı.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Lütfen yetkilendirme için KENDİ parolanızı girin.\n"
 
@@ -1535,7 +1488,6 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1589,15 +1541,15 @@
 "%s: %s\n"
 "(Dikkate alınmadı)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Kabuk yok\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Parola dosyası yok\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "'root' için parola kaydı yok\n"
 
@@ -1641,7 +1593,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: çok fazla grup verildi (azami %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1662,6 +1614,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1718,14 +1672,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: tek (benzersiz) bir UID alınamadı\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: tek (benzersiz) bir GID alınamadı\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: geçersiz ana dizin '%s'\n"
@@ -1817,7 +1771,6 @@
 msgid "Creating mailbox file"
 msgstr "Mesaj kutusu dosyası yaratılıyor"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1839,6 +1792,10 @@
 "kullanın.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: GID %u tek değil\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1851,7 +1808,6 @@
 msgstr ""
 "%s: uyarı: CREATE_HOME desteklenmiyor, lütfen bunun yerine -m kullanın.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1927,7 +1883,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: %s dizini silinirken hata oluştu\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2047,6 +2003,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2085,6 +2047,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s: %s ismi tek değil\n"
+
+#~ msgid "No\n"
+#~ msgstr "Hayır\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/uk.po
===================================================================
--- upstream/trunk/po/uk.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/uk.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -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-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-26 22:52+0100\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen at univ.kiev.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -28,7 +28,6 @@
 msgid "crypt method not supported by libcrypt? (%s)\n"
 msgstr ""
 
-#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "Не можу виділити ресурси для конфігураційних даних.\n"
 
@@ -41,19 +40,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Застереження: невідома група %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Застереження: забагато груп\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Ваш пароль прострочено."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Ваш пароль є неактивним."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Ваш логін прострочено."
 
@@ -67,11 +62,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Ваш пароль буде прострочено за %ld днів.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Ваш пароль буде прострочено завтра.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Ваш пароль буде прострочено сьогодні.\n"
 
@@ -79,7 +72,6 @@
 msgid "Unable to change tty %s"
 msgstr "Не можу змінити tty %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Переповнення оточення\n"
 
@@ -100,7 +92,6 @@
 msgstr[1] "%d помилки з часу останнього входу. Останній вхід: %s з %s.\n"
 msgstr[2] "%d помилок з часу останнього входу. Останній вхід: %s з %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Забагато входів.\n"
 
@@ -196,7 +187,6 @@
 msgid "%s's Password: "
 msgstr "Пароль користувача %s: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -236,7 +226,6 @@
 "ПОПЕРЕДЖЕННЯ\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 "Введіть нове значення або натисніть ENTER для значення за замовчанням\n"
@@ -259,27 +248,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Дата прострочення рахунку (РРРР-ММ-ДД)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Остання зміна пароля\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "ніколи\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "Пароль змінено\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Пароль стає простроченим\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Пароль неактивний\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Рахунок стає простроченим\t\t\t\t\t\t: "
 
@@ -308,18 +291,14 @@
 msgstr "%s: PAM автентифікація не пройшла\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: не можу заблокувати файл паролів\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: не можу відкрити файл паролів\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: невідомий користувач %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: не можу відкрити файл прихованих паролів\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: не можу заблокувати файл прихованих паролів\n"
 
@@ -328,18 +307,14 @@
 msgstr "%s: не можу відкрити файл прихованих паролів\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: не вдалося скинути привілеї (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: не можу переписати файл прихованих паролів\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Змінюю вікову інформацію для %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: не можу переписати файл паролів\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: помилка зміни полів\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: не можу оновити файл паролів\n"
 
@@ -348,14 +323,26 @@
 msgstr "%s: не можу оновити файл прихованих паролів\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: не можу переписати файл прихованих паролів\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: не можу відкрити файл прихованих паролів\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: не можу переписати файл паролів\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: не вдалося скинути привілеї (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: невідомий користувач %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Змінюю вікову інформацію для %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: помилка зміни полів\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -400,22 +387,28 @@
 msgid "Other"
 msgstr "Інше"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Не можу визначити Ваше ім'я користувача.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Не можу змінити ID на root.\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s: неможливо змінити користувача \"%s\" у клієнті NIS.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "Не можу блокувати файл паролів; спробуйте пізніше.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: \"%s\" є NIS-сервером для цього клієнта.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Не можу відкрити файл паролів.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Зміна інформації про користувача %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: %s не знайдено у /etc/passwd\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Не можу оновити запис у файлі паролів.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Не можу записати зміни до файлу паролів.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Не можу розблокувати файл паролів.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: невірне ім'я: \"%s\"\n"
@@ -437,37 +430,25 @@
 msgstr "%s: \"%s\" містить заборонені символи\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: поля занадто довгі\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Не можу визначити Ваше ім'я користувача.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Не можу змінити ID на root.\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s: неможливо змінити користувача \"%s\" у клієнті NIS.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Не можу блокувати файл паролів; спробуйте пізніше.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: \"%s\" є NIS-сервером для цього клієнта.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Не можу відкрити файл паролів.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Зміна інформації про користувача %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: %s не знайдено у /etc/passwd\n"
+msgid "%s: fields too long\n"
+msgstr "%s: поля занадто довгі\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Не можу оновити запис у файлі паролів.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Не можу записати зміни до файлу паролів.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Не можу розблокувати файл паролів.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -526,6 +507,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: не можу відкрити файл з прихованими паролями\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: помилка оновлення файлу з прихованими паролями\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: помилка оновлення запису у базі груп\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: рядок %d: рядок занадто довгий\n"
@@ -538,15 +527,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: рядок %d: невідома група %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: рядок %d: не можу оновити запис у базі паролів\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: рядок %d: не можу оновити запис\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: виявлено помилку, зміни ігноруються\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: не можу заблокувати файл з прихованими паролями\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: помилка оновлення файлу з прихованими паролями\n"
 
@@ -555,18 +548,13 @@
 msgstr "%s: помилка оновлення файлу з паролями\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: не можу заблокувати файл паролів\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: не можу заблокувати файл з прихованими паролями\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: рядок %d: невідомий користувач %s\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: рядок %d: не можу оновити запис у базі паролів\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -601,7 +589,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s є невірна оболонка.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Використання: expiry {-f|-c}\n"
 
@@ -609,7 +596,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: невідомий користувач\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -644,7 +630,6 @@
 "                        опціями) лише для користувача з логіном ЛОГІН\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Логін       Помилок Максимум Останнє                 На\n"
 
@@ -685,14 +670,38 @@
 msgstr "%s: приховані паролі груп потрібні для -A\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Ви хто?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: не можу заблокувати\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+msgstr "%s: не можу заблокувати базу прихований паролів\n"
+
+#, c-format
 msgid "%s: can't open file\n"
 msgstr "%s: не можу відкрити файл\n"
 
 #, c-format
+msgid "%s: can't re-write file\n"
+msgstr "%s: не можу переписати файл\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: не можу переписати файл прихованих паролів\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: не можу розблокувати файл\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s: не можу оновити запис\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: не можу оновити запис у базі прихованих паролів\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "невідома група: %s\n"
 
@@ -705,22 +714,6 @@
 msgstr "%s: не можу відкрити файл з прихованими паролями\n"
 
 #, c-format
-msgid "Adding user %s to group %s\n"
-msgstr "Додано нового користувача %s до групи %s\n"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Видалено користувача %s з групи %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: невідомий член %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: Не є tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Зміна пароля для групи %s\n"
 
@@ -737,35 +730,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Спробуйте знову пізніше\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: не можу заблокувати\n"
+msgid "Who are you?\n"
+msgstr "Ви хто?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: не можу заблокувати базу прихований паролів\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Додано нового користувача %s до групи %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: не можу оновити запис\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Видалено користувача %s з групи %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: не можу оновити запис у базі прихованих паролів\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: невідомий член %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: не можу переписати файл\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: Не є tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: не можу переписати файл прихованих паролів\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: не можу розблокувати файл\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -797,14 +780,6 @@
 msgstr "%s: помилка додання нового запису у файл груп\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: ім'я %s не є унікальним\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u не є унікальним\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: не можу отримати унікальний GID\n"
 
@@ -845,6 +820,9 @@
 msgstr "%s: група %s існує\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u не є унікальним\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "Використання: groupdel група\n"
 
@@ -872,48 +850,38 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s є сервер NIS\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "Член вже існує\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "Член, якого потрібно видалити, не знайдений\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 "Використання: groupmems -a користувач | -d користувач | -D | -l [-g група]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "Тільки root може додавати членів до інших груп\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "Необхідний доступ до групи\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "Не є первинним володарем поточної групи\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "PAM автентифікація не пройшла\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "Неможливо заблокувати файл груп\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "Неможливо відкрити файл груп\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "Неможливо закрити файл груп\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -923,6 +891,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Використання: groupmod [параметри] ГРУПА\n"
@@ -956,10 +925,6 @@
 msgstr "Використання: %s [-r] [-s] [група]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Ні\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s та -r несумісні\n"
 
@@ -972,6 +937,9 @@
 msgstr "%s: не можу відкрити файл %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: неможливо оновити файл %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "невірний запис у файлі груп\n"
 
@@ -979,7 +947,6 @@
 msgid "delete line '%s'? "
 msgstr "видалити рядок \"%s\"? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "дублюючий запис у базі груп\n"
 
@@ -1011,11 +978,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: не можу оновити запис для групи %s\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "невірний запис у файлі прихованих груп\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "дублюючий запис у файлі прихованих груп\n"
 
@@ -1032,10 +997,6 @@
 msgstr "прихована група %s: немає користувача %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: неможливо оновити файл %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: файли було оновлено\n"
 
@@ -1067,19 +1028,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: не можу видалити файл прихованих груп\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Використання: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Використання: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " групи="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1101,17 +1058,19 @@
 "                                користувача з ЛОГІНом\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Користувач       Порт  Звідки           Останній вхід\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Користувач             Порт     Останній вхід\n"
 
 msgid "**Never logged in**"
 msgstr "**Ніколи не входив**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Невідомий користувач: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: неочікуваний аргумент: %s\n"
@@ -1128,11 +1087,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "                %s [-p] -r вузол\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Невірний час для входу\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1140,7 +1097,6 @@
 "\n"
 "Систему закрито для профілактики.\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1180,7 +1136,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Перевищено максимальну кількість спроб (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: система PAM запросила переривання\n"
 
@@ -1199,6 +1154,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: помилка відгалудження: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Застереження: login поновлено після тимчасового блокування.\n"
 
@@ -1221,14 +1180,16 @@
 "вичерпано час логіну\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Використання: newgrp [-] [група]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Використання: sg група [[-c] команда]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Старий пароль: "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "невідомий UID: %u\n"
@@ -1237,11 +1198,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "невідомий GID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Старий пароль: "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "занадто багато груп\n"
 
@@ -1253,7 +1209,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: група %s не існує\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: не можу блокувати /etc/passwd.\n"
 
@@ -1266,6 +1232,10 @@
 msgstr "%s: не можу відкрити файл\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: помилка оновлення файлу\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: рядок %d: невірний рядок\n"
 
@@ -1297,11 +1267,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: рядок %d: не можу оновити запис\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: помилка оновлення файлу\n"
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1371,11 +1336,9 @@
 msgid "New password: "
 msgstr "Новий пароль: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Спробуйте ще.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1384,7 +1347,6 @@
 "Застереження: Поганий пароль (введіть його знову, якщо все одно бажаєте його "
 "використовувати).\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Не співпадає; спробуйте знову.\n"
 
@@ -1422,11 +1384,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Пароль для %s не змінено.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Пароль змінено.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Пароль прострочений.\n"
 
@@ -1434,11 +1394,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "Використання: %s [-q] [-r] [-s] [пароль [shadow]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "невірний запис у файлі паролів\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "дублюючий запис у файлі паролів\n"
 
@@ -1470,11 +1428,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: не можу оновити запис у файлі паролів для %s\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "невірний запис у файлі прихованих паролів\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "дублюючий запис у файлі прихованих паролів\n"
 
@@ -1510,15 +1466,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: не можу видалити файл прихованих паролів\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Доступ цього користувача до su ЗАБОРОНЕНО.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Аутентифікацію пройдено.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Будь ласка введіть Ваш власний пароль для аутентифікації.\n"
 
@@ -1526,7 +1479,6 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1579,15 +1531,15 @@
 "%s: %s\n"
 "(Ігнорую)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Немає оболонки\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Немає файлу паролів\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Бракує запису у базі паролів для 'root'\n"
 
@@ -1631,7 +1583,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: вказано забагато груп (макс %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1652,6 +1604,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1703,14 +1657,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: не можу отримати унікальний UID\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: не можу отримати унікальний GID\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: невірна базова тека \"%s\"\n"
@@ -1802,7 +1756,6 @@
 msgid "Creating mailbox file"
 msgstr "Створюється файл поштової скриньки"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1824,6 +1777,10 @@
 "використовуйте -g.\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u не є унікальним\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1835,7 +1792,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: застереження: CREATE_HOME не підтримується, користуйтесь -m.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1912,7 +1868,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: помилка видалення теки %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -2035,6 +1991,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2073,6 +2035,12 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: не можу відновити %s: %s (ваші зміни у %s)\n"
 
+#~ msgid "%s: name %s is not unique\n"
+#~ msgstr "%s: ім'я %s не є унікальним\n"
+
+#~ msgid "No\n"
+#~ msgstr "Ні\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/vi.po
===================================================================
--- upstream/trunk/po/vi.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/vi.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -1,12 +1,12 @@
 # Vietnamese translation for Shadow.
 # Copyright © 2006 Free Software Foundation, Inc.
 # Clytie Siddall <clytie at riverland.net.au>, 2005-2006.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+0100\n"
 "PO-Revision-Date: 2007-11-26 22:32+0100\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -25,7 +25,6 @@
 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"
 
@@ -37,19 +36,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "Cảnh báo: không biết nhóm %s.\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "Cảnh báo: quá nhiều nhóm\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "Mật khẩu bạn đã hết hạn."
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "Mật khẩu bạn không hoạt động."
 
-#, c-format
 msgid "Your login has expired."
 msgstr "Đăng nhập bạn đã hết hạn."
 
@@ -63,11 +58,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "Mật khẩu bạn sẽ hết hạn sau %ld ngày.\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "Mật khẩu bạn sễ hết hạn vào ngày mai.\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "Mật khẩu bạn sẽ hết hạn vào hôm nay.\n"
 
@@ -75,7 +68,6 @@
 msgid "Unable to change tty %s"
 msgstr "Không thể thay đổi tty %s."
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "Môi trường bị tràn.\n"
 
@@ -94,7 +86,6 @@
 "%d lần bị lỗi sau khi đăng nhập cuối cùng.\n"
 "Lần gần nhất là %s vào %s.\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "Quá nhiều việc đăng nhập.\n"
 
@@ -191,7 +182,6 @@
 msgid "%s's Password: "
 msgstr "Mật khẩu của %s: "
 
-#, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -227,7 +217,6 @@
 "hạn\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Hãy gõ giá trị mới, hoạc bấm phím Enter để chọn mặc định\n"
 
@@ -249,27 +238,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Ngày hết hạn dùng tài khoản (NNNN-TT-Ng)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Thay đổi mặt khẩu cuối cùng\t\t\t\t\t: "
 
-#, c-format
 msgid "never\n"
 msgstr "chưa bao giờ\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "phải thay đổi mật khẩu\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Mật khẩu hết hạn dùng:\t\t\t\t\t: "
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Mật khẩu không hoạt động\t\t\t\t\t: "
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Tài khoản hết hạn dùng\t\t\t\t\t\t "
 
@@ -298,18 +281,14 @@
 msgstr "%s: việc xác thức kiểu PAM bị lỗi\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s: không thể khóa tập tin mật khẩu\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: không thể mở tập tin mật khẩu\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: không biết người dùng %s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s: không có tập tin mật khẩu bóng\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: không thể khóa tập tin mật khẩu bóng\n"
 
@@ -318,18 +297,14 @@
 msgstr "%s: không thể mở tập tin mật khẩu bóng\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s: việc bỏ quyền bị lỗi (%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s: không thể ghi lại tập tin mật khẩu bóng\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "Đang thay đổi thông tin thời gian hoạt động cho %s\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s: không thể ghi lại tập tin mật khẩu\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s: gặp lỗi khi chuyển trường\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: không thể cập nhật tập tin mật khẩu\n"
 
@@ -338,14 +313,26 @@
 msgstr "%s: không thể cập nhật tập tin mật khẩu bóng\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: không thể ghi lại tập tin mật khẩu bóng\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s: không có tập tin mật khẩu bóng\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: không thể ghi lại tập tin mật khẩu\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s: việc bỏ quyền bị lỗi (%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s: không biết người dùng %s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "Đang thay đổi thông tin thời gian hoạt động cho %s\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s: gặp lỗi khi chuyển trường\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -390,23 +377,28 @@
 msgid "Other"
 msgstr "Khác"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: không thể quyết định tên người dùng của bạn.\n"
+msgid "Cannot change ID to root.\n"
+msgstr "Không thể thay đổi thông tin nhận biết (ID) thành người chủ (root).\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr ""
-"%s: không thể thay đổi người dùng « %s » trên ứng dụng khách kiểu NIS.\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "Không thể khóa tập tin mật khẩu; hãy thử lại sau.\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s: « %s » là NIS cái cho ứng dụng khách này.\n"
+msgid "Cannot open the password file.\n"
+msgstr "Không thể mở tập tin mật khẩu.\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "Đang thay đổi thông tin người dùng cho %s\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s: không tìm thấy %s trong </etc/passwd>\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "Gặp lỗi khi cập nhật mục nhập mật khẩu.\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "Không thể đệ trình các thay đổi về tập tin mật khẩu.\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "Không thể bỏ khóa tập tin mật khẩu.\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s: tên không hợp lệ: « %s »\n"
@@ -428,37 +420,26 @@
 msgstr "%s: « %s » chứa ký tự sai\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s: trường quá dài\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: không thể quyết định tên người dùng của bạn.\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "Không thể thay đổi thông tin nhận biết (ID) thành người chủ (root).\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr ""
+"%s: không thể thay đổi người dùng « %s » trên ứng dụng khách kiểu NIS.\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Không thể khóa tập tin mật khẩu; hãy thử lại sau.\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s: « %s » là NIS cái cho ứng dụng khách này.\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "Không thể mở tập tin mật khẩu.\n"
+msgid "Changing the user information for %s\n"
+msgstr "Đang thay đổi thông tin người dùng cho %s\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: không tìm thấy %s trong </etc/passwd>\n"
+msgid "%s: fields too long\n"
+msgstr "%s: trường quá dài\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "Gặp lỗi khi cập nhật mục nhập mật khẩu.\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "Không thể đệ trình các thay đổi về tập tin mật khẩu.\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "Không thể bỏ khóa tập tin mật khẩu.\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -520,6 +501,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s: không thể mở tập tin bóng\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s: gặp lỗi khi cập nhật tập tin bóng\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s: gặp lỗi khi cập nhật mục nhập nhóm.\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: dòng %d: dòng quá dài\n"
@@ -532,15 +521,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s: dòng %d: không biết nhóm %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: dòng %d: không thể câp nhật mục nhập mật khẩu\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s: dòng %d: không thể cập nhật mục nhập\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s: gặp lỗi nên các thay đổi bị bỏ qua\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s: không thể khóa tập tin bóng\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s: gặp lỗi khi cập nhật tập tin bóng\n"
 
@@ -549,18 +542,13 @@
 msgstr "%s: gặp lỗi khi cập nhật tập tin mật khẩu\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: không thể khóa tập tin mật khẩu\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: không thể khóa tập tin bóng\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: dòng %d: không biết người dùng %s\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s: dòng %d: không thể câp nhật mục nhập mật khẩu\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -596,7 +584,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s là hệ vỏ không hợp lệ.\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr ""
 "Cách sử dụng: expiry {-f|-c}\n"
@@ -606,7 +593,6 @@
 msgid "%s: unknown user\n"
 msgstr "%s: không biết người dùng\n"
 
-#, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -645,7 +631,6 @@
 "                        dùng này\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Tên dùng\t\tBị lỗi\tTối đa\tMới nhất        Vào\n"
 
@@ -686,14 +671,38 @@
 msgstr "%s: mật khẩu nhóm bóng cần thiết cho tùy chọn « -A »\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "Ai đó?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s: không thể lấy khóa\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+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 re-write file\n"
+msgstr "%s: không thể ghi lại tập tin\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s: không thể ghi lại tập tin bóng\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s: không thể bỏ khóa 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"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s: không thể cập nhật mục nhập bóng\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "không biết nhóm: %s\n"
 
@@ -706,22 +715,6 @@
 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"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "Đang gỡ bỏ người dùng %s khỏi nhóm %s\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: không biết thành viên %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s: không phải là tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Đang thay đổi mật khẩu cho nhóm %s\n"
 
@@ -738,35 +731,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s: hãy thử lại sau.\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: không thể lấy khóa\n"
+msgid "Who are you?\n"
+msgstr "Ai đó?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: không thể lấy khóa bóng\n"
+msgid "Adding user %s to group %s\n"
+msgstr "Đang thêm người dung %s vào nhóm %s\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: không thể cập nhật mục nhập\n"
+msgid "Removing user %s from group %s\n"
+msgstr "Đang gỡ bỏ người dùng %s khỏi nhóm %s\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: không thể cập nhật mục nhập bóng\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s: không biết thành viên %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: không thể ghi lại tập tin\n"
+msgid "%s: Not a tty\n"
+msgstr "%s: không phải là tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: không thể ghi lại tập tin bóng\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: không thể bỏ khóa tập tin\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -799,14 +782,6 @@
 msgstr "%s: gặp lỗi khi thêm mục nhập nhóm mới\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s: tên %s không phải là độc nhất\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u không phải là độc nhất\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s: không thể lấy GID độc nhất\n"
 
@@ -847,6 +822,9 @@
 msgstr "%s: nhóm %s đã có\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s: GID %u không phải là độc nhất\n"
+
 msgid "Usage: groupdel group\n"
 msgstr ""
 "Cách sử dụng: groupdel nhóm\n"
@@ -876,49 +854,39 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s là NIS cái\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "Thành viên đã có\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "Không tìm thấy thành viên cần gỡ bỏ\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 "Cách sử dụng: groupmems -a tên_người_dùng | -d tên_người_dùng | -D | -l [-g "
 "tên_nhóm]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "Chỉ người chủ có khả năng thêm thành viên vào nhóm khác nhau\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr "Yêu cầu quyền truy cập nhóm\n"
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr "Không phải là người chính sở hữu nhóm hiện thời\n"
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "Lỗi xác thực PAM đối với\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "Không thể khoá tập tin nhóm\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "Không thể mở tập tin nhóm\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "Không thể đóng tập tin nhóm\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -928,6 +896,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "Cách sử dụng: groupmod [tùy_chọn...] NHÓM\n"
@@ -963,10 +932,6 @@
 msgstr "Cách sử dụng: %s [-r] [-s] [nhóm]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "Không\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: hai tùy chọn « -s » và « -r » không tương thích với nhau\n"
 
@@ -979,6 +944,9 @@
 msgstr "%s: không thể mở tập tin %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s: không thể cập nhật tập tin %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "mục nhập tập tin nhóm không hợp lệ\n"
 
@@ -986,7 +954,6 @@
 msgid "delete line '%s'? "
 msgstr "xóa bỏ dòng « %s » chứ? "
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "mục nhập nhóm trùng\n"
 
@@ -1018,11 +985,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s: không thể cập nhật mục nhập cho nhóm %s.\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "mục nhập tập tin nhóm bóng không hợp lệ\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "mục nhập nhóm bóng trùng\n"
 
@@ -1039,10 +1004,6 @@
 msgstr "nhóm bóng %s: không có người dùng %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: không thể cập nhật tập tin %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s: những tập tin đã được cập nhật\n"
 
@@ -1074,19 +1035,15 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s: không thể xóa bỏ tập tin nhóm bóng\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "Cách sử dụng: id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "Cách sử dụng: id\n"
 
-#, c-format
 msgid " groups="
 msgstr " nhóm="
 
-#, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1111,17 +1068,19 @@
 "  -u, --user TÊN_DÙNG   hiển thị mục ghi lastlog cho _người dùng_ tên này\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "Tên dùng\t\t Cổng    Từ\t\tGần nhất\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "Tên dùng\t\t\t Cổng   Gần nhất\n"
 
 msgid "**Never logged in**"
 msgstr "**Chưa bao giờ đăng nhập**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "Không biết người dùng: %s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: đối số bất ngờ : %s\n"
@@ -1138,11 +1097,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r máy\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "Thời gian đăng nhập không hợp lệ\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1150,7 +1107,6 @@
 "\n"
 "Hệ thông bị tắt với lý do bảo dưỡng theo thủ tục.\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1190,7 +1146,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "Vượt quá số lần thử lại tối đa (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: (đăng nhập) PAM đã yêu cầu hủy bỏ\n"
 
@@ -1209,6 +1164,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s: việc tạo tiến trình con bị lỗi: %s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Cảnh báo: đăng nhập đã bật lại sau bị khóa ra tạm thời.\n"
 
@@ -1231,18 +1190,20 @@
 "thời gian đăng nhập bị vượt trội\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr ""
 "Cách sử dụng: newgrp [-] [nhóm]\n"
 "[newgrp: nhóm mới]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr ""
 "Cách sử dụng: sg group [[-c] lệnh]\n"
 "[group: nhóm]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "Mật khẩu cũ : "
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "không biết UID: %u\n"
@@ -1251,11 +1212,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "không biết GID: %lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "Mật khẩu cũ : "
-
-#, c-format
 msgid "too many groups\n"
 msgstr "quá nhiều nhóm\n"
 
@@ -1267,7 +1223,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s: chưa có nhóm %s\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: không thể khóa </etc/passwd>.\n"
 
@@ -1280,6 +1246,10 @@
 msgstr "%s: không thể mở các tập tin\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s: gặp lỗi khi cập nhật các tập tin\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s: dòng %d: dòng không hợp lệ\n"
 
@@ -1311,11 +1281,6 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: dòng %d: không thể cập nhật mục nhập\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: gặp lỗi khi cập nhật các tập tin\n"
-
-#, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1385,11 +1350,9 @@
 msgid "New password: "
 msgstr "Mật khẩu mới: "
 
-#, c-format
 msgid "Try again.\n"
 msgstr "Hãy thử lại.\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1397,7 +1360,6 @@
 "\n"
 "Cảnh báo: mật khẩu yếu (hãy gõ lại để chọn nó dù sao)\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "Hai mật khẩu không trùng: hãy thử lại.\n"
 
@@ -1435,11 +1397,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "Mật khẩu cho %s chưa thay đổi.\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "Mật khẩu được thay đổi.\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "Mật khẩu được lập để hết hạn dùng.\n"
 
@@ -1450,11 +1410,9 @@
 "[passwd: mật khẩu\n"
 "shadow: bóng]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "Mục nhập tập tin mật khẩu không hợp lệ\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "mục nhập mật khẩu trùng\n"
 
@@ -1486,11 +1444,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s: không thể cập nhật mục nhập passwd (mật khẩu) cho %s.\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "mục nhập tập tin mật khẩu bóng không hợp lệ\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "mục nhập tập tin mật khẩu bóng trùng\n"
 
@@ -1526,15 +1482,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: không thể xóa bỏ tập tin mật khẩu bóng\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "Truy cập « su » vào tài khoản đó BỊ TỪ CHỐI.\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "Việc xác thức mật khẩu bị vòng.\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "Hãy gõ mật khẩu MÌNH để xác thức.\n"
 
@@ -1542,7 +1495,6 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1598,15 +1550,15 @@
 "%s: %s\n"
 "(Bị bo qua)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "Không có hệ vỏ\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "Không có tập tin mật khẩu\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "Không có mục nhập mật khẩu cho « root » (người chủ)\n"
 
@@ -1650,7 +1602,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: quá nhiều nhóm đã gõ (tối đa %d).\n"
 
-#, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1671,6 +1623,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1723,14 +1677,14 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s: Không thể lấy UID độc nhất\n"
 
+#, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s: không thể lấy GID độc nhất\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: thư mục cơ ban không hợp lệ « %s »\n"
@@ -1822,7 +1776,6 @@
 msgid "Creating mailbox file"
 msgstr "Đang tạo tập tin hộp thư..."
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1844,6 +1797,10 @@
 "\t\t\t\t\tthì hãy sử dụng tùy chọn « -g ».\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s: UID %u không phải độc nhất\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1857,7 +1814,6 @@
 "%s: cảnh báo: chưa hỗ trợ « CREATE_HOME » (tạo thư mục chính)\n"
 "nên hãy sử dụng tùy chọn « -m » thay vào đó.\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1935,7 +1891,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s: gặp lỗi khi gỡ bỏ thư mục %s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -1983,8 +1939,7 @@
 "                            tên _đăng nhập_ mới\n"
 "  -L, --lock                l_khóa_ tài khoản người dùng\n"
 "  -m, --move-home           _di chuyển_ nội dụng của _thư mục chính_\n"
-"                            sang địa điểm mới (chỉ dùng với tùy chọn « -d "
-"»)\n"
+"                            sang địa điểm mới (chỉ dùng với tùy chọn « -d »)\n"
 "  -o, --non-unique          cho phép sử dụng UID trùng (_không độc nhất_)\n"
 "  -p, --password MẬT_KHẨU   sử dụng _mật khẩu_ đã mật mã cho mật\n"
 "                            khẩu mới\n"
@@ -2059,6 +2014,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2097,6 +2058,12 @@
 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 "%s: name %s is not unique\n"
+#~ msgstr "%s: tên %s không phải là độc nhất\n"
+
+#~ msgid "No\n"
+#~ msgstr "Không\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/zh_CN.po
===================================================================
--- upstream/trunk/po/zh_CN.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/zh_CN.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.15\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+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"
@@ -26,7 +26,6 @@
 msgid "crypt method not supported by libcrypt? (%s)\n"
 msgstr ""
 
-#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "无法为配置信息分配空间。\n"
 
@@ -38,19 +37,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "警告:未知组 %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "警告:用户组过多\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "您的密码已过期。"
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "您的密码已失效。"
 
-#, c-format
 msgid "Your login has expired."
 msgstr "您的帐户已过期。"
 
@@ -64,11 +59,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "您的密码将在 %ld 天内过期。\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "您的密码将在明天过期。\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "您的密码今天过期。\n"
 
@@ -76,7 +69,6 @@
 msgid "Unable to change tty %s"
 msgstr "无法改变 tty %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "环境溢出\n"
 
@@ -95,7 +87,6 @@
 "自上一次登录以来已有 %d 次登录失败。\n"
 "最后一次是 %s 在 %s 上。\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "过多登录数量。\n"
 
@@ -190,7 +181,7 @@
 msgid "%s's Password: "
 msgstr "%s 的密码:"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -223,7 +214,6 @@
 "  -W, --warndays 警告天数\t将过期警告天数设为“警告天数”\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "请输入新值,或直接敲回车键以使用默认值\n"
 
@@ -245,27 +235,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "帐户过期时间 (YYYY-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "最近一次密码修改时间\t\t\t\t\t:"
 
-#, c-format
 msgid "never\n"
 msgstr "从不\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "密码未更改。\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "密码过期时间\t\t\t\t\t:"
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "密码失效时间\t\t\t\t\t:"
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "帐户过期时间\t\t\t\t\t\t:"
 
@@ -294,18 +278,14 @@
 msgstr "%s:PAM 验证失败\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s:无法锁定密码文件\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s:无法打开密码文件\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s:未知用户:%s\n"
-
-#, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s:影子密码文件不存在\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s:无法锁定影子密码文件\n"
 
@@ -314,18 +294,14 @@
 msgstr "%s:无法打开影子密码文件\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr "%s:无法降低权限(%s)\n"
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s:无法重写影子密码文件\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "正在为 %s 修改年龄信息\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s:无法重写密码文件\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s:改变字段时出错\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s:无法更新密码文件\n"
 
@@ -334,14 +310,26 @@
 msgstr "%s:无法更新影子密码文件\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s:无法重写影子密码文件\n"
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s:影子密码文件不存在\n"
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s:无法重写密码文件\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr "%s:无法降低权限(%s)\n"
 
 #, c-format
+msgid "%s: unknown user %s\n"
+msgstr "%s:未知用户:%s\n"
+
+#, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "正在为 %s 修改年龄信息\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s:改变字段时出错\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -384,22 +372,28 @@
 msgid "Other"
 msgstr "其它"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s:无法确定您的用户名。\n"
+msgid "Cannot change ID to root.\n"
+msgstr "无法改变 ID 到 root。\n"
 
-#, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s:不能在 NIS 客户端上修改用户“%s”。\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "无法锁定密码文件;稍后再试。\n"
 
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s:“%s”是此客户端的 NIS 管理员。\n"
+msgid "Cannot open the password file.\n"
+msgstr "无法打开密码文件。\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "正在改变 %s 的用户信息\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s:未在 /etc/passwd 中找到 %s\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "更改密码条目时出错。\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "无法提交密码文件改动。\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "无法解锁密码文件。\n"
+
 #, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s:无效的名称:“%s”\n"
@@ -421,37 +415,25 @@
 msgstr "%s:“%s”包含非法字符\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s:字段太长\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s:无法确定您的用户名。\n"
 
 #, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "无法改变 ID 到 root。\n"
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s:不能在 NIS 客户端上修改用户“%s”。\n"
 
 #, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "无法锁定密码文件;稍后再试。\n"
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s:“%s”是此客户端的 NIS 管理员。\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "无法打开密码文件。\n"
+msgid "Changing the user information for %s\n"
+msgstr "正在改变 %s 的用户信息\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s:未在 /etc/passwd 中找到 %s\n"
+msgid "%s: fields too long\n"
+msgstr "%s:字段太长\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "更改密码条目时出错。\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "无法提交密码文件改动。\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "无法解锁密码文件。\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -509,6 +491,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s:无法打开影子文件\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s:更新影子文件时出错。\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s:更新组条目时出错\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s:第 %d 行:此行太长\n"
@@ -521,15 +511,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s:第 %d 行:未知组 %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s:第 %d 行:无法更新密码条目\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s:第 %d 行:无法更新条目\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s:发现错误,忽略改动\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s:无法锁定影子文件\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s:更新影子文件时出错。\n"
 
@@ -538,18 +532,14 @@
 msgstr "%s:更新密码文件时出错。\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s:无法锁定密码文件\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s:无法锁定影子文件\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s:第 %d 行:未知用户 %s\n"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s:第 %d 行:无法更新密码条目\n"
+
+#, fuzzy
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -583,7 +573,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s 是无效的 shell。\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "用法:expiry {-f|-c}\n"
 
@@ -591,7 +580,7 @@
 msgid "%s: unknown user\n"
 msgstr "%s:未知用户\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -624,7 +613,6 @@
 "\t\t\t\t项合用)\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "登录        失败次数  最多   最近                     于\n"
 
@@ -665,14 +653,38 @@
 msgstr "%s:-A 需要影子组密码\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "你是谁?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s:无法获得锁\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+msgstr "%s:无法获得影子锁\n"
+
+#, c-format
 msgid "%s: can't open file\n"
 msgstr "%s:无法打开文件\n"
 
 #, c-format
+msgid "%s: can't re-write file\n"
+msgstr "%s:无法重写文件\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s:无法重写影子文件\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s 无法解锁文件。\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s:无法更新条目\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s:无法更新影子条目\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "未知组:%s\n"
 
@@ -685,22 +697,6 @@
 msgstr "%s:无法打开影子文件\n"
 
 #, c-format
-msgid "Adding user %s to group %s\n"
-msgstr "正在将用户“%s”加入到“%s”组中\n"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "正在将用户“%s”从“%s”组中删除\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s:未知成员 %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s:不是 tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "正在修改 %s 组的密码\n"
 
@@ -717,35 +713,26 @@
 msgid "%s: Try again later\n"
 msgstr "%s:请稍后重试\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s:无法获得锁\n"
+msgid "Who are you?\n"
+msgstr "你是谁?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s:无法获得影子锁\n"
+msgid "Adding user %s to group %s\n"
+msgstr "正在将用户“%s”加入到“%s”组中\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s:无法更新条目\n"
+msgid "Removing user %s from group %s\n"
+msgstr "正在将用户“%s”从“%s”组中删除\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s:无法更新影子条目\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s:未知成员 %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s:无法重写文件\n"
+msgid "%s: Not a tty\n"
+msgstr "%s:不是 tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s:无法重写影子文件\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s 无法解锁文件。\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -774,14 +761,6 @@
 msgstr "%s:增加新组条目时出错\n"
 
 #, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s:名称 %s 并不唯一\n"
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s:GID %u 并不唯一\n"
-
-#, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s:无法获取独有的 GID\n"
 
@@ -822,6 +801,9 @@
 msgstr "%s:%s 组已存在\n"
 
 #, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s:GID %u 并不唯一\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "用法:groupdel 组\n"
 
@@ -849,47 +831,37 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s:%s 是 NIS 管理员\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr "成员已经存在\n"
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr "没有找到要删除的成员\n"
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr "用法:groupmems -a 用户名 | -d 用户名 | -D | -l [-g 组名]\n"
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr "只有 root 能向不同的组里添加成员\n"
 
-#, c-format
 msgid "Group access is required\n"
 msgstr ""
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr ""
 
-#, c-format
 msgid "PAM authentication failed for\n"
 msgstr "PAM 验证失败于\n"
 
-#, c-format
 msgid "Unable to lock group file\n"
 msgstr "无法锁定组文件\n"
 
-#, c-format
 msgid "Unable to open group file\n"
 msgstr "无法打开组文件\n"
 
-#, c-format
 msgid "Cannot close group file\n"
 msgstr "无法关闭组文件\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -899,6 +871,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 "用法:groupadd [选项] 组\n"
@@ -932,10 +905,6 @@
 msgstr "用法:%s [-r] [-s] [组]\n"
 
 #, c-format
-msgid "No\n"
-msgstr "否\n"
-
-#, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s:-s 和 -r 是互不兼容的\n"
 
@@ -948,6 +917,9 @@
 msgstr "%s:无法打开文件 %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s:无法更新文件 %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "无效的组文件条目\n"
 
@@ -955,7 +927,6 @@
 msgid "delete line '%s'? "
 msgstr "删除“%s”一行?"
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "复制组条目\n"
 
@@ -987,11 +958,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s:无法更新 %s 组的条目\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "无效的影子组文件条目\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "复制影子组条目\n"
 
@@ -1008,10 +977,6 @@
 msgstr "%s 影子组:无用户 %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s:无法更新文件 %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s:文件已被更新\n"
 
@@ -1043,19 +1008,16 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s:无法删除影子组文件\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "用法:id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "用法:id\n"
 
-#, c-format
 msgid " groups="
 msgstr " 组="
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1076,17 +1038,19 @@
 "  -u, --user LOGIN\t打印 LOGIN 用户的 lastlog 记录\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "用户名           端口     来自             最后登陆时间\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "用户名                  端口     最后登陆时间\n"
 
 msgid "**Never logged in**"
 msgstr "**从未登录过**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "未知用户:%s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog:意外的参数:%s\n"
@@ -1103,11 +1067,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r 主机\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "无效的登录时间\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1115,7 +1077,6 @@
 "\n"
 "系统关闭,例行维护\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1155,7 +1116,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "已经超过最大尝试次数 (%d)\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr "login: PAM 中止请求\n"
 
@@ -1174,6 +1134,10 @@
 msgid "%s: failure forking: %s"
 msgstr "%s:fork 失败:%s"
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "警告:在短暂的锁定后将恢复登录。\n"
 
@@ -1196,14 +1160,16 @@
 "超过登录时间\n"
 "\n"
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "用法:newgrp [-] [组]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "用法:sg 组 [[-c] 命令]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "旧密码:"
+
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "未知的 UID:%u\n"
@@ -1212,11 +1178,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "未知的 GID:%lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "旧密码:"
-
-#, c-format
 msgid "too many groups\n"
 msgstr "用户组过多\n"
 
@@ -1228,7 +1189,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s:%s 组不存在\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s:无法锁定 /etc/passwd。\n"
 
@@ -1241,6 +1212,10 @@
 msgstr "%s:无法打开文件\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s:更新文件出错\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s:第 %d 行:无效行\n"
 
@@ -1272,11 +1247,7 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s:第 %d 行:无法更新条目\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s:更新文件出错\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1344,11 +1315,9 @@
 msgid "New password: "
 msgstr "新密码:"
 
-#, c-format
 msgid "Try again.\n"
 msgstr "再试试。\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1356,7 +1325,6 @@
 "\n"
 "警告:脆弱的密码(重新输入以强制使用它)。\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "他们并不匹配;请重试。\n"
 
@@ -1394,11 +1362,9 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "%s 的密码未被改变。\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "密码未更改。\n"
 
-#, c-format
 msgid "Password set to expire.\n"
 msgstr "已设定密码过期时间。\n"
 
@@ -1406,11 +1372,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "用法:%s [-q] [-r] [-s] [passwd [shadow]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "无效的密码文件项\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "重复的密码项\n"
 
@@ -1442,11 +1406,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s:无法为 %s 更新密码条目\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "无效的影子密码文件项\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "重复的影子密码文项\n"
 
@@ -1482,15 +1444,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s:无法删除影子密码文件\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "su 到该帐户被拒。\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "忽略密码认证\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "请输入您自己的密码作为验证。\n"
 
@@ -1498,7 +1457,7 @@
 msgid "%s: %s\n"
 msgstr "%s:%s\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1550,15 +1509,15 @@
 "%s:%s\n"
 "(忽略)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "没有 shell\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "没有密码文件\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "没有“root”的密码项\n"
 
@@ -1602,7 +1561,7 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s:指定了过多组(最多 %d)。\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1623,6 +1582,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1662,15 +1623,15 @@
 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"
-
-#, c-format
-msgid "%s: can't get unique UID\n"
+#, fuzzy, c-format
+msgid "%s: can't get unique UID (no more available UIDs)\n"
 msgstr "%s:无法获取独有的 UID\n"
 
 #, fuzzy, c-format
+msgid "%s: can't get unique GID (no more available GIDs)\n"
+msgstr "%s:无法获取独有的 GID\n"
+
+#, fuzzy, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s:无效的主目录“%s”\n"
 
@@ -1761,7 +1722,6 @@
 msgid "Creating mailbox file"
 msgstr "正在创建信箱文件"
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr "没有找到“mail”组。以 0600 权限模式创建用户的信箱文件。\n"
@@ -1779,6 +1739,10 @@
 msgstr "%s:%s 组已经存在 - 如果您想将此用户加入到该组,请使用 -g 参数。\n"
 
 #, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s:UID %u 并不唯一\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1790,7 +1754,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s:警告:CREATE_HOME 未被支持,请使用 -m 参数。\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1858,7 +1821,7 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s:删除目录 %s 时出错\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -1968,8 +1931,15 @@
 msgid "failed to rename mailbox"
 msgstr "无法为信箱改名"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+#, fuzzy
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -2008,6 +1978,12 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s:无法恢复 %s:%s (您的修改在 %s 中)\n"
 
+#~ msgid "%s: name %s is not unique\n"
+#~ msgstr "%s:名称 %s 并不唯一\n"
+
+#~ msgid "No\n"
+#~ msgstr "否\n"
+
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"

Modified: upstream/trunk/po/zh_TW.po
===================================================================
--- upstream/trunk/po/zh_TW.po	2008-01-30 21:15:23 UTC (rev 1748)
+++ upstream/trunk/po/zh_TW.po	2008-02-02 17:20:42 UTC (rev 1749)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.9\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"POT-Creation-Date: 2008-02-02 18:05+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"
@@ -28,7 +28,6 @@
 msgid "crypt method not supported by libcrypt? (%s)\n"
 msgstr ""
 
-#, c-format
 msgid "Could not allocate space for config info.\n"
 msgstr "無法為設定訊息配置空間。\n"
 
@@ -40,19 +39,15 @@
 msgid "Warning: unknown group %s\n"
 msgstr "警告:未知群組 %s\n"
 
-#, c-format
 msgid "Warning: too many groups\n"
 msgstr "警告:使用者群組過多\n"
 
-#, c-format
 msgid "Your password has expired."
 msgstr "您的密碼已過期。"
 
-#, c-format
 msgid "Your password is inactive."
 msgstr "您的密碼已失效。"
 
-#, c-format
 msgid "Your login has expired."
 msgstr "您的帳戶已過期。"
 
@@ -66,11 +61,9 @@
 msgid "Your password will expire in %ld days.\n"
 msgstr "您的密碼將在 %ld 天內過期。\n"
 
-#, c-format
 msgid "Your password will expire tomorrow.\n"
 msgstr "您的密碼將在明天過期。\n"
 
-#, c-format
 msgid "Your password will expire today.\n"
 msgstr "您的密碼今天過期。\n"
 
@@ -78,7 +71,6 @@
 msgid "Unable to change tty %s"
 msgstr "無法改變 tty %s"
 
-#, c-format
 msgid "Environment overflow\n"
 msgstr "環境溢位\n"
 
@@ -97,7 +89,6 @@
 "距離上一次登錄已有 %d 次登錄失敗。\n"
 "最後一次是 %s 在 %s 上。\n"
 
-#, c-format
 msgid "Too many logins.\n"
 msgstr "過多登錄數量。\n"
 
@@ -194,7 +185,7 @@
 msgid "%s's Password: "
 msgstr "%s 的密碼:"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -225,7 +216,6 @@
 "  -W, --warndays WARN_DAYS\t密碼在過期前 WARN_DAYS 天會發出警告\n"
 "\n"
 
-#, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "請輸入新值,或直接按 ENTER 鍵以使用預設值\n"
 
@@ -247,27 +237,21 @@
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "帳戶過期時間 (YYYY-MM-DD)"
 
-#, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "最近一次密碼修改時間\t\t\t\t\t:"
 
-#, c-format
 msgid "never\n"
 msgstr "從不\n"
 
-#, c-format
 msgid "password must be changed\n"
 msgstr "密碼已更改。\n"
 
-#, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "密碼過期\t\t\t\t\t:"
 
-#, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "密碼失效\t\t\t\t\t:"
 
-#, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "帳戶過期\t\t\t\t\t:"
 
@@ -296,18 +280,14 @@
 msgstr "%s:PAM 驗証失敗\n"
 
 #, c-format
+msgid "%s: can't lock password file\n"
+msgstr "%s:無法鎖定密碼檔\n"
+
+#, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s:無法打開密碼文件\n"
 
 #, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s:未知使用者:%s\n"
-
-#, fuzzy, c-format
-msgid "%s: the shadow password file is not present\n"
-msgstr "%s:無法打開影子密碼文件\n"
-
-#, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s:無法鎖定shadow密碼文件\n"
 
@@ -316,18 +296,14 @@
 msgstr "%s:無法打開影子密碼文件\n"
 
 #, c-format
-msgid "%s: failed to drop privileges (%s)\n"
-msgstr ""
+msgid "%s: can't rewrite shadow password file\n"
+msgstr "%s:無法重寫shadow密碼檔案\n"
 
 #, c-format
-msgid "Changing the aging information for %s\n"
-msgstr "正在為 %s 修改年齡訊息\n"
+msgid "%s: can't rewrite password file\n"
+msgstr "%s:無法重寫密碼檔案\n"
 
 #, c-format
-msgid "%s: error changing fields\n"
-msgstr "%s:改變字段時出錯\n"
-
-#, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s:無法更新密碼檔案\n"
 
@@ -335,15 +311,27 @@
 msgid "%s: can't update shadow password file\n"
 msgstr "%s:無法更新shadow密碼檔案\n"
 
+#, fuzzy, c-format
+msgid "%s: the shadow password file is not present\n"
+msgstr "%s:無法打開影子密碼文件\n"
+
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s:無法重寫shadow密碼檔案\n"
+msgid "%s: failed to drop privileges (%s)\n"
+msgstr ""
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s:無法重寫密碼檔案\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s:未知使用者:%s\n"
 
 #, c-format
+msgid "Changing the aging information for %s\n"
+msgstr "正在為 %s 修改年齡訊息\n"
+
+#, c-format
+msgid "%s: error changing fields\n"
+msgstr "%s:改變字段時出錯\n"
+
+#, c-format
 msgid ""
 "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n"
 "\t[-h home_ph] [-o other] [user]\n"
@@ -386,22 +374,28 @@
 msgid "Other"
 msgstr "其它"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s:無法確定您的使用者名稱。\n"
+msgid "Cannot change ID to root.\n"
+msgstr "無法改變 ID 成 root。\n"
 
-#, fuzzy, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s:不能在 NIS 用戶端上修改使用者“%s”。\n"
+msgid "Cannot lock the password file; try again later.\n"
+msgstr "無法鎖定密碼檔案﹔稍後再試。\n"
 
-#, fuzzy, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s:“%s”是用戶端的 NIS 管理員。\n"
+msgid "Cannot open the password file.\n"
+msgstr "無法打開密碼檔案。\n"
 
 #, c-format
-msgid "Changing the user information for %s\n"
-msgstr "正在改變 %s 的使用者訊息\n"
+msgid "%s: %s not found in /etc/passwd\n"
+msgstr "%s:未在 /etc/passwd 中找到 %s\n"
 
+msgid "Error updating the password entry.\n"
+msgstr "更改密碼項目時出錯。\n"
+
+msgid "Cannot commit password file changes.\n"
+msgstr "無法提交密碼檔案變動。\n"
+
+msgid "Cannot unlock the password file.\n"
+msgstr "無法解鎖密碼檔案。\n"
+
 #, fuzzy, c-format
 msgid "%s: invalid name: '%s'\n"
 msgstr "%s:無效的名稱:“%s”\n"
@@ -423,37 +417,25 @@
 msgstr "%s:“%s”包含無效字元\n"
 
 #, c-format
-msgid "%s: fields too long\n"
-msgstr "%s:字段太長\n"
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s:無法確定您的使用者名稱。\n"
 
-#, c-format
-msgid "Cannot change ID to root.\n"
-msgstr "無法改變 ID 成 root。\n"
+#, fuzzy, c-format
+msgid "%s: cannot change user '%s' on NIS client.\n"
+msgstr "%s:不能在 NIS 用戶端上修改使用者“%s”。\n"
 
-#, c-format
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "無法鎖定密碼檔案﹔稍後再試。\n"
+#, fuzzy, c-format
+msgid "%s: '%s' is the NIS master for this client.\n"
+msgstr "%s:“%s”是用戶端的 NIS 管理員。\n"
 
 #, c-format
-msgid "Cannot open the password file.\n"
-msgstr "無法打開密碼檔案。\n"
+msgid "Changing the user information for %s\n"
+msgstr "正在改變 %s 的使用者訊息\n"
 
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s:未在 /etc/passwd 中找到 %s\n"
+msgid "%s: fields too long\n"
+msgstr "%s:字段太長\n"
 
-#, c-format
-msgid "Error updating the password entry.\n"
-msgstr "更改密碼項目時出錯。\n"
-
-#, c-format
-msgid "Cannot commit password file changes.\n"
-msgstr "無法提交密碼檔案變動。\n"
-
-#, c-format
-msgid "Cannot unlock the password file.\n"
-msgstr "無法解鎖密碼檔案。\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options]\n"
@@ -511,6 +493,14 @@
 msgid "%s: can't open shadow file\n"
 msgstr "%s:無法打開 shadow 檔\n"
 
+#, fuzzy, c-format
+msgid "%s: error updating gshadow file\n"
+msgstr "%s:更新shadow檔案時出錯。\n"
+
+#, fuzzy, c-format
+msgid "%s: error updating group file\n"
+msgstr "%s:更新群組項目時出錯\n"
+
 #, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s:第 %d 行:此行太長\n"
@@ -523,15 +513,19 @@
 msgid "%s: line %d: unknown group %s\n"
 msgstr "%s:第 %d 行:未知使用者 %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s:第 %d 行:無法更新密碼項目\n"
+#, fuzzy, c-format
+msgid "%s: line %d: cannot update group entry\n"
+msgstr "%s:第 %d 行:無法更新項目\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr "%s:發現錯誤,忽略更動\n"
 
 #, c-format
+msgid "%s: can't lock shadow file\n"
+msgstr "%s:無法鎖定 shadow 檔\n"
+
+#, c-format
 msgid "%s: error updating shadow file\n"
 msgstr "%s:更新shadow檔案時出錯。\n"
 
@@ -540,18 +534,13 @@
 msgstr "%s:更新密碼檔案時出錯。\n"
 
 #, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s:無法鎖定密碼檔\n"
-
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s:無法鎖定 shadow 檔\n"
-
-#, c-format
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s:第 %d 行:未知使用者 %s\n"
 
 #, c-format
+msgid "%s: line %d: cannot update password entry\n"
+msgstr "%s:第 %d 行:無法更新密碼項目\n"
+
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -580,7 +569,6 @@
 msgid "%s is an invalid shell.\n"
 msgstr "%s 是無效的 shell。\n"
 
-#, c-format
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "用法:expiry {-f|-c}\n"
 
@@ -588,7 +576,7 @@
 msgid "%s: unknown user\n"
 msgstr "%s:未知使用者\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
@@ -620,7 +608,6 @@
 "\t\t\t\t及限制(當和 -r、-m 或 -l 選項搭配使用時)\n"
 "\n"
 
-#, c-format
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "登入        失敗     最多    最後                     在\n"
 
@@ -661,14 +648,38 @@
 msgstr "%s:-A 需要shadow群組密碼\n"
 
 #, c-format
-msgid "Who are you?\n"
-msgstr "你是誰?\n"
+msgid "%s: can't get lock\n"
+msgstr "%s:無法獲得鎖定\n"
 
 #, c-format
+msgid "%s: can't get shadow lock\n"
+msgstr "%s:無法獲得shadow鎖定\n"
+
+#, c-format
 msgid "%s: can't open file\n"
 msgstr "%s:無法打開檔案\n"
 
 #, c-format
+msgid "%s: can't re-write file\n"
+msgstr "%s:無法重寫檔案\n"
+
+#, c-format
+msgid "%s: can't re-write shadow file\n"
+msgstr "%s:無法重寫shadow檔案\n"
+
+#, c-format
+msgid "%s: can't unlock file\n"
+msgstr "%s 無法解鎖檔案。\n"
+
+#, c-format
+msgid "%s: can't update entry\n"
+msgstr "%s:無法更新項目\n"
+
+#, c-format
+msgid "%s: can't update shadow entry\n"
+msgstr "%s:無法更新shadow項目\n"
+
+#, c-format
 msgid "unknown group: %s\n"
 msgstr "未知群組:%s\n"
 
@@ -681,22 +692,6 @@
 msgstr "%s:無法打開 shadow 檔\n"
 
 #, c-format
-msgid "Adding user %s to group %s\n"
-msgstr "正在將使用者“%s”加入到“%s”群組中\n"
-
-#, c-format
-msgid "Removing user %s from group %s\n"
-msgstr "正在將使用者“%s”從“%s”群組中刪除\n"
-
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s:未知成員 %s\n"
-
-#, c-format
-msgid "%s: Not a tty\n"
-msgstr "%s:不是 tty\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "正在修改 %s 群組的密碼\n"
 
@@ -713,35 +708,25 @@
 msgid "%s: Try again later\n"
 msgstr "%s:請稍後重試\n"
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s:無法獲得鎖定\n"
+msgid "Who are you?\n"
+msgstr "你是誰?\n"
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s:無法獲得shadow鎖定\n"
+msgid "Adding user %s to group %s\n"
+msgstr "正在將使用者“%s”加入到“%s”群組中\n"
 
 #, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s:無法更新項目\n"
+msgid "Removing user %s from group %s\n"
+msgstr "正在將使用者“%s”從“%s”群組中刪除\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s:無法更新shadow項目\n"
+msgid "%s: unknown member %s\n"
+msgstr "%s:未知成員 %s\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s:無法重寫檔案\n"
+msgid "%s: Not a tty\n"
+msgstr "%s:不是 tty\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s:無法重寫shadow檔案\n"
-
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s 無法解鎖檔案。\n"
-
-#, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
@@ -760,15 +745,7 @@
 msgid "%s: error adding new group entry\n"
 msgstr "%s:增加新群組項目時出錯\n"
 
-#, c-format
-msgid "%s: name %s is not unique\n"
-msgstr "%s:名稱 %s 並不唯一\n"
-
 #, fuzzy, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s:gid %u 並不唯一\n"
-
-#, fuzzy, c-format
 msgid "%s: can't get unique GID\n"
 msgstr "%s:無法獲取獨有的 gid\n"
 
@@ -808,7 +785,10 @@
 msgid "%s: group %s exists\n"
 msgstr "%s:%s 群組已存在\n"
 
-#, c-format
+#, fuzzy, c-format
+msgid "%s: GID %u is not unique\n"
+msgstr "%s:gid %u 並不唯一\n"
+
 msgid "Usage: groupdel group\n"
 msgstr "用法:groupdel 群組\n"
 
@@ -836,47 +816,40 @@
 msgid "%s: %s is the NIS master\n"
 msgstr "%s:%s 是 NIS 管理員\n"
 
-#, c-format
 msgid "Member already exists\n"
 msgstr ""
 
-#, c-format
 msgid "Member to remove could not be found\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
 msgstr ""
 
-#, c-format
 msgid "Only root can add members to different groups\n"
 msgstr ""
 
-#, c-format
 msgid "Group access is required\n"
 msgstr ""
 
-#, c-format
 msgid "Not primary owner of current group\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "PAM authentication failed for\n"
 msgstr "%s:PAM 驗証失敗\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to lock group file\n"
 msgstr "%s:無法鎖定群組檔案\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Unable to open group file\n"
 msgstr "%s:無法打開群組檔案\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Cannot close group file\n"
 msgstr "%s:無法打開群組檔案\n"
 
-#, c-format
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -886,6 +859,7 @@
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
 "  -o, --non-unique              allow using duplicate (non-unique) GID by "
 "GROUP\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
 "\n"
 msgstr ""
 
@@ -909,10 +883,6 @@
 msgid "Usage: %s [-r] [-s] [group]\n"
 msgstr "用法:%s [-r] [-s] [群組]\n"
 
-#, fuzzy, c-format
-msgid "No\n"
-msgstr "取消"
-
 #, c-format
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s:-s 和 -r 是互不相容的\n"
@@ -926,6 +896,9 @@
 msgstr "%s:無法打開檔案 %s\n"
 
 #, c-format
+msgid "%s: cannot update file %s\n"
+msgstr "%s:無法更新檔案 %s\n"
+
 msgid "invalid group file entry\n"
 msgstr "無效的群組檔案項目\n"
 
@@ -933,7 +906,6 @@
 msgid "delete line '%s'? "
 msgstr "刪除“%s”行?\""
 
-#, c-format
 msgid "duplicate group entry\n"
 msgstr "複製群組項目\n"
 
@@ -965,11 +937,9 @@
 msgid "%s: can't update entry for group %s\n"
 msgstr "%s:無法更新 %s 群組的項目\n"
 
-#, c-format
 msgid "invalid shadow group file entry\n"
 msgstr "無效的shadow群組檔案項目\n"
 
-#, c-format
 msgid "duplicate shadow group entry\n"
 msgstr "複製shadow群組項目\n"
 
@@ -986,10 +956,6 @@
 msgstr "%s shadow群組:無使用者 %s\n"
 
 #, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s:無法更新檔案 %s\n"
-
-#, c-format
 msgid "%s: the files have been updated\n"
 msgstr "%s:檔案已被更新\n"
 
@@ -1021,19 +987,16 @@
 msgid "%s: can't delete shadow group file\n"
 msgstr "%s:無法刪除shadow群組檔案\n"
 
-#, c-format
 msgid "Usage: id [-a]\n"
 msgstr "用法:id [-a]\n"
 
-#, c-format
 msgid "Usage: id\n"
 msgstr "用法:id\n"
 
-#, c-format
 msgid " groups="
 msgstr " 群組="
 
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
@@ -1053,17 +1016,19 @@
 "  -u, --user LOGIN\t根據指定的 LOGIN 列出該使用者最後的歷史記錄\n"
 "\n"
 
-#, c-format
 msgid "Username         Port     From             Latest\n"
 msgstr "使用者名         埠號     來自             最後登入時間\n"
 
-#, c-format
 msgid "Username                Port     Latest\n"
 msgstr "使用者名                  埠號     最後登入時間\n"
 
 msgid "**Never logged in**"
 msgstr "**從未登入過**"
 
+#, fuzzy, c-format
+msgid "Unknown user or range: %s\n"
+msgstr "未知使用者:%s\n"
+
 #, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr ""
@@ -1080,11 +1045,9 @@
 msgid "       %s [-p] -r host\n"
 msgstr "       %s [-p] -r 主機\n"
 
-#, c-format
 msgid "Invalid login time\n"
 msgstr "無效的登入時間\n"
 
-#, c-format
 msgid ""
 "\n"
 "System closed for routine maintenance\n"
@@ -1092,7 +1055,6 @@
 "\n"
 "系統關閉,例行維護\n"
 
-#, c-format
 msgid ""
 "\n"
 "[Disconnect bypassed -- root login allowed.]\n"
@@ -1136,7 +1098,6 @@
 msgid "Maximum number of tries exceeded (%d)\n"
 msgstr "最多必須相隔幾天才能改變密碼\t\t\t\t:%ld\n"
 
-#, c-format
 msgid "login: abort requested by PAM\n"
 msgstr ""
 
@@ -1155,6 +1116,10 @@
 msgid "%s: failure forking: %s"
 msgstr ""
 
+#, c-format
+msgid "TIOCSCTTY failed on %s"
+msgstr ""
+
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "警告:在短暫的鎖定後將恢復登入。\n"
 
@@ -1175,14 +1140,16 @@
 "\n"
 msgstr ""
 
-#, c-format
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "用法:newgrp [-] [群組]\n"
 
-#, c-format
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "用法:sg 群組 [[-c] 命令]\n"
 
+#, fuzzy
+msgid "Invalid password.\n"
+msgstr "舊密碼:"
+
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "未知的 GID:%lu\n"
@@ -1191,11 +1158,6 @@
 msgid "unknown GID: %lu\n"
 msgstr "未知的 GID:%lu\n"
 
-#, fuzzy
-msgid "Invalid password."
-msgstr "舊密碼:"
-
-#, c-format
 msgid "too many groups\n"
 msgstr "使用者群組過多\n"
 
@@ -1207,7 +1169,17 @@
 "%s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgstr "%s:%s 群組不存在\n"
+
 #, c-format
+msgid ""
+"%s: group %s created, failure during the creation of the corresponding "
+"gshadow group\n"
+msgstr ""
+
+#, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s:無法鎖定 /etc/passwd。\n"
 
@@ -1220,6 +1192,10 @@
 msgstr "%s:無法打開檔案\n"
 
 #, c-format
+msgid "%s: error updating files\n"
+msgstr "%s:更新檔案出錯\n"
+
+#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr "%s:第 %d 行:無效行\n"
 
@@ -1251,11 +1227,7 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s:第 %d 行:無法更新項目\n"
 
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s:更新檔案出錯\n"
-
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1315,11 +1287,9 @@
 msgid "New password: "
 msgstr "新密碼:"
 
-#, c-format
 msgid "Try again.\n"
 msgstr "重試。\n"
 
-#, c-format
 msgid ""
 "\n"
 "Warning: weak password (enter it again to use it anyway).\n"
@@ -1327,7 +1297,6 @@
 "\n"
 "警告:脆弱的密碼(重新輸入以強制使用它)。\n"
 
-#, c-format
 msgid "They don't match; try again.\n"
 msgstr "他們並不匹配﹔請重試。\n"
 
@@ -1365,11 +1334,10 @@
 msgid "The password for %s is unchanged.\n"
 msgstr "%s 的密碼未被改變。\n"
 
-#, c-format
 msgid "Password changed.\n"
 msgstr "密碼已更改。\n"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Password set to expire.\n"
 msgstr "您的密碼已過期。"
 
@@ -1377,11 +1345,9 @@
 msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n"
 msgstr "用法:%s [-q] [-r] [-s] [passwd [shadow]]\n"
 
-#, c-format
 msgid "invalid password file entry\n"
 msgstr "無效的密碼檔案項目\n"
 
-#, c-format
 msgid "duplicate password entry\n"
 msgstr "重復的密碼項目\n"
 
@@ -1413,11 +1379,9 @@
 msgid "%s: can't update passwd entry for %s\n"
 msgstr "%s:無法為 %s 更新密碼項目\n"
 
-#, c-format
 msgid "invalid shadow password file entry\n"
 msgstr "無效的shadow密碼檔案項目\n"
 
-#, c-format
 msgid "duplicate shadow password entry\n"
 msgstr "重復的shadow密碼項目\n"
 
@@ -1453,15 +1417,12 @@
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s:無法刪除shadow密碼檔案\n"
 
-#, c-format
 msgid "Access to su to that account DENIED.\n"
 msgstr "su 到該帳戶被拒。\n"
 
-#, c-format
 msgid "Password authentication bypassed.\n"
 msgstr "忽略密碼認証\n"
 
-#, c-format
 msgid "Please enter your OWN password as authentication.\n"
 msgstr "請輸入您自己的密碼作為驗証。\n"
 
@@ -1469,7 +1430,6 @@
 msgid "%s: %s\n"
 msgstr "passwd:%s\n"
 
-#, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
@@ -1511,15 +1471,15 @@
 "%s:%s\n"
 "(忽略)\n"
 
-#, c-format
 msgid "No shell\n"
 msgstr "沒有 shell\n"
 
-#, c-format
 msgid "No password file\n"
 msgstr "沒有密碼檔案\n"
 
-#, c-format
+msgid "TIOCSCTTY failed"
+msgstr ""
+
 msgid "No password entry for 'root'\n"
 msgstr "沒有“root”的密碼項目\n"
 
@@ -1563,7 +1523,6 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s:指定了過多群組(最多 %d)。\n"
 
-#, c-format
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1584,6 +1543,8 @@
 "  -h, --help                    display this help message and exit\n"
 "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
 "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -l,                           do not add the user to the lastlog and\n"
+"                                faillog databases\n"
 "  -m, --create-home             create home directory for the new user\n"
 "                                account\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1604,11 +1565,11 @@
 msgstr "%s:update_gshadow 時記憶體不足\n"
 
 #, fuzzy, c-format
-msgid "%s: UID %u is not unique\n"
-msgstr "%s:gid %u 並不唯一\n"
+msgid "%s: can't get unique UID (no more available UIDs)\n"
+msgstr "%s:無法獲取獨有的 gid\n"
 
 #, fuzzy, c-format
-msgid "%s: can't get unique UID\n"
+msgid "%s: can't get unique GID (no more available GIDs)\n"
 msgstr "%s:無法獲取獨有的 gid\n"
 
 #, fuzzy, c-format
@@ -1702,7 +1663,6 @@
 msgid "Creating mailbox file"
 msgstr ""
 
-#, c-format
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
@@ -1720,6 +1680,10 @@
 msgstr ""
 "%s:%s 群組已經存在 - 如果您想將此使用者加入到該群組,請使用 -g 參數。\n"
 
+#, fuzzy, c-format
+msgid "%s: UID %u is not unique\n"
+msgstr "%s:gid %u 並不唯一\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1730,7 +1694,6 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s:警告:CREATE_HOME 不支援,請使用 -m 參數。\n"
 
-#, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1798,7 +1761,6 @@
 msgid "%s: error removing directory %s\n"
 msgstr "%s:刪除目錄 %s 時出錯\n"
 
-#, c-format
 msgid ""
 "Usage: usermod [options] LOGIN\n"
 "\n"
@@ -1890,6 +1852,12 @@
 
 #, c-format
 msgid ""
+"You have modified %s.\n"
+"You may need to modify %s for consistency.\n"
+"Please use the command `%s' to do so.\n"
+msgstr ""
+
+msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
@@ -1919,7 +1887,14 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s:無法復原 %s:%s (您的修改在 %s 中)\n"
 
+#~ msgid "%s: name %s is not unique\n"
+#~ msgstr "%s:名稱 %s 並不唯一\n"
+
 #, fuzzy
+#~ msgid "No\n"
+#~ msgstr "取消"
+
+#, fuzzy
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"




More information about the Pkg-shadow-commits mailing list