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

Nicolas FRANCOIS nekral-guest at alioth.debian.org
Sun Apr 5 23:52:46 UTC 2009


Author: nekral-guest
Date: 2009-04-05 23:52:46 +0000 (Sun, 05 Apr 2009)
New Revision: 2599

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/man/po/de.po
   upstream/trunk/man/po/fr.po
   upstream/trunk/man/po/it.po
   upstream/trunk/man/po/pl.po
   upstream/trunk/man/po/ru.po
   upstream/trunk/man/po/sv.po
   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/kk.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:
	* po/*.po, man/po/*.po: Updated PO files.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/ChangeLog	2009-04-05 23:52:46 UTC (rev 2599)
@@ -1,6 +1,7 @@
 2009-04-06  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* configure.in: Prepare the next 4.1.3 release.
+	* po/*.po, man/po/*.po: Updated PO files.
 
 2009-04-06  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/man/po/de.po
===================================================================
--- upstream/trunk/man/po/de.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/man/po/de.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow-man-pages\n"
-"POT-Creation-Date: 2008-05-24 21:02+0200\n"
+"POT-Creation-Date: 2009-04-06 00:48+0200\n"
 "PO-Revision-Date: 2007-06-11 10:16+0200\n"
 "Last-Translator: Simon Brandmair <sbrandmair at gmx.net>\n"
 "Language-Team: debian-l10n-german <http://lists.debian.org/debian-l10n-"
@@ -14,76 +14,75 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: vipw.8.xml:9(refentrytitle) vipw.8.xml:14(refname) vipw.8.xml:23(command)
-#: login.defs.5.xml:419(term)
+#: vipw.8.xml:38(refentrytitle) vipw.8.xml:43(refname) vipw.8.xml:52(command)
 msgid "vipw"
 msgstr "vipw"
 
-#: vipw.8.xml:10(manvolnum) usermod.8.xml:11(manvolnum)
-#: userdel.8.xml:13(manvolnum) userdel.8.xml:170(replaceable)
-#: useradd.8.xml:20(manvolnum) pwconv.8.xml:13(manvolnum)
-#: pwck.8.xml:12(manvolnum) nologin.8.xml:6(manvolnum)
-#: newusers.8.xml:22(manvolnum) logoutd.8.xml:6(manvolnum)
-#: lastlog.8.xml:6(manvolnum) grpck.8.xml:10(manvolnum)
-#: groupmod.8.xml:10(manvolnum) groupmems.8.xml:10(manvolnum)
-#: groupdel.8.xml:10(manvolnum) groupdel.8.xml:100(replaceable)
-#: groupadd.8.xml:12(manvolnum) faillog.8.xml:6(manvolnum)
-#: faillog.5.xml:53(manvolnum) chpasswd.8.xml:13(manvolnum)
-#: chgpasswd.8.xml:14(manvolnum)
+#: vipw.8.xml:39(manvolnum) usermod.8.xml:40(manvolnum)
+#: userdel.8.xml:42(manvolnum) userdel.8.xml:199(replaceable)
+#: useradd.8.xml:50(manvolnum) pwconv.8.xml:43(manvolnum)
+#: pwck.8.xml:41(manvolnum) nologin.8.xml:35(manvolnum)
+#: newusers.8.xml:51(manvolnum) logoutd.8.xml:35(manvolnum)
+#: lastlog.8.xml:36(manvolnum) grpck.8.xml:39(manvolnum)
+#: groupmod.8.xml:39(manvolnum) groupmems.8.xml:39(manvolnum)
+#: groupdel.8.xml:39(manvolnum) groupdel.8.xml:129(replaceable)
+#: groupadd.8.xml:43(manvolnum) faillog.8.xml:35(manvolnum)
+#: faillog.5.xml:82(manvolnum) chpasswd.8.xml:42(manvolnum)
+#: chgpasswd.8.xml:43(manvolnum)
 msgid "8"
 msgstr "8"
 
-#: vipw.8.xml:11(refmiscinfo) usermod.8.xml:12(refmiscinfo)
-#: userdel.8.xml:14(refmiscinfo) useradd.8.xml:21(refmiscinfo)
-#: pwconv.8.xml:14(refmiscinfo) pwck.8.xml:13(refmiscinfo)
-#: nologin.8.xml:7(refmiscinfo) newusers.8.xml:23(refmiscinfo)
-#: logoutd.8.xml:7(refmiscinfo) lastlog.8.xml:7(refmiscinfo)
-#: grpck.8.xml:11(refmiscinfo) groupmod.8.xml:11(refmiscinfo)
-#: groupmems.8.xml:11(refmiscinfo) groupdel.8.xml:11(refmiscinfo)
-#: groupadd.8.xml:13(refmiscinfo) faillog.8.xml:7(refmiscinfo)
-#: chpasswd.8.xml:14(refmiscinfo) chgpasswd.8.xml:15(refmiscinfo)
+#: vipw.8.xml:40(refmiscinfo) usermod.8.xml:41(refmiscinfo)
+#: userdel.8.xml:43(refmiscinfo) useradd.8.xml:51(refmiscinfo)
+#: pwconv.8.xml:44(refmiscinfo) pwck.8.xml:42(refmiscinfo)
+#: nologin.8.xml:36(refmiscinfo) newusers.8.xml:52(refmiscinfo)
+#: logoutd.8.xml:36(refmiscinfo) lastlog.8.xml:37(refmiscinfo)
+#: grpck.8.xml:40(refmiscinfo) groupmod.8.xml:40(refmiscinfo)
+#: groupmems.8.xml:40(refmiscinfo) groupdel.8.xml:40(refmiscinfo)
+#: groupadd.8.xml:44(refmiscinfo) faillog.8.xml:36(refmiscinfo)
+#: chpasswd.8.xml:43(refmiscinfo) chgpasswd.8.xml:44(refmiscinfo)
 msgid "System Management Commands"
 msgstr "Befehle zur Systemverwaltung"
 
-#: vipw.8.xml:15(refname) vipw.8.xml:29(command)
+#: vipw.8.xml:44(refname) vipw.8.xml:58(command)
 msgid "vigr"
 msgstr "vigr"
 
-#: vipw.8.xml:16(refpurpose)
+#: vipw.8.xml:45(refpurpose)
 msgid "edit the password, group, shadow-password or shadow-group file"
 msgstr ""
 "bearbeitet die Passwort-, Gruppen-, Shadow-Passwort- oder Shadow-Gruppen-"
 "Datei"
 
-#: vipw.8.xml:25(replaceable) vipw.8.xml:31(replaceable)
-#: usermod.8.xml:23(replaceable) userdel.8.xml:23(arg)
-#: useradd.8.xml:31(replaceable) useradd.8.xml:43(replaceable)
-#: su.1.xml:37(replaceable) passwd.1.xml:28(replaceable)
-#: lastlog.8.xml:18(replaceable) groupmod.8.xml:22(replaceable)
-#: faillog.8.xml:18(replaceable) chsh.1.xml:24(replaceable)
-#: chpasswd.8.xml:25(replaceable) chgpasswd.8.xml:26(replaceable)
-#: chage.1.xml:17(replaceable)
+#: vipw.8.xml:54(replaceable) vipw.8.xml:60(replaceable)
+#: usermod.8.xml:52(replaceable) userdel.8.xml:52(arg)
+#: useradd.8.xml:61(replaceable) useradd.8.xml:73(replaceable)
+#: su.1.xml:66(replaceable) passwd.1.xml:57(replaceable)
+#: lastlog.8.xml:48(replaceable) groupmod.8.xml:51(replaceable)
+#: groupadd.8.xml:55(replaceable) faillog.8.xml:47(replaceable)
+#: chsh.1.xml:53(replaceable) chpasswd.8.xml:54(replaceable)
+#: chgpasswd.8.xml:55(replaceable) chage.1.xml:46(replaceable)
 msgid "options"
 msgstr "Optionen"
 
-#: vipw.8.xml:37(title) usermod.8.xml:30(title) userdel.8.xml:31(title)
-#: useradd.8.xml:49(title) suauth.5.xml:21(title) su.1.xml:48(title)
-#: sg.1.xml:30(title) shadow.5.xml:15(title) shadow.3.xml:64(title)
-#: shadow.3.xml:120(title) pwconv.8.xml:40(title) pwck.8.xml:52(title)
-#: porttime.5.xml:15(title) passwd.5.xml:15(title) passwd.1.xml:37(title)
-#: nologin.8.xml:21(title) newusers.8.xml:40(title) newgrp.1.xml:26(title)
-#: logoutd.8.xml:21(title) login.defs.5.xml:76(title)
-#: login.access.5.xml:15(title) login.1.xml:72(title) limits.5.xml:16(title)
-#: lastlog.8.xml:24(title) gshadow.5.xml:15(title) grpck.8.xml:40(title)
-#: groups.1.xml:24(title) groupmod.8.xml:29(title) groupmems.8.xml:31(title)
-#: groupdel.8.xml:28(title) groupadd.8.xml:36(title) gpasswd.1.xml:40(title)
-#: faillog.8.xml:24(title) faillog.5.xml:15(title) expiry.1.xml:29(title)
-#: chsh.1.xml:33(title) chpasswd.8.xml:31(title) chgpasswd.8.xml:32(title)
-#: chfn.1.xml:34(title) chage.1.xml:26(title)
+#: vipw.8.xml:66(title) usermod.8.xml:59(title) userdel.8.xml:60(title)
+#: useradd.8.xml:79(title) suauth.5.xml:50(title) su.1.xml:77(title)
+#: sg.1.xml:59(title) shadow.5.xml:44(title) shadow.3.xml:93(title)
+#: shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:81(title)
+#: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
+#: nologin.8.xml:50(title) newusers.8.xml:69(title) newgrp.1.xml:55(title)
+#: logoutd.8.xml:50(title) login.defs.5.xml:107(title)
+#: login.access.5.xml:45(title) login.1.xml:103(title) limits.5.xml:46(title)
+#: lastlog.8.xml:54(title) gshadow.5.xml:43(title) grpck.8.xml:69(title)
+#: groups.1.xml:53(title) groupmod.8.xml:58(title) groupmems.8.xml:60(title)
+#: groupdel.8.xml:57(title) groupadd.8.xml:62(title) gpasswd.1.xml:69(title)
+#: faillog.8.xml:53(title) faillog.5.xml:44(title) expiry.1.xml:59(title)
+#: chsh.1.xml:62(title) chpasswd.8.xml:60(title) chgpasswd.8.xml:61(title)
+#: chfn.1.xml:63(title) chage.1.xml:55(title)
 msgid "DESCRIPTION"
 msgstr "BESCHREIBUNG"
 
-#: vipw.8.xml:38(para)
+#: vipw.8.xml:67(para)
 msgid ""
 "The <command>vipw</command> and <command>vigr</command> commands edits the "
 "files <filename>/etc/passwd</filename> and <filename>/etc/group</filename>, "
@@ -107,17 +106,17 @@
 "Zuletzt wird der Standardeditor <citerefentry><refentrytitle>vi</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry> verwendet."
 
-#: vipw.8.xml:55(title) usermod.8.xml:38(title) userdel.8.xml:40(title)
-#: useradd.8.xml:62(title) su.1.xml:94(title) pwck.8.xml:104(title)
-#: passwd.1.xml:123(title) newusers.8.xml:98(title) login.1.xml:157(title)
-#: lastlog.8.xml:36(title) grpck.8.xml:85(title) groupmod.8.xml:38(title)
-#: groupmems.8.xml:46(title) groupadd.8.xml:45(title) gpasswd.1.xml:80(title)
-#: faillog.8.xml:35(title) chsh.1.xml:44(title) chpasswd.8.xml:59(title)
-#: chgpasswd.8.xml:59(title) chage.1.xml:36(title)
+#: vipw.8.xml:84(title) usermod.8.xml:67(title) userdel.8.xml:69(title)
+#: useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:133(title)
+#: passwd.1.xml:151(title) newusers.8.xml:221(title) login.1.xml:188(title)
+#: lastlog.8.xml:66(title) grpck.8.xml:114(title) groupmod.8.xml:67(title)
+#: groupmems.8.xml:75(title) groupadd.8.xml:71(title) gpasswd.1.xml:109(title)
+#: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:88(title)
+#: chgpasswd.8.xml:88(title) chage.1.xml:65(title)
 msgid "OPTIONS"
 msgstr "OPTIONEN"
 
-#: vipw.8.xml:56(para)
+#: vipw.8.xml:85(para)
 msgid ""
 "The options which apply to the <command>vipw</command> and <command>vigr</"
 "command> commands are:"
@@ -125,251 +124,168 @@
 "Die Optionen, die von den Befehlen <command>vipw</command> und "
 "<command>vigr</command> unterstützt werden, sind:"
 
-#: vipw.8.xml:62(term)
+#: vipw.8.xml:91(term)
 msgid "<option>-g</option>, <option>--group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: vipw.8.xml:64(para)
+#: vipw.8.xml:93(para)
 msgid "Edit group database."
 msgstr "Bearbeitet die Gruppen-Datenbank."
 
-#: vipw.8.xml:68(term) userdel.8.xml:70(term) useradd.8.xml:179(term)
-#: passwd.1.xml:163(term) lastlog.8.xml:52(term) groupmod.8.xml:64(term)
-#: groupadd.8.xml:80(term) faillog.8.xml:48(term) chsh.1.xml:50(term)
-#: chpasswd.8.xml:82(term) chgpasswd.8.xml:82(term) chage.1.xml:74(term)
+#: vipw.8.xml:97(term) userdel.8.xml:99(term) useradd.8.xml:247(term)
+#: passwd.1.xml:191(term) lastlog.8.xml:82(term) groupmod.8.xml:93(term)
+#: groupadd.8.xml:106(term) faillog.8.xml:80(term) chsh.1.xml:79(term)
+#: chpasswd.8.xml:114(term) chgpasswd.8.xml:114(term) chage.1.xml:103(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr "<option>-h</option>, <option>--help</option>"
 
-#: vipw.8.xml:70(para) userdel.8.xml:72(para) useradd.8.xml:181(para)
-#: passwd.1.xml:165(para) lastlog.8.xml:56(para) groupmod.8.xml:66(para)
-#: groupadd.8.xml:82(para) faillog.8.xml:50(para) chsh.1.xml:52(para)
-#: chpasswd.8.xml:84(para) chgpasswd.8.xml:84(para) chage.1.xml:76(para)
+#: vipw.8.xml:99(para) userdel.8.xml:101(para) useradd.8.xml:249(para)
+#: passwd.1.xml:193(para) lastlog.8.xml:86(para) groupmod.8.xml:95(para)
+#: groupadd.8.xml:108(para) faillog.8.xml:82(para) chsh.1.xml:81(para)
+#: chpasswd.8.xml:116(para) chgpasswd.8.xml:116(para) chage.1.xml:105(para)
 msgid "Display help message and exit."
 msgstr "Zeigt die Hilfe an und beendet das Programm."
 
-#: vipw.8.xml:74(term)
+#: vipw.8.xml:103(term)
 msgid "<option>-p</option>, <option>--passwd</option>"
 msgstr "<option>-p</option>, <option>--passwd</option>"
 
-#: vipw.8.xml:76(para)
+#: vipw.8.xml:105(para)
 msgid "Edit passwd database."
 msgstr "Bearbeitet die Passwd-Datenbank."
 
-#: vipw.8.xml:80(term) passwd.1.xml:218(term)
+#: vipw.8.xml:109(term) passwd.1.xml:258(term)
 msgid "<option>-q</option>, <option>--quiet</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:82(para) passwd.1.xml:222(para)
+#: vipw.8.xml:111(para) passwd.1.xml:262(para)
 msgid "Quiet mode."
 msgstr "Stiller Modus."
 
-#: vipw.8.xml:86(term)
+#: vipw.8.xml:115(term)
 msgid "<option>-s</option>, <option>--shadow</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: vipw.8.xml:88(para)
+#: vipw.8.xml:117(para)
 msgid "Edit shadow or gshadow database."
 msgstr "Bearbeitet die Shadow- oder Gshadow-Datenbank."
 
-#: vipw.8.xml:95(title) usermod.8.xml:265(title) userdel.8.xml:96(title)
-#: useradd.8.xml:471(title) su.1.xml:196(title) sg.1.xml:47(title)
-#: pwconv.8.xml:116(title) pwck.8.xml:153(title) passwd.1.xml:307(title)
-#: newusers.8.xml:174(title) newgrp.1.xml:58(title) login.1.xml:236(title)
-#: grpck.8.xml:125(title) groupmod.8.xml:109(title) groupmems.8.xml:107(title)
-#: groupdel.8.xml:47(title) groupadd.8.xml:149(title) gpasswd.1.xml:186(title)
-#: chsh.1.xml:91(title) chpasswd.8.xml:139(title) chgpasswd.8.xml:133(title)
-#: chfn.1.xml:70(title)
-msgid "CONFIGURATION"
-msgstr ""
-
-#: vipw.8.xml:96(para) usermod.8.xml:266(para) userdel.8.xml:97(para)
-#: useradd.8.xml:472(para) su.1.xml:197(para) sg.1.xml:48(para)
-#: pwck.8.xml:154(para) passwd.1.xml:308(para) newusers.8.xml:175(para)
-#: newgrp.1.xml:59(para) login.1.xml:237(para) grpck.8.xml:126(para)
-#: groupmod.8.xml:110(para) groupmems.8.xml:108(para) groupdel.8.xml:48(para)
-#: groupadd.8.xml:150(para) gpasswd.1.xml:187(para) chsh.1.xml:92(para)
-#: chpasswd.8.xml:140(para) chgpasswd.8.xml:134(para) chfn.1.xml:71(para)
-msgid ""
-"The following configuration variables in <filename>/etc/login.defs</"
-"filename> change the behavior of this tool:"
-msgstr ""
-
-#: vipw.8.xml:2(term) usermod.8.xml:2(term) userdel.8.xml:2(term)
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) newusers.8.xml:2(term)
-#: login.defs.5.xml:2(term) grpck.8.xml:2(term) groupmod.8.xml:2(term)
-#: groupmems.8.xml:2(term) groupdel.8.xml:2(term) groupadd.8.xml:2(term)
-#: gpasswd.1.xml:2(term) chgpasswd.8.xml:2(term)
-msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
-msgstr ""
-
-#: vipw.8.xml:4(para) usermod.8.xml:4(para) userdel.8.xml:4(para)
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) newusers.8.xml:4(para)
-#: login.defs.5.xml:4(para) grpck.8.xml:4(para) groupmod.8.xml:4(para)
-#: groupmems.8.xml:4(para) groupdel.8.xml:4(para) groupadd.8.xml:4(para)
-#: gpasswd.1.xml:4(para) chgpasswd.8.xml:4(para)
-msgid ""
-"Maximum members per group entry. When the maximum is reached, a new group "
-"entry (line) is started in <filename>/etc/group</filename> (with the same "
-"name, same password, and same GID)."
-msgstr ""
-
-#: vipw.8.xml:9(para) usermod.8.xml:9(para) userdel.8.xml:9(para)
-#: useradd.8.xml:9(para) pwconv.8.xml:9(para) newusers.8.xml:9(para)
-#: login.defs.5.xml:9(para) grpck.8.xml:9(para) groupmod.8.xml:9(para)
-#: groupmems.8.xml:9(para) groupdel.8.xml:9(para) groupadd.8.xml:9(para)
-#: gpasswd.1.xml:9(para) chgpasswd.8.xml:9(para)
-msgid ""
-"The default value is 0, meaning that there are no limits in the number of "
-"members in a group."
-msgstr ""
-
-#. Note: on HP, split groups have the same ID, but different
-#.                names.
-#: vipw.8.xml:15(para) usermod.8.xml:15(para) userdel.8.xml:15(para)
-#: useradd.8.xml:15(para) pwconv.8.xml:15(para) newusers.8.xml:15(para)
-#: login.defs.5.xml:15(para) grpck.8.xml:15(para) groupmod.8.xml:15(para)
-#: groupmems.8.xml:15(para) groupdel.8.xml:15(para) groupadd.8.xml:15(para)
-#: gpasswd.1.xml:15(para) chgpasswd.8.xml:15(para)
-msgid ""
-"This feature (split group) permits to limit the length of lines in the group "
-"file. This is useful to make sure that lines for NIS groups are not larger "
-"than 1024 characters."
-msgstr ""
-
-#: vipw.8.xml:20(para) usermod.8.xml:20(para) userdel.8.xml:20(para)
-#: useradd.8.xml:20(para) pwconv.8.xml:20(para) newusers.8.xml:20(para)
-#: login.defs.5.xml:20(para) grpck.8.xml:20(para) groupmod.8.xml:20(para)
-#: groupmems.8.xml:20(para) groupdel.8.xml:20(para) groupadd.8.xml:20(para)
-#: gpasswd.1.xml:20(para) chgpasswd.8.xml:20(para)
-msgid "If you need to enforce such limit, you can use 25."
-msgstr ""
-
-#: vipw.8.xml:23(para) usermod.8.xml:23(para) userdel.8.xml:23(para)
-#: useradd.8.xml:23(para) pwconv.8.xml:23(para) newusers.8.xml:23(para)
-#: login.defs.5.xml:23(para) grpck.8.xml:23(para) groupmod.8.xml:23(para)
-#: groupmems.8.xml:23(para) groupdel.8.xml:23(para) groupadd.8.xml:23(para)
-#: gpasswd.1.xml:23(para) chgpasswd.8.xml:23(para)
-msgid ""
-"Note: split groups may not be supported by all tools (even in the Shadow "
-"toolsuite. You should not use this variable unless you really need it."
-msgstr ""
-
-#: vipw.8.xml:107(title) usermod.8.xml:278(title) userdel.8.xml:111(title)
-#: useradd.8.xml:493(title) suauth.5.xml:139(title) su.1.xml:224(title)
-#: sg.1.xml:59(title) shadow.5.xml:105(title) shadow.3.xml:172(title)
-#: pwconv.8.xml:138(title) pwck.8.xml:167(title) porttime.5.xml:76(title)
-#: passwd.5.xml:87(title) passwd.1.xml:325(title) newusers.8.xml:197(title)
-#: newgrp.1.xml:70(title) logoutd.8.xml:35(title) login.access.5.xml:66(title)
-#: login.1.xml:280(title) limits.5.xml:110(title) lastlog.8.xml:111(title)
-#: gshadow.5.xml:61(title) grpck.8.xml:137(title) groups.1.xml:46(title)
-#: groupmod.8.xml:121(title) groupmems.8.xml:119(title)
-#: groupdel.8.xml:59(title) groupadd.8.xml:163(title) gpasswd.1.xml:201(title)
-#: faillog.8.xml:132(title) faillog.5.xml:38(title) expiry.1.xml:38(title)
-#: chsh.1.xml:104(title) chpasswd.8.xml:153(title) chgpasswd.8.xml:148(title)
-#: chfn.1.xml:84(title) chage.1.xml:177(title)
+#: vipw.8.xml:124(title) usermod.8.xml:322(title) userdel.8.xml:140(title)
+#: useradd.8.xml:619(title) suauth.5.xml:168(title) su.1.xml:253(title)
+#: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
+#: pwconv.8.xml:168(title) pwck.8.xml:196(title) porttime.5.xml:105(title)
+#: passwd.5.xml:116(title) passwd.1.xml:367(title) newusers.8.xml:320(title)
+#: newgrp.1.xml:99(title) logoutd.8.xml:64(title) login.access.5.xml:96(title)
+#: login.1.xml:316(title) limits.5.xml:140(title) lastlog.8.xml:147(title)
+#: gshadow.5.xml:89(title) grpck.8.xml:166(title) groups.1.xml:75(title)
+#: groupmod.8.xml:150(title) groupmems.8.xml:168(title)
+#: groupdel.8.xml:88(title) groupadd.8.xml:189(title) gpasswd.1.xml:230(title)
+#: faillog.8.xml:204(title) faillog.5.xml:67(title) expiry.1.xml:68(title)
+#: chsh.1.xml:133(title) chpasswd.8.xml:185(title) chgpasswd.8.xml:180(title)
+#: chfn.1.xml:113(title) chage.1.xml:206(title)
 msgid "FILES"
 msgstr "DATEIEN"
 
-#: vipw.8.xml:110(filename) usermod.8.xml:281(filename)
-#: userdel.8.xml:114(filename) useradd.8.xml:508(filename)
-#: sg.1.xml:74(filename) pwck.8.xml:170(filename) newusers.8.xml:212(filename)
-#: newgrp.1.xml:85(filename) gshadow.5.xml:64(filename)
-#: grpck.8.xml:140(filename) groups.1.xml:49(filename)
-#: groupmod.8.xml:124(filename) groupmems.8.xml:122(filename)
-#: groupdel.8.xml:62(filename) groupadd.8.xml:166(filename)
-#: gpasswd.1.xml:20(filename) gpasswd.1.xml:204(filename)
-#: chgpasswd.8.xml:151(filename)
+#: vipw.8.xml:127(filename) usermod.8.xml:325(filename)
+#: userdel.8.xml:143(filename) useradd.8.xml:634(filename)
+#: sg.1.xml:103(filename) pwck.8.xml:199(filename)
+#: newusers.8.xml:335(filename) newgrp.1.xml:114(filename)
+#: gshadow.5.xml:92(filename) grpck.8.xml:169(filename)
+#: groups.1.xml:78(filename) groupmod.8.xml:153(filename)
+#: groupmems.8.xml:171(filename) groupdel.8.xml:91(filename)
+#: groupadd.8.xml:192(filename) gpasswd.1.xml:49(filename)
+#: gpasswd.1.xml:233(filename) chgpasswd.8.xml:183(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
-#: vipw.8.xml:112(para) usermod.8.xml:283(para) userdel.8.xml:116(para)
-#: useradd.8.xml:510(para) sg.1.xml:76(para) pwck.8.xml:172(para)
-#: newusers.8.xml:214(para) newgrp.1.xml:87(para) gshadow.5.xml:66(para)
-#: grpck.8.xml:142(para) groups.1.xml:51(para) groupmod.8.xml:126(para)
-#: groupmems.8.xml:124(para) groupdel.8.xml:64(para) groupadd.8.xml:168(para)
-#: gpasswd.1.xml:206(para) chgpasswd.8.xml:153(para)
+#: vipw.8.xml:129(para) usermod.8.xml:327(para) userdel.8.xml:145(para)
+#: useradd.8.xml:636(para) sg.1.xml:105(para) pwck.8.xml:201(para)
+#: newusers.8.xml:337(para) newgrp.1.xml:116(para) gshadow.5.xml:94(para)
+#: grpck.8.xml:171(para) groups.1.xml:80(para) groupmod.8.xml:155(para)
+#: groupmems.8.xml:173(para) groupdel.8.xml:93(para) groupadd.8.xml:194(para)
+#: gpasswd.1.xml:235(para) chgpasswd.8.xml:185(para)
 msgid "Group account information."
 msgstr "Informationen zu den Gruppenkonten."
 
-#: vipw.8.xml:116(filename) useradd.8.xml:514(filename) sg.1.xml:80(filename)
-#: newusers.8.xml:218(filename) newgrp.1.xml:91(filename)
-#: gshadow.5.xml:70(filename) grpck.8.xml:146(filename)
-#: groupmod.8.xml:130(filename) groupmems.8.xml:128(filename)
-#: groupdel.8.xml:68(filename) groupadd.8.xml:172(filename)
-#: gpasswd.1.xml:21(filename) gpasswd.1.xml:210(filename)
-#: chgpasswd.8.xml:157(filename)
+#: vipw.8.xml:133(filename) useradd.8.xml:640(filename) sg.1.xml:109(filename)
+#: newusers.8.xml:341(filename) newgrp.1.xml:120(filename)
+#: gshadow.5.xml:98(filename) grpck.8.xml:175(filename)
+#: groupmod.8.xml:159(filename) groupmems.8.xml:177(filename)
+#: groupdel.8.xml:97(filename) groupadd.8.xml:198(filename)
+#: gpasswd.1.xml:50(filename) gpasswd.1.xml:239(filename)
+#: chgpasswd.8.xml:189(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
 # type: Plain text
-#: vipw.8.xml:118(para) useradd.8.xml:516(para) sg.1.xml:82(para)
-#: newusers.8.xml:220(para) newgrp.1.xml:93(para) gshadow.5.xml:72(para)
-#: grpck.8.xml:148(para) groupmod.8.xml:132(para) groupdel.8.xml:70(para)
-#: groupadd.8.xml:174(para) gpasswd.1.xml:212(para) chgpasswd.8.xml:159(para)
+#: vipw.8.xml:135(para) useradd.8.xml:642(para) sg.1.xml:111(para)
+#: newusers.8.xml:343(para) newgrp.1.xml:122(para) gshadow.5.xml:100(para)
+#: grpck.8.xml:177(para) groupmod.8.xml:161(para) groupdel.8.xml:99(para)
+#: groupadd.8.xml:200(para) gpasswd.1.xml:241(para) chgpasswd.8.xml:191(para)
 msgid "Secure group account information."
 msgstr "Verschlüsselte Informationen zu den Gruppenkonten."
 
-#: vipw.8.xml:122(filename) usermod.8.xml:287(filename)
-#: userdel.8.xml:126(filename) useradd.8.xml:496(filename)
-#: su.1.xml:227(filename) sg.1.xml:62(filename) shadow.5.xml:108(filename)
-#: pwck.8.xml:176(filename) passwd.5.xml:90(filename)
-#: passwd.1.xml:328(filename) newusers.8.xml:200(filename)
-#: newgrp.1.xml:73(filename) login.1.xml:295(filename)
-#: grpck.8.xml:152(filename) expiry.1.xml:41(filename)
-#: chsh.1.xml:107(filename) chpasswd.8.xml:156(filename)
-#: chfn.1.xml:93(filename) chage.1.xml:181(filename)
+#: vipw.8.xml:139(filename) usermod.8.xml:331(filename)
+#: userdel.8.xml:155(filename) useradd.8.xml:622(filename)
+#: su.1.xml:256(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
+#: pwck.8.xml:205(filename) passwd.5.xml:119(filename)
+#: passwd.1.xml:370(filename) newusers.8.xml:323(filename)
+#: newgrp.1.xml:102(filename) login.1.xml:331(filename)
+#: grpck.8.xml:181(filename) expiry.1.xml:71(filename)
+#: chsh.1.xml:136(filename) chpasswd.8.xml:188(filename)
+#: chfn.1.xml:122(filename) chage.1.xml:210(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
-#: vipw.8.xml:124(para) usermod.8.xml:289(para) userdel.8.xml:128(para)
-#: useradd.8.xml:498(para) su.1.xml:229(para) sg.1.xml:64(para)
-#: shadow.5.xml:110(para) pwck.8.xml:178(para) passwd.5.xml:92(para)
-#: passwd.1.xml:330(para) newusers.8.xml:202(para) newgrp.1.xml:75(para)
-#: login.1.xml:297(para) grpck.8.xml:154(para) expiry.1.xml:43(para)
-#: chsh.1.xml:109(para) chpasswd.8.xml:158(para) chfn.1.xml:95(para)
-#: chage.1.xml:184(para)
+#: vipw.8.xml:141(para) usermod.8.xml:333(para) userdel.8.xml:157(para)
+#: useradd.8.xml:624(para) su.1.xml:258(para) sg.1.xml:93(para)
+#: shadow.5.xml:235(para) pwck.8.xml:207(para) passwd.5.xml:121(para)
+#: passwd.1.xml:372(para) newusers.8.xml:325(para) newgrp.1.xml:104(para)
+#: login.1.xml:333(para) grpck.8.xml:183(para) expiry.1.xml:73(para)
+#: chsh.1.xml:138(para) chpasswd.8.xml:190(para) chfn.1.xml:124(para)
+#: chage.1.xml:213(para)
 msgid "User account information."
 msgstr "Informationen zu den Benutzerkonten."
 
-#: vipw.8.xml:128(filename) usermod.8.xml:293(filename)
-#: userdel.8.xml:132(filename) useradd.8.xml:502(filename)
-#: su.1.xml:233(filename) sg.1.xml:68(filename) shadow.5.xml:114(filename)
-#: shadow.3.xml:175(filename) pwck.8.xml:182(filename)
-#: passwd.5.xml:96(filename) passwd.1.xml:334(filename)
-#: newusers.8.xml:206(filename) newgrp.1.xml:79(filename)
-#: login.1.xml:301(filename) expiry.1.xml:47(filename)
-#: chpasswd.8.xml:162(filename) chage.1.xml:189(filename)
+#: vipw.8.xml:145(filename) usermod.8.xml:337(filename)
+#: userdel.8.xml:161(filename) useradd.8.xml:628(filename)
+#: su.1.xml:262(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
+#: shadow.3.xml:204(filename) pwck.8.xml:211(filename)
+#: passwd.5.xml:125(filename) passwd.1.xml:376(filename)
+#: newusers.8.xml:329(filename) newgrp.1.xml:108(filename)
+#: login.1.xml:337(filename) expiry.1.xml:77(filename)
+#: chpasswd.8.xml:194(filename) chage.1.xml:218(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
 # type: Plain text
-#: vipw.8.xml:130(para) usermod.8.xml:295(para) userdel.8.xml:134(para)
-#: useradd.8.xml:504(para) su.1.xml:235(para) sg.1.xml:70(para)
-#: shadow.5.xml:116(para) shadow.3.xml:177(para) pwck.8.xml:184(para)
-#: passwd.1.xml:336(para) newusers.8.xml:208(para) newgrp.1.xml:81(para)
-#: login.1.xml:303(para) expiry.1.xml:49(para) chpasswd.8.xml:164(para)
-#: chage.1.xml:192(para)
+#: vipw.8.xml:147(para) usermod.8.xml:339(para) userdel.8.xml:163(para)
+#: useradd.8.xml:630(para) su.1.xml:264(para) sg.1.xml:99(para)
+#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:213(para)
+#: passwd.1.xml:378(para) newusers.8.xml:331(para) newgrp.1.xml:110(para)
+#: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:196(para)
+#: chage.1.xml:221(para)
 msgid "Secure user account information."
 msgstr "Verschlüsselte Informationen zu den Benutzerkonten."
 
-#: vipw.8.xml:137(title) usermod.8.xml:302(title) userdel.8.xml:213(title)
-#: useradd.8.xml:610(title) suauth.5.xml:168(title) su.1.xml:242(title)
-#: sg.1.xml:89(title) shadow.5.xml:123(title) shadow.3.xml:184(title)
-#: pwconv.8.xml:150(title) pwck.8.xml:191(title) porttime.5.xml:88(title)
-#: passwd.5.xml:105(title) passwd.1.xml:394(title) nologin.8.xml:35(title)
-#: newusers.8.xml:233(title) newgrp.1.xml:100(title)
-#: login.defs.5.xml:445(title) login.access.5.xml:78(title)
-#: login.1.xml:334(title) limits.5.xml:120(title) gshadow.5.xml:79(title)
-#: grpck.8.xml:161(title) groups.1.xml:58(title) groupmod.8.xml:190(title)
-#: groupmems.8.xml:137(title) groupdel.8.xml:116(title)
-#: groupadd.8.xml:253(title) gpasswd.1.xml:219(title) faillog.8.xml:144(title)
-#: faillog.5.xml:50(title) expiry.1.xml:56(title) chsh.1.xml:128(title)
-#: chpasswd.8.xml:177(title) chgpasswd.8.xml:172(title) chfn.1.xml:102(title)
-#: chage.1.xml:232(title)
+#: vipw.8.xml:154(title) usermod.8.xml:346(title) userdel.8.xml:242(title)
+#: useradd.8.xml:736(title) suauth.5.xml:197(title) su.1.xml:271(title)
+#: sg.1.xml:118(title) shadow.5.xml:248(title) shadow.3.xml:213(title)
+#: pwconv.8.xml:180(title) pwck.8.xml:220(title) porttime.5.xml:117(title)
+#: passwd.5.xml:134(title) passwd.1.xml:436(title) nologin.8.xml:64(title)
+#: newusers.8.xml:356(title) newgrp.1.xml:129(title)
+#: login.defs.5.xml:471(title) login.access.5.xml:108(title)
+#: login.1.xml:370(title) limits.5.xml:150(title) gshadow.5.xml:107(title)
+#: grpck.8.xml:190(title) groups.1.xml:87(title) groupmod.8.xml:219(title)
+#: groupmems.8.xml:186(title) groupdel.8.xml:145(title)
+#: groupadd.8.xml:279(title) gpasswd.1.xml:248(title) faillog.8.xml:216(title)
+#: faillog.5.xml:79(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
+#: chpasswd.8.xml:209(title) chgpasswd.8.xml:204(title) chfn.1.xml:131(title)
+#: chage.1.xml:261(title)
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
-#: vipw.8.xml:138(para)
+#: vipw.8.xml:155(para)
 msgid ""
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>group</"
@@ -389,23 +305,22 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: usermod.8.xml:10(refentrytitle) usermod.8.xml:15(refname)
-#: usermod.8.xml:21(command) login.defs.5.xml:411(term)
+#: usermod.8.xml:39(refentrytitle) usermod.8.xml:44(refname)
+#: usermod.8.xml:50(command) login.defs.5.xml:443(term)
 msgid "usermod"
 msgstr "usermod"
 
-#: usermod.8.xml:16(refpurpose)
+#: usermod.8.xml:45(refpurpose)
 msgid "modify a user account"
 msgstr "verändert ein Benutzerkonto"
 
-#: usermod.8.xml:25(replaceable) userdel.8.xml:25(replaceable)
-#: useradd.8.xml:33(replaceable) su.1.xml:41(replaceable)
-#: passwd.1.xml:31(replaceable) chsh.1.xml:27(replaceable)
-#: chage.1.xml:20(replaceable)
+#: usermod.8.xml:54(replaceable) userdel.8.xml:54(replaceable)
+#: useradd.8.xml:63(replaceable) passwd.1.xml:60(replaceable)
+#: chsh.1.xml:56(replaceable) chage.1.xml:49(replaceable)
 msgid "LOGIN"
 msgstr "LOGIN"
 
-#: usermod.8.xml:31(para)
+#: usermod.8.xml:60(para)
 msgid ""
 "The <command>usermod</command> command modifies the system account files to "
 "reflect the changes that are specified on the command line."
@@ -414,17 +329,17 @@
 "Systems, so dass sie die Änderungen enthalten, die in der Befehlszeile "
 "eingegeben wurden."
 
-#: usermod.8.xml:39(para)
+#: usermod.8.xml:68(para)
 msgid "The options which apply to the <command>usermod</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>usermod</command> unterstützt werden, "
 "sind:"
 
-#: usermod.8.xml:45(term)
+#: usermod.8.xml:74(term)
 msgid "<option>-a</option>, <option>--append</option>"
 msgstr "<option>-a</option>, <option>--append</option>"
 
-#: usermod.8.xml:49(para)
+#: usermod.8.xml:78(para)
 msgid ""
 "Add the user to the supplemental group(s). Use only with <option>-G</option> "
 "option."
@@ -432,7 +347,7 @@
 "Fügt den Benutzer weiteren Gruppen hinzu. Kann nur zusammen mit der Option "
 "<option>-G</option> verwendet werden."
 
-#: usermod.8.xml:56(term) useradd.8.xml:83(term)
+#: usermod.8.xml:85(term) useradd.8.xml:125(term)
 msgid ""
 "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
 "replaceable>"
@@ -440,7 +355,7 @@
 "<option>-c</option>, <option>--comment</option><replaceable>KOMMENTAR</"
 "replaceable>"
 
-#: usermod.8.xml:61(para)
+#: usermod.8.xml:90(para)
 msgid ""
 "The new value of the user's password file comment field. It is normally "
 "modified using the <citerefentry><refentrytitle>chfn</"
@@ -450,7 +365,7 @@
 "normalerweise mit dem Werkzeug <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry> verändert."
 
-#: usermod.8.xml:70(term) useradd.8.xml:96(term)
+#: usermod.8.xml:99(term) useradd.8.xml:138(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
@@ -458,18 +373,29 @@
 "<option>-d</option>, <option>--home</option><replaceable>HOME_VERZ</"
 "replaceable>"
 
-#: usermod.8.xml:75(para)
+#: usermod.8.xml:104(para)
+#, fuzzy
+#| msgid "user home directory"
+msgid "The user's new login directory."
+msgstr "Home-Verzeichnis des Benutzers"
+
+#: usermod.8.xml:107(para)
+#, fuzzy
+#| msgid ""
+#| "The user's new login directory. If the <option>-m</option> option is "
+#| "given the contents of the current home directory will be moved to the new "
+#| "home directory, which is created if it does not already exist."
 msgid ""
-"The user's new login directory. If the <option>-m</option> option is given "
-"the contents of the current home directory will be moved to the new home "
-"directory, which is created if it does not already exist."
+"If the <option>-m</option> option is given the contents of the current home "
+"directory will be moved to the new home directory, which is created if it "
+"does not already exist."
 msgstr ""
 "Das neue Login-Verzeichnis des Benutzers. Wenn die Option <option>-m</"
 "option> verwendet wurde, wird der Inhalt des aktuellen Home-Verzeichnisses "
 "in das neue Home-Verzeichnis verschoben. Falls es nicht existiert, wird es "
 "angelegt."
 
-#: usermod.8.xml:84(term) useradd.8.xml:123(term) useradd.8.xml:394(term)
+#: usermod.8.xml:116(term) useradd.8.xml:165(term) useradd.8.xml:494(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -477,7 +403,7 @@
 "<option>-e</option>, <option>--expiredate</"
 "option><replaceable>VERFALLS_DATUM</replaceable>"
 
-#: usermod.8.xml:89(para) useradd.8.xml:128(para)
+#: usermod.8.xml:121(para) useradd.8.xml:170(para)
 msgid ""
 "The date on which the user account will be disabled. The date is specified "
 "in the format <emphasis remap=\"I\">YYYY-MM-DD</emphasis>."
@@ -485,7 +411,7 @@
 "Das Datum, an welchem das Benutzerkonto deaktiviert wird. Das Datum muss im "
 "Format <emphasis remap=\"I\">JJJJ-MM-TT</emphasis> angegeben werden."
 
-#: usermod.8.xml:96(term) useradd.8.xml:135(term) useradd.8.xml:403(term)
+#: usermod.8.xml:128(term) useradd.8.xml:183(term) useradd.8.xml:507(term)
 msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -493,24 +419,41 @@
 "<option>-f</option>, <option>--inactive</option><replaceable>INAKTIV</"
 "replaceable>"
 
-#: usermod.8.xml:101(para) useradd.8.xml:140(para)
+#: usermod.8.xml:133(para)
+#, fuzzy
+#| msgid ""
+#| "The number of days after a password has expired before the account will "
+#| "be disabled."
 msgid ""
 "The number of days after a password expires until the account is permanently "
-"disabled. A value of 0 disables the account as soon as the password has "
-"expired, and a value of -1 disables the feature. The default value is -1."
+"disabled."
 msgstr ""
 "Die Anzahl von Tagen, für die ein Passwort abgelaufen ist, bis das Konto "
+"deaktiviert wird."
+
+#: usermod.8.xml:137(para)
+#, fuzzy
+#| msgid ""
+#| "The number of days after a password expires until the account is "
+#| "permanently disabled. A value of 0 disables the account as soon as the "
+#| "password has expired, and a value of -1 disables the feature. The default "
+#| "value is -1."
+msgid ""
+"A value of 0 disables the account as soon as the password has expired, and a "
+"value of -1 disables the feature. The default value is -1."
+msgstr ""
+"Die Anzahl von Tagen, für die ein Passwort abgelaufen ist, bis das Konto "
 "dauerhaft deaktiviert wird. Ein Wert von 0 deaktiviert das Konto, sobald das "
 "Passwort abläuft. Ein Wert von -1 schaltet diese Funktion ab. Der "
 "Standardwert ist -1."
 
-#: usermod.8.xml:110(term) useradd.8.xml:149(term) useradd.8.xml:415(term)
+#: usermod.8.xml:145(term) useradd.8.xml:203(term) useradd.8.xml:523(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GRUPPE</replaceable>"
 
-#: usermod.8.xml:115(para)
+#: usermod.8.xml:150(para)
 msgid ""
 "The group name or number of the user's new initial login group. The group "
 "name must exist. A group number must refer to an already existing group. The "
@@ -520,7 +463,7 @@
 "Der Gruppenname muss existieren. Die Gruppenzahl muss auf eine bereits "
 "bestehende Gruppe verweisen. Die Standardgruppennummer ist 1."
 
-#: usermod.8.xml:123(term) useradd.8.xml:163(term)
+#: usermod.8.xml:158(term) useradd.8.xml:231(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -530,17 +473,34 @@
 "replaceable>[<emphasis remap=\"I\">,GRUPPE2,...</emphasis>[<emphasis remap="
 "\"I\">,GROUPN</emphasis>]]]"
 
-#: usermod.8.xml:128(para)
+#: usermod.8.xml:163(para)
 #, fuzzy
+#| msgid ""
+#| "A list of supplementary groups which the user is also a member of. Each "
+#| "group is separated from the next by a comma, with no intervening "
+#| "whitespace. The groups are subject to the same restrictions as the group "
+#| "given with the <option>-g</option> option. The default is for the user to "
+#| "belong only to the initial group."
 msgid ""
 "A list of supplementary groups which the user is also a member of. Each "
 "group is separated from the next by a comma, with no intervening whitespace. "
 "The groups are subject to the same restrictions as the group given with the "
-"<option>-g</option> option. If the user is currently a member of a group "
-"which is not listed, the user will be removed from the group. This behaviour "
-"can be changed via the <option>-a</option> option, which appends the user to "
-"the current supplementary group list."
+"<option>-g</option> option."
 msgstr ""
+"Eine Liste der zusätzlichen Gruppen, denen der Benutzer ebenfalls angehört. "
+"Die Gruppen sind durch Kommata ohne Leerzeichen von einander zu trennen. Die "
+"Gruppen unterliegen denselben Beschränkungen wie die Gruppe, die mit der "
+"Option <option>-g</option> bestimmt wurde. Standardmäßig ist der Benutzer "
+"nur Mitglied der Ausgangsgruppe."
+
+#: usermod.8.xml:170(para)
+#, fuzzy
+msgid ""
+"If the user is currently a member of a group which is not listed, the user "
+"will be removed from the group. This behaviour can be changed via the "
+"<option>-a</option> option, which appends the user to the current "
+"supplementary group list."
+msgstr ""
 "Eine Liste von Gruppen, denen der Benutzer zusätzlich angehört. Die Gruppen "
 "sind durch Kommata ohne Leerzeichen von einander zu trennen. Die Gruppen "
 "unterliegen denselben Beschränkungen wie die Gruppe, die mit der Option "
@@ -550,7 +510,7 @@
 "abgeschaltet werden. Damit wird der Benutzer nur den angegebenen Gruppen "
 "hinzugefügt, ohne aus den übrigen gelöscht zu werden."
 
-#: usermod.8.xml:141(term)
+#: usermod.8.xml:179(term)
 msgid ""
 "<option>-l</option>, <option>--login</option><replaceable>NEW_LOGIN</"
 "replaceable>"
@@ -558,13 +518,13 @@
 "<option>-l</option>, <option>--login</option><replaceable>NEUER_LOGIN</"
 "replaceable>"
 
-#: usermod.8.xml:146(para)
+#: usermod.8.xml:184(para)
 #, fuzzy
 msgid ""
-"The name of the user will be changed from <emphasis remap=\"I\">LOGIN</"
-"emphasis> to <emphasis remap=\"I\">NEW_LOGIN</emphasis>. Nothing else is "
-"changed. In particular, the user's home directory name should probably be "
-"changed manually to reflect the new login name."
+"The name of the user will be changed from <replaceable>LOGIN</replaceable> "
+"to <replaceable>NEW_LOGIN</replaceable>. Nothing else is changed. In "
+"particular, the user's home directory name should probably be changed "
+"manually to reflect the new login name."
 msgstr ""
 "Der Benutzername wird von <emphasis remap=\"I\">LOGIN</emphasis> zu "
 "<emphasis remap=\"I\">NEUER_LOGIN</emphasis> verändert. Andere Veränderungen "
@@ -572,11 +532,11 @@
 "Verzeichnisses des Benutzers geändert werden, um dem neuen Login-Namen "
 "Rechnung zu tragen."
 
-#: usermod.8.xml:156(term)
+#: usermod.8.xml:194(term)
 msgid "<option>-L</option>, <option>--lock</option>"
 msgstr "<option>-L</option>, <option>--lock</option>"
 
-#: usermod.8.xml:160(para)
+#: usermod.8.xml:198(para)
 msgid ""
 "Lock a user's password. This puts a '!' in front of the encrypted password, "
 "effectively disabling the password. You can't use this option with <option>-"
@@ -587,20 +547,20 @@
 "abgeschaltet wird. Sie können diese Option nicht mit <option>-p</option> "
 "oder <option>-U</option> verwenden."
 
-#: usermod.8.xml:166(para)
+#: usermod.8.xml:204(para)
 msgid ""
 "Note: if you wish to lock the account (not only access with a password), you "
 "should also set the <replaceable>EXPIRE_DATE</replaceable> to "
 "<replaceable>1</replaceable>."
 msgstr ""
 
-#: usermod.8.xml:175(term) useradd.8.xml:282(term) groupmod.8.xml:82(term)
-#: groupadd.8.xml:107(term)
+#: usermod.8.xml:213(term) useradd.8.xml:364(term) groupmod.8.xml:111(term)
+#: groupadd.8.xml:133(term)
 msgid "<option>-o</option>, <option>--non-unique</option>"
 msgstr "<option>-o</option>, <option>--non-unique</option>"
 
 # SB: What is that suppossed to mean? I can assign the UID 1000 twice?
-#: usermod.8.xml:179(para)
+#: usermod.8.xml:217(para)
 msgid ""
 "When used with the <option>-u</option> option, this option allows to change "
 "the user ID to a non-unique value."
@@ -609,8 +569,8 @@
 "Option der Wert der Benutzer-ID auf einen nicht eindeutigen Wert gesetzt "
 "werden."
 
-#: usermod.8.xml:186(term) useradd.8.xml:290(term) groupmod.8.xml:93(term)
-#: groupadd.8.xml:117(term)
+#: usermod.8.xml:224(term) useradd.8.xml:376(term) groupmod.8.xml:122(term)
+#: groupadd.8.xml:143(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
@@ -618,7 +578,7 @@
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORT</"
 "replaceable>"
 
-#: usermod.8.xml:191(para)
+#: usermod.8.xml:229(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
@@ -626,14 +586,14 @@
 "Das verschlüsselte Passwort, wie es von <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> zurückgegeben wird."
 
-#: usermod.8.xml:199(term) useradd.8.xml:322(term) useradd.8.xml:428(term)
-#: su.1.xml:128(term) chsh.1.xml:56(term)
+#: usermod.8.xml:237(term) useradd.8.xml:416(term) useradd.8.xml:544(term)
+#: su.1.xml:157(term) chsh.1.xml:85(term)
 msgid ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 
-#: usermod.8.xml:204(para) chsh.1.xml:60(para)
+#: usermod.8.xml:242(para) chsh.1.xml:89(para)
 msgid ""
 "The name of the user's new login shell. Setting this field to blank causes "
 "the system to select the default login shell."
@@ -641,34 +601,64 @@
 "Der Name der neuen Login-Shell des Benutzers. Falls dieses Feld leer "
 "gelassen wird, verwendet das System die Standard-Login-Shell."
 
-#: usermod.8.xml:211(term) useradd.8.xml:335(term)
+#: usermod.8.xml:249(term) useradd.8.xml:431(term)
 msgid ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: usermod.8.xml:216(para)
+#: usermod.8.xml:254(para)
+msgid "The new numerical value of the user's ID."
+msgstr ""
+
+#: usermod.8.xml:257(para)
+#, fuzzy
+#| msgid ""
+#| "The numerical value of the user's ID. This value must be unique, unless "
+#| "the <option>-o</option> option is used. The value must be non-negative. "
+#| "The default is to use the smallest ID value greater than 999 and greater "
+#| "than every other user. Values between 0 and 999 are typically reserved "
+#| "for system accounts."
 msgid ""
-"The numerical value of the user's ID. This value must be unique, unless the "
-"<option>-o</option> option is used. The value must be non-negative. Values "
-"between 0 and 999 are typically reserved for system accounts. Any files "
-"which the user owns and which are located in the directory tree rooted at "
-"the user's home directory will have the file user ID changed automatically. "
-"Files outside of the user's home directory must be altered manually."
+"This value must be unique, unless the <option>-o</option> option is used. "
+"The value must be non-negative. Values between 0 and 999 are typically "
+"reserved for system accounts."
 msgstr ""
 "Der zahlenmäßige Wert der Benutzer-ID. Dieser Wert muss eindeutig sein, "
 "sofern nicht die Option <option>-o</option> verwendet wird. Der Wert darf "
+"nicht negativ sein. Standardmäßig wird der kleinste Wert größer als 999 und "
+"größer als jeder andere Wert eines Benutzers verwendet. Typischerweise sind "
+"Werte zwischen 0 und 999 für Systemkonten reserviert."
+
+#: usermod.8.xml:263(para)
+#, fuzzy
+#| msgid ""
+#| "The numerical value of the user's ID. This value must be unique, unless "
+#| "the <option>-o</option> option is used. The value must be non-negative. "
+#| "Values between 0 and 999 are typically reserved for system accounts. Any "
+#| "files which the user owns and which are located in the directory tree "
+#| "rooted at the user's home directory will have the file user ID changed "
+#| "automatically. Files outside of the user's home directory must be altered "
+#| "manually."
+msgid ""
+"Any files which the user owns and which are located in the directory tree "
+"rooted at the user's home directory will have the file user ID changed "
+"automatically. Files outside of the user's home directory must be altered "
+"manually."
+msgstr ""
+"Der zahlenmäßige Wert der Benutzer-ID. Dieser Wert muss eindeutig sein, "
+"sofern nicht die Option <option>-o</option> verwendet wird. Der Wert darf "
 "nicht negativ sein. Typischerweise sind Werte zwischen 0 und 999 für "
 "Systemkonten reserviert. Bei alle Dateien, die dem Benutzer gehören und die "
 "sich unterhalb dessen Home-Verzeichnisses befinden, wird automatisch die "
 "Benutzer-ID geändert. Dateien, die sich außerhalb des Home-Verzeichnisses "
 "befinden, müssen von Hand geändert werden."
 
-#: usermod.8.xml:229(term)
+#: usermod.8.xml:273(term)
 msgid "<option>-U</option>, <option>--unlock</option>"
 msgstr "<option>-U</option>, <option>--unlock</option>"
 
-#: usermod.8.xml:233(para)
+#: usermod.8.xml:277(para)
 msgid ""
 "Unlock a user's password. This removes the '!' in front of the encrypted "
 "password. You can't use this option with <option>-p</option> or <option>-L</"
@@ -678,7 +668,7 @@
 "können diese Option nicht mit <option>-p</option> oder <option>-U</option> "
 "verwenden."
 
-#: usermod.8.xml:238(para)
+#: usermod.8.xml:282(para)
 msgid ""
 "Note: if you wish to unlock the account (not only access with a password), "
 "you should also set the <replaceable>EXPIRE_DATE</replaceable> (for example "
@@ -686,18 +676,27 @@
 "replaceable> value from <filename>/etc/default/useradd</filename>)."
 msgstr ""
 
-#: usermod.8.xml:252(title) userdel.8.xml:192(title) useradd.8.xml:451(title)
-#: su.1.xml:188(title) shadow.3.xml:164(title) passwd.1.xml:296(title)
-#: newusers.8.xml:160(title) login.1.xml:202(title) lastlog.8.xml:123(title)
-#: groupdel.8.xml:40(title) groupadd.8.xml:187(title) gpasswd.1.xml:174(title)
-#: faillog.8.xml:121(title) chpasswd.8.xml:125(title)
-#: chgpasswd.8.xml:125(title)
+#: usermod.8.xml:296(title) userdel.8.xml:221(title) useradd.8.xml:573(title)
+#: su.1.xml:217(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
+#: newusers.8.xml:283(title) login.1.xml:238(title) lastlog.8.xml:159(title)
+#: groupdel.8.xml:69(title) groupadd.8.xml:213(title) gpasswd.1.xml:203(title)
+#: faillog.8.xml:193(title) chpasswd.8.xml:157(title)
+#: chgpasswd.8.xml:157(title)
 msgid "CAVEATS"
 msgstr "WARNUNGEN"
 
-#: usermod.8.xml:253(para)
+#: usermod.8.xml:297(para)
+#, fuzzy
+#| msgid ""
+#| "<command>usermod</command> will not allow you to change the name of a "
+#| "user who is logged in. You must make certain that the named user is not "
+#| "executing any processes when this command is being executed if the user's "
+#| "numerical user ID is being changed. You must change the owner of any "
+#| "<command>crontab</command> files manually. You must change the owner of "
+#| "any <command>at</command> jobs manually. You must make any changes "
+#| "involving NIS on the NIS server."
 msgid ""
-"<command>usermod</command> will not allow you to change the name of a user "
+"<command>usermod</command> will not allow you to change the name of an user "
 "who is logged in. You must make certain that the named user is not executing "
 "any processes when this command is being executed if the user's numerical "
 "user ID is being changed. You must change the owner of any <command>crontab</"
@@ -714,14 +713,37 @@
 "per Hand verändern. Sie müssen auch Änderungen im Zusammenhang mit NIS auf "
 "dem NIS-Server vornehmen."
 
-#: usermod.8.xml:2(term) userdel.8.xml:2(term) useradd.8.xml:2(term)
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: usermod.8.xml:309(title) userdel.8.xml:125(title) useradd.8.xml:596(title)
+#: su.1.xml:225(title) sg.1.xml:76(title) pwconv.8.xml:146(title)
+#: pwck.8.xml:182(title) passwd.1.xml:349(title) newusers.8.xml:297(title)
+#: newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:154(title)
+#: groupmod.8.xml:138(title) groupmems.8.xml:156(title)
+#: groupdel.8.xml:76(title) groupadd.8.xml:175(title) gpasswd.1.xml:215(title)
+#: chsh.1.xml:120(title) chpasswd.8.xml:171(title) chgpasswd.8.xml:165(title)
+#: chfn.1.xml:99(title)
+msgid "CONFIGURATION"
+msgstr ""
+
+#: usermod.8.xml:310(para) userdel.8.xml:126(para) useradd.8.xml:597(para)
+#: su.1.xml:226(para) sg.1.xml:77(para) pwck.8.xml:183(para)
+#: passwd.1.xml:350(para) newusers.8.xml:298(para) newgrp.1.xml:88(para)
+#: login.1.xml:273(para) grpck.8.xml:155(para) groupmod.8.xml:139(para)
+#: groupmems.8.xml:157(para) groupdel.8.xml:77(para) groupadd.8.xml:176(para)
+#: gpasswd.1.xml:216(para) chsh.1.xml:121(para) chpasswd.8.xml:172(para)
+#: chgpasswd.8.xml:166(para) chfn.1.xml:100(para)
+msgid ""
+"The following configuration variables in <filename>/etc/login.defs</"
+"filename> change the behavior of this tool:"
+msgstr ""
+
+#: usermod.8.xml:32(term) userdel.8.xml:32(term) useradd.8.xml:32(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>MAIL_DIR</option> (string)"
 msgstr "MAIL_DIR (Zeichenkette)"
 
-#: usermod.8.xml:4(para) userdel.8.xml:4(para) useradd.8.xml:4(para)
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: usermod.8.xml:34(para) userdel.8.xml:34(para) useradd.8.xml:34(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "The mail spool directory. This is needed to manipulate the mailbox when its "
 "corresponding user account is modified or deleted. If not specified, a "
@@ -732,30 +754,30 @@
 "gelöscht wurde. Falls nicht angegeben, wird ein Standard verwendet, der beim "
 "Kompilieren festgelegt wurde."
 
-#: usermod.8.xml:11(term) userdel.8.xml:11(term) useradd.8.xml:11(term)
-#: su.1.xml:11(term) login.defs.5.xml:11(term) login.1.xml:11(term)
+#: usermod.8.xml:41(term) userdel.8.xml:41(term) useradd.8.xml:41(term)
+#: su.1.xml:41(term) login.defs.5.xml:41(term) login.1.xml:41(term)
 #, fuzzy
 msgid "<option>MAIL_FILE</option> (string)"
 msgstr "MAIL_DIR (Zeichenkette)"
 
-#: usermod.8.xml:13(para) userdel.8.xml:13(para) useradd.8.xml:13(para)
-#: su.1.xml:13(para) login.defs.5.xml:13(para) login.1.xml:13(para)
+#: usermod.8.xml:43(para) userdel.8.xml:43(para) useradd.8.xml:43(para)
+#: su.1.xml:43(para) login.defs.5.xml:43(para) login.1.xml:43(para)
 msgid ""
 "Defines the location of the users mail spool files relatively to their home "
 "directory."
 msgstr ""
 
 #. FIXME: MAIL_FILE not used in useradd
-#: usermod.8.xml:20(para) userdel.8.xml:20(para) useradd.8.xml:20(para)
-#: su.1.xml:20(para) login.defs.5.xml:20(para) login.1.xml:20(para)
+#: usermod.8.xml:50(para) userdel.8.xml:50(para) useradd.8.xml:50(para)
+#: su.1.xml:50(para) login.defs.5.xml:50(para) login.1.xml:50(para)
 msgid ""
 "The <option>MAIL_DIR</option> and <option>MAIL_FILE</option> variables are "
 "used by <command>useradd</command>, <command>usermod</command>, and "
 "<command>userdel</command> to create, move, or delete the user's mail spool."
 msgstr ""
 
-#: usermod.8.xml:26(para) userdel.8.xml:26(para) useradd.8.xml:26(para)
-#: su.1.xml:26(para) login.defs.5.xml:26(para) login.1.xml:26(para)
+#: usermod.8.xml:56(para) userdel.8.xml:56(para) useradd.8.xml:56(para)
+#: su.1.xml:56(para) login.defs.5.xml:56(para) login.1.xml:56(para)
 #, fuzzy
 msgid ""
 "If <option>MAIL_CHECK_ENAB</option> is set to <replaceable>yes</"
@@ -765,8 +787,68 @@
 "Falls <option>--preserve-environment</option> verwendet wird, die Shell, die "
 "durch die Umgebungsvariable <envar>$SHELL</envar> festgelegt wird."
 
-#: usermod.8.xml:303(para)
+#: usermod.8.xml:30(term) userdel.8.xml:30(term) useradd.8.xml:30(term)
+#: pwconv.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: grpck.8.xml:30(term) groupmod.8.xml:30(term) groupmems.8.xml:30(term)
+#: groupdel.8.xml:30(term) groupadd.8.xml:30(term) gpasswd.1.xml:30(term)
+#: chgpasswd.8.xml:30(term)
+msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
+msgstr ""
+
+#: usermod.8.xml:32(para) userdel.8.xml:32(para) useradd.8.xml:32(para)
+#: pwconv.8.xml:32(para) newusers.8.xml:32(para) login.defs.5.xml:32(para)
+#: grpck.8.xml:32(para) groupmod.8.xml:32(para) groupmems.8.xml:32(para)
+#: groupdel.8.xml:32(para) groupadd.8.xml:32(para) gpasswd.1.xml:32(para)
+#: chgpasswd.8.xml:32(para)
 msgid ""
+"Maximum members per group entry. When the maximum is reached, a new group "
+"entry (line) is started in <filename>/etc/group</filename> (with the same "
+"name, same password, and same GID)."
+msgstr ""
+
+#: usermod.8.xml:37(para) userdel.8.xml:37(para) useradd.8.xml:37(para)
+#: pwconv.8.xml:37(para) newusers.8.xml:37(para) login.defs.5.xml:37(para)
+#: grpck.8.xml:37(para) groupmod.8.xml:37(para) groupmems.8.xml:37(para)
+#: groupdel.8.xml:37(para) groupadd.8.xml:37(para) gpasswd.1.xml:37(para)
+#: chgpasswd.8.xml:37(para)
+msgid ""
+"The default value is 0, meaning that there are no limits in the number of "
+"members in a group."
+msgstr ""
+
+#. Note: on HP, split groups have the same ID, but different
+#.                names.
+#: usermod.8.xml:43(para) userdel.8.xml:43(para) useradd.8.xml:43(para)
+#: pwconv.8.xml:43(para) newusers.8.xml:43(para) login.defs.5.xml:43(para)
+#: grpck.8.xml:43(para) groupmod.8.xml:43(para) groupmems.8.xml:43(para)
+#: groupdel.8.xml:43(para) groupadd.8.xml:43(para) gpasswd.1.xml:43(para)
+#: chgpasswd.8.xml:43(para)
+msgid ""
+"This feature (split group) permits to limit the length of lines in the group "
+"file. This is useful to make sure that lines for NIS groups are not larger "
+"than 1024 characters."
+msgstr ""
+
+#: usermod.8.xml:48(para) userdel.8.xml:48(para) useradd.8.xml:48(para)
+#: pwconv.8.xml:48(para) newusers.8.xml:48(para) login.defs.5.xml:48(para)
+#: grpck.8.xml:48(para) groupmod.8.xml:48(para) groupmems.8.xml:48(para)
+#: groupdel.8.xml:48(para) groupadd.8.xml:48(para) gpasswd.1.xml:48(para)
+#: chgpasswd.8.xml:48(para)
+msgid "If you need to enforce such limit, you can use 25."
+msgstr ""
+
+#: usermod.8.xml:51(para) userdel.8.xml:51(para) useradd.8.xml:51(para)
+#: pwconv.8.xml:51(para) newusers.8.xml:51(para) login.defs.5.xml:51(para)
+#: grpck.8.xml:51(para) groupmod.8.xml:51(para) groupmems.8.xml:51(para)
+#: groupdel.8.xml:51(para) groupadd.8.xml:51(para) gpasswd.1.xml:51(para)
+#: chgpasswd.8.xml:51(para)
+msgid ""
+"Note: split groups may not be supported by all tools (even in the Shadow "
+"toolsuite. You should not use this variable unless you really need it."
+msgstr ""
+
+#: usermod.8.xml:347(para)
+msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
@@ -803,17 +885,17 @@
 "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: userdel.8.xml:12(refentrytitle) userdel.8.xml:17(refname)
-#: userdel.8.xml:22(command) login.defs.5.xml:402(term)
+#: userdel.8.xml:41(refentrytitle) userdel.8.xml:46(refname)
+#: userdel.8.xml:51(command) login.defs.5.xml:434(term)
 msgid "userdel"
 msgstr "userdel"
 
-#: userdel.8.xml:18(refpurpose)
+#: userdel.8.xml:47(refpurpose)
 msgid "delete a user account and related files"
 msgstr "löscht ein Benutzerkonto und die dazugehörigen Dateien"
 
 # SB: Replace "login_name"?
-#: userdel.8.xml:32(para)
+#: userdel.8.xml:61(para)
 #, fuzzy
 msgid ""
 "The <command>userdel</command> command modifies the system account files, "
@@ -824,18 +906,18 @@
 "Systems und löscht darin alle Einträge, die auf den <emphasis remap=\"I"
 "\">login_name</emphasis> verweisen. Der bezeichnete Benutzer muss existieren."
 
-#: userdel.8.xml:41(para)
+#: userdel.8.xml:70(para)
 msgid "The options which apply to the <command>userdel</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>userdel</command> unterstützt werden, "
 "sind:"
 
-#: userdel.8.xml:46(term) groupadd.8.xml:52(term)
+#: userdel.8.xml:75(term) groupadd.8.xml:78(term)
 msgid "<option>-f</option>, <option>--force</option>"
 msgstr "<option>-f</option>, <option>--force</option"
 
 # SB: Übersetzung von 'mail spool'?
-#: userdel.8.xml:50(para)
+#: userdel.8.xml:79(para)
 #, fuzzy
 msgid ""
 "This option forces the removal of the user account, even if the user is "
@@ -857,7 +939,7 @@
 "gelöschte Benutzer vorhanden ist, wird auch diese Gruppe entfernt, selbst "
 "wenn sie die Hauptgruppe anderer Benutzer ist."
 
-#: userdel.8.xml:63(para)
+#: userdel.8.xml:92(para)
 msgid ""
 "<emphasis>Note:</emphasis> This option is dangerous and may leave your "
 "system in an inconsistent state."
@@ -865,12 +947,12 @@
 "<emphasis>Hinweis:</emphasis> Diese Option ist gefährlich und kann dazu "
 "führen, dass Ihr System nicht mehr ordnungsgemäß funktioniert."
 
-#: userdel.8.xml:76(term)
+#: userdel.8.xml:105(term)
 msgid "<option>-r</option>, <option>--remove</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
 # # SB: Übersetzung von 'mail spool'?
-#: userdel.8.xml:80(para)
+#: userdel.8.xml:109(para)
 msgid ""
 "Files in the user's home directory will be removed along with the home "
 "directory itself and the user's mail spool. Files located in other file "
@@ -881,7 +963,7 @@
 "unterhalb des Home-Verzeichnisses befinden, müssen per Hand aufgespürt und "
 "gelöscht werden."
 
-#: userdel.8.xml:86(para)
+#: userdel.8.xml:115(para)
 msgid ""
 "The mail spool is defined by the <emphasis>MAIL_DIR</emphasis> variable in "
 "the <filename>login.defs</filename> file."
@@ -889,12 +971,12 @@
 "Die Maildatei wird durch die Variable <emphasis>MAIL_DIR</emphasis> in der "
 "Datei <filename>login.defs</filename> definiert."
 
-#: userdel.8.xml:2(term) login.defs.5.xml:2(term)
+#: userdel.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>USERDEL_CMD</option> (string)"
 msgstr "USERDEL_CMD (Zeichenkette)"
 
-#: userdel.8.xml:4(para) login.defs.5.xml:4(para)
+#: userdel.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "If defined, this command is run when removing a user. It should remove any "
 "at/cron/print jobs etc. owned by the user to be removed (passed as the first "
@@ -904,123 +986,128 @@
 "wird. Damit können At-, Cron- und Druckaufträge des entfernten Benutzers "
 "(wird als erstes Argument angegeben) gelöscht werden."
 
-#: userdel.8.xml:2(term) useradd.8.xml:2(term) su.1.xml:2(term)
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: userdel.8.xml:32(term) useradd.8.xml:32(term) su.1.xml:32(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>USERGROUPS_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (Boolesh)"
 
-#: userdel.8.xml:4(para) useradd.8.xml:4(para) su.1.xml:4(para)
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: userdel.8.xml:34(para) useradd.8.xml:34(para) su.1.xml:34(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Enable setting of the umask group bits to be the same as owner bits "
 "(examples: 022 -&gt; 002, 077 -&gt; 007) for non-root users, if the uid is "
-"the same as gid, and username is the same as the primary group name. "
-"<placeholder-1/> If set to <replaceable>yes</replaceable>, <command>userdel</"
-"command> will remove the user's group if it contains no more members, and "
+"the same as gid, and username is the same as the primary group name."
+msgstr ""
+
+#: userdel.8.xml:39(para) useradd.8.xml:39(para) su.1.xml:39(para)
+#: login.defs.5.xml:39(para) login.1.xml:39(para)
+msgid ""
+"If set to <replaceable>yes</replaceable>, <command>userdel</command> will "
+"remove the user's group if it contains no more members, and "
 "<command>useradd</command> will create by default a group with the name of "
 "the user."
 msgstr ""
 
-#: userdel.8.xml:120(filename) useradd.8.xml:532(filename)
-#: pwconv.8.xml:141(filename) newusers.8.xml:224(filename)
-#: login.access.5.xml:69(filename) groupadd.8.xml:178(filename)
-#: chsh.1.xml:119(filename) chpasswd.8.xml:168(filename)
-#: chgpasswd.8.xml:163(filename) chfn.1.xml:87(filename)
+#: userdel.8.xml:149(filename) useradd.8.xml:658(filename)
+#: pwconv.8.xml:171(filename) newusers.8.xml:347(filename)
+#: login.access.5.xml:99(filename) groupadd.8.xml:204(filename)
+#: chsh.1.xml:148(filename) chpasswd.8.xml:200(filename)
+#: chgpasswd.8.xml:195(filename) chfn.1.xml:116(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
 # SB: Translation for "shadow password suite"?
-#: userdel.8.xml:122(para) useradd.8.xml:534(para) pwconv.8.xml:143(para)
-#: newusers.8.xml:226(para) login.access.5.xml:71(para)
-#: groupadd.8.xml:180(para) chsh.1.xml:121(para) chpasswd.8.xml:170(para)
-#: chgpasswd.8.xml:165(para) chfn.1.xml:89(para)
+#: userdel.8.xml:151(para) useradd.8.xml:660(para) pwconv.8.xml:173(para)
+#: newusers.8.xml:349(para) login.access.5.xml:101(para)
+#: groupadd.8.xml:206(para) chsh.1.xml:150(para) chpasswd.8.xml:202(para)
+#: chgpasswd.8.xml:197(para) chfn.1.xml:118(para)
 msgid "Shadow password suite configuration."
 msgstr "Konfiguration des Shadow-Passwort-Systems"
 
-#: userdel.8.xml:141(title) useradd.8.xml:541(title) pwck.8.xml:208(title)
-#: passwd.1.xml:343(title) grpck.8.xml:182(title) groupmod.8.xml:139(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:208(title) chage.1.xml:199(title)
+#: userdel.8.xml:170(title) useradd.8.xml:667(title) pwck.8.xml:241(title)
+#: passwd.1.xml:385(title) grpck.8.xml:214(title) groupmod.8.xml:168(title)
+#: groupdel.8.xml:106(title) groupadd.8.xml:234(title) chage.1.xml:228(title)
 msgid "EXIT VALUES"
 msgstr "RÜCKGABEWERTE"
 
-#: userdel.8.xml:146(replaceable) useradd.8.xml:546(replaceable)
-#: pwck.8.xml:213(replaceable) passwd.1.xml:348(replaceable)
-#: grpck.8.xml:187(replaceable) groupmod.8.xml:144(replaceable)
-#: groupdel.8.xml:82(replaceable) groupadd.8.xml:213(replaceable)
-#: chage.1.xml:204(replaceable)
+#: userdel.8.xml:175(replaceable) useradd.8.xml:672(replaceable)
+#: pwck.8.xml:246(replaceable) passwd.1.xml:390(replaceable)
+#: grpck.8.xml:219(replaceable) groupmod.8.xml:173(replaceable)
+#: groupdel.8.xml:111(replaceable) groupadd.8.xml:239(replaceable)
+#: chage.1.xml:233(replaceable)
 msgid "0"
 msgstr "0"
 
-#: userdel.8.xml:148(para) useradd.8.xml:548(para) pwck.8.xml:215(para)
-#: passwd.1.xml:350(para) grpck.8.xml:189(para) groupmod.8.xml:146(para)
-#: groupdel.8.xml:84(para) groupadd.8.xml:215(para) chage.1.xml:206(para)
+#: userdel.8.xml:177(para) useradd.8.xml:674(para) pwck.8.xml:248(para)
+#: passwd.1.xml:392(para) grpck.8.xml:221(para) groupmod.8.xml:175(para)
+#: groupdel.8.xml:113(para) groupadd.8.xml:241(para) chage.1.xml:235(para)
 msgid "success"
 msgstr "Erfolg"
 
-#: userdel.8.xml:152(replaceable) useradd.8.xml:552(replaceable)
-#: su.1.xml:26(manvolnum) sg.1.xml:10(manvolnum) pwck.8.xml:219(replaceable)
-#: passwd.1.xml:16(manvolnum) passwd.1.xml:354(replaceable)
-#: newgrp.1.xml:10(manvolnum) login.1.xml:42(manvolnum)
-#: grpck.8.xml:193(replaceable) groups.1.xml:6(manvolnum)
-#: gpasswd.1.xml:14(manvolnum) expiry.1.xml:12(manvolnum)
-#: chsh.1.xml:12(manvolnum) chfn.1.xml:13(manvolnum) chage.1.xml:6(manvolnum)
-#: chage.1.xml:210(replaceable)
+#: userdel.8.xml:181(replaceable) useradd.8.xml:678(replaceable)
+#: su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:252(replaceable)
+#: passwd.1.xml:45(manvolnum) passwd.1.xml:396(replaceable)
+#: newgrp.1.xml:39(manvolnum) login.1.xml:71(manvolnum)
+#: grpck.8.xml:225(replaceable) groups.1.xml:35(manvolnum)
+#: gpasswd.1.xml:43(manvolnum) expiry.1.xml:42(manvolnum)
+#: chsh.1.xml:41(manvolnum) chfn.1.xml:42(manvolnum) chage.1.xml:35(manvolnum)
+#: chage.1.xml:239(replaceable)
 msgid "1"
 msgstr "1"
 
-#: userdel.8.xml:154(para) useradd.8.xml:554(para)
+#: userdel.8.xml:183(para) useradd.8.xml:680(para)
 msgid "can't update password file"
 msgstr "kann die Passwortdatei nicht aktualisieren"
 
-#: userdel.8.xml:158(replaceable) useradd.8.xml:558(replaceable)
-#: pwck.8.xml:225(replaceable) passwd.1.xml:360(replaceable)
-#: grpck.8.xml:199(replaceable) groupmod.8.xml:150(replaceable)
-#: groupdel.8.xml:88(replaceable) groupadd.8.xml:219(replaceable)
-#: chage.1.xml:216(replaceable)
+#: userdel.8.xml:187(replaceable) useradd.8.xml:684(replaceable)
+#: pwck.8.xml:258(replaceable) passwd.1.xml:402(replaceable)
+#: grpck.8.xml:231(replaceable) groupmod.8.xml:179(replaceable)
+#: groupdel.8.xml:117(replaceable) groupadd.8.xml:245(replaceable)
+#: chage.1.xml:245(replaceable)
 msgid "2"
 msgstr "2"
 
-#: userdel.8.xml:160(para) useradd.8.xml:560(para) pwck.8.xml:221(para)
-#: grpck.8.xml:195(para) groupmod.8.xml:152(para) groupdel.8.xml:90(para)
-#: groupadd.8.xml:221(para) chage.1.xml:218(para)
+#: userdel.8.xml:189(para) useradd.8.xml:686(para) pwck.8.xml:254(para)
+#: grpck.8.xml:227(para) groupmod.8.xml:181(para) groupdel.8.xml:119(para)
+#: groupadd.8.xml:247(para) chage.1.xml:247(para)
 msgid "invalid command syntax"
 msgstr "unzulässige Syntax für diesen Befehl"
 
-#: userdel.8.xml:164(replaceable) useradd.8.xml:576(replaceable)
-#: passwd.1.xml:384(replaceable) groupmod.8.xml:168(replaceable)
-#: groupdel.8.xml:94(replaceable)
+#: userdel.8.xml:193(replaceable) useradd.8.xml:702(replaceable)
+#: pwck.8.xml:282(replaceable) passwd.1.xml:426(replaceable)
+#: groupmod.8.xml:197(replaceable) groupdel.8.xml:123(replaceable)
 msgid "6"
 msgstr "6"
 
-#: userdel.8.xml:166(para)
+#: userdel.8.xml:195(para)
 msgid "specified user doesn't exist"
 msgstr "angegebener Benutzer ist nicht vorhanden"
 
-#: userdel.8.xml:172(para)
+#: userdel.8.xml:201(para)
 msgid "user currently logged in"
 msgstr "Benutzer ist im Moment angemeldet"
 
-#: userdel.8.xml:176(replaceable) useradd.8.xml:588(replaceable)
-#: groupmod.8.xml:180(replaceable) groupdel.8.xml:106(replaceable)
-#: groupadd.8.xml:243(replaceable)
+#: userdel.8.xml:205(replaceable) useradd.8.xml:714(replaceable)
+#: groupmod.8.xml:209(replaceable) groupdel.8.xml:135(replaceable)
+#: groupadd.8.xml:269(replaceable)
 msgid "10"
 msgstr "10"
 
-#: userdel.8.xml:178(para) useradd.8.xml:590(para) groupmod.8.xml:182(para)
-#: groupdel.8.xml:108(para) groupadd.8.xml:245(para)
+#: userdel.8.xml:207(para) useradd.8.xml:716(para) groupmod.8.xml:211(para)
+#: groupdel.8.xml:137(para) groupadd.8.xml:271(para)
 msgid "can't update group file"
 msgstr "kann Gruppendatei nicht aktualisieren"
 
-#: userdel.8.xml:182(replaceable) useradd.8.xml:594(replaceable)
+#: userdel.8.xml:211(replaceable) useradd.8.xml:720(replaceable)
 msgid "12"
 msgstr "12"
 
-#: userdel.8.xml:184(para)
+#: userdel.8.xml:213(para)
 msgid "can't remove home directory"
 msgstr "kann das Home-Verzeichnis nicht löschen"
 
-#: userdel.8.xml:142(para)
+#: userdel.8.xml:171(para)
 msgid ""
 "The <command>userdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -1028,7 +1115,7 @@
 "Der Befehl <command>userdel</command> gibt beim Beenden folgende Werte "
 "zurück: <placeholder-1/>"
 
-#: userdel.8.xml:193(para)
+#: userdel.8.xml:222(para)
 msgid ""
 "<command>userdel</command> will not allow you to remove an account if the "
 "user is currently logged in. You must kill any running processes which "
@@ -1038,7 +1125,7 @@
 "wenn der Benutzer im Moment angemeldet ist. Sie müssen alle Prozesse "
 "beenden, die dem Konto gehören, das Sie entfernen möchten."
 
-#: userdel.8.xml:198(para)
+#: userdel.8.xml:227(para)
 msgid ""
 "You may not remove any NIS attributes on a NIS client. This must be "
 "performed on the NIS server."
@@ -1046,7 +1133,7 @@
 "Sie sollten keine NIS-Attribute auf einem NIS-Client löschen. Dies muss auf "
 "dem NIS-Server durchgeführt werden."
 
-#: userdel.8.xml:201(para)
+#: userdel.8.xml:230(para)
 msgid ""
 "If <emphasis>USERGROUPS_ENAB</emphasis> is defined to <emphasis remap=\"I"
 "\">yes</emphasis> in <filename>/etc/login.defs</filename>, <command>userdel</"
@@ -1065,7 +1152,7 @@
 "angezeigt und der betreffende Benutzer nicht entfernt. Mit der Option "
 "<option>-f</option> kann das Löschen dieser Gruppe erzwungen werden."
 
-#: userdel.8.xml:214(para)
+#: userdel.8.xml:243(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1099,23 +1186,23 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: useradd.8.xml:19(refentrytitle) useradd.8.xml:24(refname)
-#: useradd.8.xml:29(command) useradd.8.xml:36(command)
-#: useradd.8.xml:40(command) login.defs.5.xml:389(term)
+#: useradd.8.xml:49(refentrytitle) useradd.8.xml:54(refname)
+#: useradd.8.xml:59(command) useradd.8.xml:66(command)
+#: useradd.8.xml:70(command) login.defs.5.xml:421(term)
 msgid "useradd"
 msgstr "useradd"
 
-#: useradd.8.xml:25(refpurpose)
+#: useradd.8.xml:55(refpurpose)
 msgid "create a new user or update default new user information"
 msgstr ""
 "erstellt einen neuen Benutzer oder aktualisiert die Standardwerte für neue "
 "Benutzer"
 
-#: useradd.8.xml:37(arg) useradd.8.xml:41(arg)
+#: useradd.8.xml:67(arg) useradd.8.xml:71(arg)
 msgid "-D"
 msgstr "-D"
 
-#: useradd.8.xml:50(para)
+#: useradd.8.xml:80(para)
 #, fuzzy
 msgid ""
 "When invoked without the <option>-D</option> option, the <command>useradd</"
@@ -1132,13 +1219,20 @@
 "Befehl useradd Systemdateien, erstellt ein Home-Verzeichnis für den neuen "
 "Benutzer und kopiert Dateien."
 
-#: useradd.8.xml:63(para)
+#: useradd.8.xml:89(para)
+msgid ""
+"By default, a group will also be created for the new user (see <option>-g</"
+"option>, <option>-N</option>, <option>-U</option>, and "
+"<option>USERGROUPS_ENAB</option>)."
+msgstr ""
+
+#: useradd.8.xml:98(para)
 msgid "The options which apply to the <command>useradd</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>useradd</command> unterstützt werden, "
 "sind:"
 
-#: useradd.8.xml:67(term) useradd.8.xml:379(term)
+#: useradd.8.xml:102(term) useradd.8.xml:475(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
@@ -1146,7 +1240,7 @@
 "<option>-b</option>, <option>--base-dir</option><replaceable>WURZEL_VERZ</"
 "replaceable>"
 
-#: useradd.8.xml:72(para)
+#: useradd.8.xml:107(para)
 #, fuzzy
 msgid ""
 "The default base directory for the system if <option>-d</"
@@ -1161,8 +1255,15 @@
 "dem Kontonamen. Wenn die Option <option>-m</option> nicht verwendet wird, "
 "muss <replaceable>WURZEL_VERZ</replaceable> existieren."
 
-#: useradd.8.xml:88(para)
+#: useradd.8.xml:115(para)
 msgid ""
+"If this option is not specified, <command>useradd</command> will use the "
+"base directory specified by the <option>HOME</option> variable in <filename>/"
+"etc/default/useradd</filename>, or <filename>/home</filename> by default."
+msgstr ""
+
+#: useradd.8.xml:130(para)
+msgid ""
 "Any text string. It is generally a short description of the login, and is "
 "currently used as the field for the user's full name."
 msgstr ""
@@ -1170,7 +1271,7 @@
 "des Logins und wird im Moment im Feld für den vollen Namen des Benutzers "
 "gespeichert."
 
-#: useradd.8.xml:101(para)
+#: useradd.8.xml:143(para)
 msgid ""
 "The new user will be created using <replaceable>HOME_DIR</replaceable> as "
 "the value for the user's login directory. The default is to append the "
@@ -1186,31 +1287,78 @@
 "Verzeichnis <replaceable>HOME_VERZ</replaceable> muss nicht vorhanden sein, "
 "sondern wird gegebenenfalls angelegt."
 
-#: useradd.8.xml:113(term)
+#: useradd.8.xml:155(term)
 #, fuzzy
 #| msgid "<option>-d</option>, <option>--delete</option>"
 msgid "<option>-D</option>, <option>--defaults</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
-#: useradd.8.xml:117(para)
+#: useradd.8.xml:159(para)
 #, fuzzy
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr "Die Standardwerte verändern"
 
-#: useradd.8.xml:154(para)
+#: useradd.8.xml:174(para)
 msgid ""
+"If not specified, <command>useradd</command> will use the default expiry "
+"date specified by the <option>EXPIRE</option> variable in <filename>/etc/"
+"default/useradd</filename>, or an empty string (no expiry) by default."
+msgstr ""
+
+#: useradd.8.xml:188(para)
+#, fuzzy
+#| msgid ""
+#| "The number of days after a password expires until the account is "
+#| "permanently disabled. A value of 0 disables the account as soon as the "
+#| "password has expired, and a value of -1 disables the feature. The default "
+#| "value is -1."
+msgid ""
+"The number of days after a password expires until the account is permanently "
+"disabled. A value of 0 disables the account as soon as the password has "
+"expired, and a value of -1 disables the feature."
+msgstr ""
+"Die Anzahl von Tagen, für die ein Passwort abgelaufen ist, bis das Konto "
+"dauerhaft deaktiviert wird. Ein Wert von 0 deaktiviert das Konto, sobald das "
+"Passwort abläuft. Ein Wert von -1 schaltet diese Funktion ab. Der "
+"Standardwert ist -1."
+
+#: useradd.8.xml:194(para)
+msgid ""
+"If not specified, <command>useradd</command> will use the default inactivity "
+"period specified by the <option>INACTIVE</option> variable in the <filename>/"
+"etc/default/useradd</filename>, or -1 by default."
+msgstr ""
+
+#: useradd.8.xml:208(para)
+#, fuzzy
+#| msgid ""
+#| "The group name or number of the user's new initial login group. The group "
+#| "name must exist. A group number must refer to an already existing group. "
+#| "The default group number is 1."
+msgid ""
 "The group name or number of the user's initial login group. The group name "
-"must exist. A group number must refer to an already existing group. The "
-"default group number is 1 or whatever is specified in <filename>/etc/default/"
-"useradd</filename>."
+"must exist. A group number must refer to an already existing group."
 msgstr ""
-"Der Gruppenname oder die Zahl der Login-Gruppe des Benutzers. Der "
-"Gruppenname muss existieren. Eine Gruppenzahl muss auf eine existierende "
-"Gruppe verweisen. Die Standardgruppenzahl ist 1 oder ergibt sich aus "
-"<filename>/etc/default/useradd</filename>."
+"Der Name oder die Zahl der anfänglichen Login-Gruppe eines neuen Benutzers. "
+"Der Gruppenname muss existieren. Die Gruppenzahl muss auf eine bereits "
+"bestehende Gruppe verweisen. Die Standardgruppennummer ist 1."
 
-#: useradd.8.xml:168(para)
+#: useradd.8.xml:213(para)
 msgid ""
+"If not specified, the bahavior of <command>useradd</command> will depend on "
+"the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>. If this variable is set to <replaceable>yes</replaceable> (or "
+"<option>-U/--user-group</option> is specified on the command line), a group "
+"will be created for the user, with the same name as her loginname. If the "
+"variable is set to <replaceable>no</replaceable> (or <option>-N/--no-user-"
+"group</option> is specified on the command line), useradd will set the "
+"primary group of the new user to the value specified by the <option>GROUP</"
+"option> variable in <filename>/etc/default/useradd</filename>, or 100 by "
+"default."
+msgstr ""
+
+#: useradd.8.xml:236(para)
+msgid ""
 "A list of supplementary groups which the user is also a member of. Each "
 "group is separated from the next by a comma, with no intervening whitespace. "
 "The groups are subject to the same restrictions as the group given with the "
@@ -1223,7 +1371,7 @@
 "Option <option>-g</option> bestimmt wurde. Standardmäßig ist der Benutzer "
 "nur Mitglied der Ausgangsgruppe."
 
-#: useradd.8.xml:185(term)
+#: useradd.8.xml:253(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
@@ -1234,14 +1382,14 @@
 msgstr ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 
-#: useradd.8.xml:190(para)
+#: useradd.8.xml:258(para)
 msgid ""
 "The skeleton directory, which contains files and directories to be copied in "
 "the user's home directory, when the home directory is created by "
 "<command>useradd</command>."
 msgstr ""
 
-#: useradd.8.xml:195(para)
+#: useradd.8.xml:263(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
@@ -1249,14 +1397,14 @@
 "home</option>) option is specified."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:199(para)
+#: useradd.8.xml:267(para)
 msgid ""
-"If this option is not set, the skeleton directory is defined in <filename>/"
-"etc/default/useradd</filename> or, by default, <filename>/etc/skel</"
-"filename>."
+"If this option is not set, the skeleton directory is defined by the "
+"<option>SKEL</option> variable in <filename>/etc/default/useradd</filename> "
+"or, by default, <filename>/etc/skel</filename>."
 msgstr ""
 
-#: useradd.8.xml:207(term) groupadd.8.xml:86(term)
+#: useradd.8.xml:276(term) groupadd.8.xml:112(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
@@ -1264,10 +1412,21 @@
 "<option>-K</option>, <option>--key</option><replaceable>SCHLÜSSEL</"
 "replaceable>=<replaceable>WERT</replaceable>"
 
-#: useradd.8.xml:212(para)
+#: useradd.8.xml:281(para)
+#, fuzzy
+#| msgid ""
+#| "Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, "
+#| "PASS_MAX_DAYS and others). <placeholder-1/> Example: <option>-K </"
+#| "option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</"
+#| "replaceable> can be used when creating system account to turn off "
+#| "password ageing, even though system account has no password at all. "
+#| "Multiple <option>-K</option> options can be specified, e.g.: <option>-K </"
+#| "option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
+#| "replaceable><option> -K </option><replaceable>UID_MAX</"
+#| "replaceable>=<replaceable>499</replaceable>"
 msgid ""
-"Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS "
-"and others). <placeholder-1/> Example: <option>-K </"
+"Overrides <filename>/etc/login.defs</filename> defaults (UID_MIN, UID_MAX, "
+"UMASK, PASS_MAX_DAYS and others). <placeholder-1/> Example: <option>-K </"
 "option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</"
 "replaceable> can be used when creating system account to turn off password "
 "ageing, even though system account has no password at all. Multiple <option>-"
@@ -1286,7 +1445,7 @@
 "replaceable>=<replaceable>100</replaceable><option> -K </"
 "option><replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>"
 
-#: useradd.8.xml:226(para)
+#: useradd.8.xml:295(para)
 msgid ""
 "Note: <option>-K </option><replaceable>UID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
@@ -1296,64 +1455,86 @@
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable> funktioniert noch nicht."
 
-#: useradd.8.xml:234(option) groupmems.8.xml:24(arg)
-#: groupmems.8.xml:79(option)
-msgid "-l"
-msgstr "-l"
+#: useradd.8.xml:303(term)
+#, fuzzy
+#| msgid "<option>-l</option>, <option>--list</option>"
+msgid "<option>-l</option>, <option>--no-log-init</option>"
+msgstr "<option>-l</option>, <option>--list</option>"
 
-#: useradd.8.xml:236(para)
+#: useradd.8.xml:305(para)
 msgid "Do not add the user to the lastlog and faillog databases."
 msgstr ""
 
-#: useradd.8.xml:239(para)
+#: useradd.8.xml:308(para)
 msgid ""
 "By default, the user's entries in the lastlog and faillog databases are "
 "resetted to avoid reusing the entry from a previously deleted user."
 msgstr ""
 
-#: useradd.8.xml:247(term)
+#: useradd.8.xml:316(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:251(para)
+#: useradd.8.xml:320(para)
 msgid ""
 "Create the user's home directory if it does not exist. The files and "
 "directories contained in the skeleton directory (which can be defined with "
 "the <option>-k</option> option) will be copied to the home directory."
 msgstr ""
 
-#: useradd.8.xml:257(para)
+#: useradd.8.xml:326(para)
 msgid "By default, no home directories are created."
 msgstr ""
 
-#: useradd.8.xml:263(term)
+#: useradd.8.xml:333(option)
 #, fuzzy
+#| msgid "-"
+msgid "-M"
+msgstr "-"
+
+#: useradd.8.xml:336(para)
+msgid ""
+"Do no create the user's home directory, even if the system wide setting from "
+"<filename>/etc/login.defs</filename> (<option>CREATE_HOME</option>) is set "
+"to <replaceable>yes</replaceable>."
+msgstr ""
+
+#: useradd.8.xml:345(term)
+#, fuzzy
 #| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-N</option>, <option>--no-user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: useradd.8.xml:267(para)
+#: useradd.8.xml:349(para)
 msgid ""
 "Do not create a group with the same name as the user, but add the user to "
 "the group specified by the <option>-g</option> option or by the GROUP "
 "variable in <filename>/etc/default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:273(para) useradd.8.xml:358(para)
+#: useradd.8.xml:355(para) useradd.8.xml:454(para)
 msgid ""
 "The default behavior (if the <option>-g</option>, <option>-N</option>, and "
 "<option>-U</option> options are not specified) is defined by the "
-"<option>USERGROUPS_ENAB</option> variable in <filename>login.defs</filename>."
+"<option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>."
 msgstr ""
 
-#: useradd.8.xml:286(para)
+#: useradd.8.xml:368(para)
 msgid "Allow the creation of a user account with a duplicate (non-unique) UID."
 msgstr ""
 "Erlaubt das Erstellen eines Benutzerkontos mit einer schon vergebenen (nicht "
 "eindeutigen) UID."
 
-#: useradd.8.xml:295(para)
+#: useradd.8.xml:369(para)
+#, fuzzy
+#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
+"This option is only valid in combination with the <option>-o</option> option."
+msgstr "<option>-m</option>, <option>--create-home</option>"
+
+#: useradd.8.xml:381(para)
+msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
 "disable the account."
@@ -1362,35 +1543,50 @@
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> zurückgegeben wird. "
 "Standardmäßig ist das Konto abgeschaltet."
 
-#: useradd.8.xml:303(term) newusers.8.xml:113(term) groupadd.8.xml:130(term)
+#: useradd.8.xml:389(term) newusers.8.xml:236(term) groupadd.8.xml:156(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-r</option>, <option>--system</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: useradd.8.xml:307(para) newusers.8.xml:117(para)
+#: useradd.8.xml:393(para) newusers.8.xml:240(para)
 msgid "Create a system account."
 msgstr ""
 
-#: useradd.8.xml:310(para) newusers.8.xml:120(para)
+#: useradd.8.xml:396(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are choosen in the "
 "<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
-"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<filename>/etc/login.defs</filename>, instead of <option>UID_MIN</option>-"
 "<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
 "the creation of groups)."
 msgstr ""
 
-#: useradd.8.xml:327(para)
+#: useradd.8.xml:405(para)
 msgid ""
+"Note that <command>useradd</command> will not create a home directory for "
+"such an user, regardless of the default setting in <filename>/etc/login."
+"defs</filename> (<option>CREATE_HOME</option>). You have to specify the "
+"<option>-m</option> options if you want a home directory for a system "
+"account to be created."
+msgstr ""
+
+#: useradd.8.xml:421(para)
+#, fuzzy
+#| msgid ""
+#| "The name of the user's login shell. The default is to leave this field "
+#| "blank, which causes the system to select the default login shell."
+msgid ""
 "The name of the user's login shell. The default is to leave this field "
-"blank, which causes the system to select the default login shell."
+"blank, which causes the system to select the default login shell specified "
+"by the <option>SHELL</option> variable in <filename>/etc/default/useradd</"
+"filename>, or an empty string by default."
 msgstr ""
 "Der Name der Login-Shell des Benutzers. Standardmäßig wird dieses Feld leer "
 "gelassen, das System verwendet dann die Standard-Login-Shell."
 
-#: useradd.8.xml:340(para)
+#: useradd.8.xml:436(para)
 msgid ""
 "The numerical value of the user's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. The "
@@ -1404,23 +1600,23 @@
 "größer als jeder andere Wert eines Benutzers verwendet. Typischerweise sind "
 "Werte zwischen 0 und 999 für Systemkonten reserviert."
 
-#: useradd.8.xml:350(term)
+#: useradd.8.xml:446(term)
 #, fuzzy
 #| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-U</option>, <option>--user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: useradd.8.xml:354(para)
+#: useradd.8.xml:450(para)
 msgid ""
 "Create a group with the same name as the user, and add the user to this "
 "group."
 msgstr ""
 
-#: useradd.8.xml:369(title)
+#: useradd.8.xml:465(title)
 msgid "Changing the default values"
 msgstr "Die Standardwerte verändern"
 
-#: useradd.8.xml:370(para)
+#: useradd.8.xml:466(para)
 #, fuzzy
 msgid ""
 "When invoked with only the <option>-D</option> option, <command>useradd</"
@@ -1433,7 +1629,7 @@
 "über die Kommandozeile angepasst. Die gültigen Optionen sind:"
 
 # SB: English version must be BASE_DIR
-#: useradd.8.xml:384(para)
+#: useradd.8.xml:480(para)
 #, fuzzy
 msgid ""
 "The path prefix for a new user's home directory. The user's name will be "
@@ -1446,44 +1642,80 @@
 "den Namen des Home-Verzeichnisses zu erhalten, falls nicht die Option "
 "<option>-d</option> verwendet wird."
 
-#: useradd.8.xml:399(para)
+#: useradd.8.xml:487(para)
+msgid ""
+"This option sets the <option>HOME</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
+#: useradd.8.xml:499(para)
 msgid "The date on which the user account is disabled."
 msgstr "Das Datum, an dem des Benutzerkonto abgeschaltet wird."
 
-#: useradd.8.xml:408(para)
+#: useradd.8.xml:500(para)
 msgid ""
+"This option sets the <option>EXPIRE</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
+#: useradd.8.xml:512(para)
+msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
 msgstr ""
 "Die Anzahl von Tagen, für die ein Passwort abgelaufen ist, bis das Konto "
 "deaktiviert wird."
 
-#: useradd.8.xml:420(para)
+#: useradd.8.xml:516(para)
 msgid ""
-"The group name or ID for a new user's initial group. The named group must "
-"exist, and a numerical group ID must have an existing entry."
+"This option sets the <option>INACTIVE</option> variable in <filename>/etc/"
+"default/useradd</filename>."
 msgstr ""
-"Der Name oder die Zahl der Login-Gruppe eines neuen Benutzers. Der "
-"Gruppenname muss existieren. Die Gruppenzahl muss auf eine bereits "
-"bestehende Gruppe verweisen."
 
-#: useradd.8.xml:433(para)
+#: useradd.8.xml:528(para)
+msgid ""
+"The group name or ID for a new user's initial group (when the <option>-N/--"
+"no-user-group</option> is used or when the <option>USERGROUPS_ENAB</option> "
+"variable is set to <replaceable>no</replaceable> in <filename>/etc/login."
+"defs</filename>. The named group must exist, and a numerical group ID must "
+"have an existing entry."
+msgstr ""
+
+#: useradd.8.xml:537(para)
+msgid ""
+"This option sets the <option>GROUP</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
+#: useradd.8.xml:549(para)
 msgid "The name of a new user's login shell."
 msgstr ""
 
-#: useradd.8.xml:444(title)
+#: useradd.8.xml:552(para)
+msgid ""
+"This option sets the <option>SHELL</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
+#: useradd.8.xml:564(title)
 msgid "NOTES"
 msgstr "ANMERKUNGEN"
 
-#: useradd.8.xml:445(para)
+#: useradd.8.xml:565(para)
+#, fuzzy
+#| msgid ""
+#| "The system administrator is responsible for placing the default user "
+#| "files in the <filename>/etc/skel/</filename> directory."
 msgid ""
 "The system administrator is responsible for placing the default user files "
-"in the <filename>/etc/skel/</filename> directory."
+"in the <filename>/etc/skel/</filename> directory (or any other skeleton "
+"directory specified in <filename>/etc/default/useradd</filename> or on the "
+"command line)."
 msgstr ""
 "Der Systemadministrator ist dafür verantwortlich, im Verzeichnis <filename>/"
 "etc/skel/</filename> die standardmäßigen Benutzerdateien anzulegen."
 
-#: useradd.8.xml:452(para)
+#: useradd.8.xml:574(para)
 #, fuzzy
 msgid ""
 "You may not add a user to a NIS or LDAP group. This must be performed on the "
@@ -1492,7 +1724,7 @@
 "Sie dürfen einen Benutzer nicht einer NIS-Gruppe hinzufügen. Dies muss auf "
 "dem NIS-Server durchgeführt werden."
 
-#: useradd.8.xml:457(para)
+#: useradd.8.xml:579(para)
 #, fuzzy
 msgid ""
 "Similarly, if the username already exists in an external user database such "
@@ -1503,30 +1735,57 @@
 "erstellen, wenn der Benutzername schon in einer externen Benutzerdatenbank "
 "wie z.B. NIS vorhanden ist."
 
-#: useradd.8.xml:463(para)
+#: useradd.8.xml:585(para)
+#, fuzzy
+#| msgid ""
+#| "Usernames must begin with a lower case letter or an underscore, and only "
+#| "lower case letters, underscores, dashes, and dollar signs may follow. In "
+#| "regular expression terms: [a-z_][a-z0-9_-]*[$]"
 msgid ""
 "Usernames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
-"regular expression terms: [a-z_][a-z0-9_-]*[$]"
+"regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 "Benutzernamen müssen mit einem Kleinbuchstaben oder einem Unterstrich "
 "beginnen. Sie dürfen nur Kleinbuchstaben, Unterstriche, Gedankenstriche oder "
 "Dollarzeichen enthalten. Als regulärer Ausdruck: [a-z_][a-z0-9_-]*[$]"
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: groupadd.8.xml:2(term)
+#: useradd.8.xml:590(para)
 #, fuzzy
+#| msgid "Groupnames may only be up to 16 characters long."
+msgid "Usernames may only be up to 32 characters long."
+msgstr "Gruppennamen dürfen nur bis zu 16 Zeichen lang sein."
+
+#: useradd.8.xml:30(term) login.defs.5.xml:30(term)
+#, fuzzy
+msgid "<option>CREATE_HOME</option> (boolean)"
+msgstr "CHFN_AUTH (Boolesh)"
+
+#: useradd.8.xml:32(para) login.defs.5.xml:32(para)
+msgid ""
+"Indicate if a home directory should be created by default for new users."
+msgstr ""
+
+#: useradd.8.xml:36(para) login.defs.5.xml:36(para)
+msgid ""
+"This setting does not apply to system users, and can be overriden on the "
+"command line."
+msgstr ""
+
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: groupadd.8.xml:32(term)
+#, fuzzy
 msgid "<option>GID_MAX</option> (number)"
 msgstr "GID_MAX (Zahl)"
 
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
-#: groupadd.8.xml:3(term)
+#: useradd.8.xml:33(term) newusers.8.xml:33(term) login.defs.5.xml:33(term)
+#: groupadd.8.xml:33(term)
 #, fuzzy
 msgid "<option>GID_MIN</option> (number)"
 msgstr "GID_MIN (Zahl)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
-#: groupadd.8.xml:5(para)
+#: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para)
+#: groupadd.8.xml:35(para)
 #, fuzzy
 #| msgid ""
 #| "Range of group IDs to choose from for the <command>useradd</command> and "
@@ -1539,14 +1798,14 @@
 "Ein Bereich von Gruppen-IDs, aus denen die Programme <command>useradd</"
 "command> und <command>groupadd</command> auswählen dürfen."
 
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) pwck.8.xml:2(term)
-#: newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_MAX_DAYS</option> (number)"
 msgstr "PASS_MAX_DAYS (Zahl)"
 
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) pwck.8.xml:4(para)
-#: newusers.8.xml:4(para) login.defs.5.xml:4(para)
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "The maximum number of days a password may be used. If the password is older "
 "than this, a password change will be forced. If not specified, -1 will be "
@@ -1557,14 +1816,14 @@
 "nicht angegeben, wird -1 angenommen (was zur Folge hat, dass diese "
 "Beschränkung abgeschalten ist)."
 
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) pwck.8.xml:2(term)
-#: newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_MIN_DAYS</option> (number)"
 msgstr "PASS_MIN_DAYS (Zahl)"
 
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) pwck.8.xml:4(para)
-#: newusers.8.xml:4(para) login.defs.5.xml:4(para)
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "The minimum number of days allowed between password changes. Any password "
 "changes attempted sooner than this will be rejected. If not specified, -1 "
@@ -1575,14 +1834,14 @@
 "nicht angegeben, wird -1 angenommen (was zur Folge hat, dass diese "
 "Beschränkung abgeschalten ist)."
 
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) pwck.8.xml:2(term)
-#: newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_WARN_AGE</option> (number)"
 msgstr "PASS_WARN_AGE (Zahl)"
 
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) pwck.8.xml:4(para)
-#: newusers.8.xml:4(para) login.defs.5.xml:4(para)
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "The number of days warning given before a password expires. A zero means "
 "warning is given only upon the day of expiration, a negative value means no "
@@ -1593,20 +1852,20 @@
 "ausgegeben wird. Ein negativer Wert bedeutet, dass keine Warnung erfolgt. "
 "Falls nicht angegeben, wird keine Warnung ausgegeben."
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: groupadd.8.xml:2(term)
+#: useradd.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: groupadd.8.xml:30(term)
 #, fuzzy
 msgid "<option>SYS_GID_MAX</option> (number)"
 msgstr "GID_MAX (Zahl)"
 
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
-#: groupadd.8.xml:3(term)
+#: useradd.8.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
+#: groupadd.8.xml:31(term)
 #, fuzzy
 msgid "<option>SYS_GID_MIN</option> (number)"
 msgstr "GID_MIN (Zahl)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
-#: groupadd.8.xml:5(para)
+#: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
+#: groupadd.8.xml:33(para)
 #, fuzzy
 #| msgid ""
 #| "Range of group IDs to choose from for the <command>useradd</command> and "
@@ -1619,17 +1878,17 @@
 "Ein Bereich von Gruppen-IDs, aus denen die Programme <command>useradd</"
 "command> und <command>groupadd</command> auswählen dürfen."
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
 #, fuzzy
 msgid "<option>SYS_UID_MAX</option> (number)"
 msgstr "UID_MAX (Zahl)"
 
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
+#: useradd.8.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
 #, fuzzy
 msgid "<option>SYS_UID_MIN</option> (number)"
 msgstr "UID_MIN (Zahl)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
+#: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
 #, fuzzy
 #| msgid ""
 #| "Range of group IDs to choose from for the <command>useradd</command> and "
@@ -1641,17 +1900,17 @@
 "Ein Bereich von Gruppen-IDs, aus denen die Programme <command>useradd</"
 "command> und <command>groupadd</command> auswählen dürfen."
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>UID_MAX</option> (number)"
 msgstr "UID_MAX (Zahl)"
 
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
+#: useradd.8.xml:33(term) newusers.8.xml:33(term) login.defs.5.xml:33(term)
 #, fuzzy
 msgid "<option>UID_MIN</option> (number)"
 msgstr "UID_MIN (Zahl)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
+#: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para)
 #, fuzzy
 #| msgid ""
 #| "Range of group IDs to choose from for the <command>useradd</command> and "
@@ -1663,89 +1922,111 @@
 "Ein Bereich von Gruppen-IDs, aus denen die Programme <command>useradd</"
 "command> und <command>groupadd</command> auswählen dürfen."
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: login.1.xml:2(term)
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: login.1.xml:32(term)
 #, fuzzy
 msgid "<option>UMASK</option> (number)"
 msgstr "UMASK (Zahl)"
 
-#: useradd.8.xml:4(para) newusers.8.xml:4(para) login.defs.5.xml:4(para)
-#: login.1.xml:4(para)
+#: useradd.8.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
+#: login.1.xml:34(para)
+#, fuzzy
+#| msgid ""
+#| "The permission mask is initialized to this value. If not specified, the "
+#| "permission mask will be initialized to 022."
 msgid ""
-"The permission mask is initialized to this value. If not specified, the "
-"permission mask will be initialized to 022."
+"The file mode creation mask is initialized to this value. If not specified, "
+"the mask will be initialized to 022."
 msgstr ""
 "Die Maske der Berechtigungen wird anfänglich auf diesen Wert gesetzt. Falls "
 "nicht angegeben, wird die Maske der Berechtigungen anfänglich auf 022 "
 "gesetzt."
 
-#: useradd.8.xml:520(filename)
+#: useradd.8.xml:38(para) newusers.8.xml:38(para) login.defs.5.xml:38(para)
+#: login.1.xml:38(para)
+msgid ""
+"<command>useradd</command> and <command>newusers</command> use this mask to "
+"set the mode of the home directory they create"
+msgstr ""
+
+#: useradd.8.xml:42(para) newusers.8.xml:42(para) login.defs.5.xml:42(para)
+#: login.1.xml:42(para)
+msgid ""
+"It is also used by <command>login</command> to define users' initial umask. "
+"Note that this mask can be overriden by the user's GECOS line (if "
+"<option>QUOTAS_ENAB</option> is set) or by the specification of a limit with "
+"the <emphasis>K</emphasis> identifier in "
+"<citerefentry><refentrytitle>limits</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+
+#: useradd.8.xml:646(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
 # type: Plain text
-#: useradd.8.xml:522(para)
+#: useradd.8.xml:648(para)
 msgid "Default values for account creation."
 msgstr "Standardwerte für die Erstellung eines Kontos."
 
-#: useradd.8.xml:526(filename)
+#: useradd.8.xml:652(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
-#: useradd.8.xml:528(para)
+#: useradd.8.xml:654(para)
 msgid "Directory containing default files."
 msgstr "Verzeichnis, das die Standarddateien enthält."
 
-#: useradd.8.xml:564(replaceable) shadow.3.xml:6(manvolnum)
-#: pwck.8.xml:231(replaceable) passwd.1.xml:366(replaceable)
-#: grpck.8.xml:205(replaceable) groupmod.8.xml:156(replaceable)
-#: groupadd.8.xml:225(replaceable)
+#: useradd.8.xml:690(replaceable) shadow.3.xml:35(manvolnum)
+#: pwck.8.xml:264(replaceable) passwd.1.xml:408(replaceable)
+#: grpck.8.xml:237(replaceable) groupmod.8.xml:185(replaceable)
+#: groupadd.8.xml:251(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:566(para) passwd.1.xml:386(para) groupmod.8.xml:158(para)
-#: groupadd.8.xml:227(para)
+#: useradd.8.xml:692(para) passwd.1.xml:428(para) groupmod.8.xml:187(para)
+#: groupadd.8.xml:253(para)
 msgid "invalid argument to option"
 msgstr "ungültiges Argument für Option"
 
-#: useradd.8.xml:570(replaceable) pwck.8.xml:237(replaceable)
-#: passwd.1.xml:372(replaceable) grpck.8.xml:211(replaceable)
-#: groupmod.8.xml:162(replaceable) groupadd.8.xml:231(replaceable)
+#: useradd.8.xml:696(replaceable) pwck.8.xml:270(replaceable)
+#: passwd.1.xml:414(replaceable) grpck.8.xml:243(replaceable)
+#: groupmod.8.xml:191(replaceable) groupadd.8.xml:257(replaceable)
 msgid "4"
 msgstr "4"
 
-#: useradd.8.xml:572(para)
+#: useradd.8.xml:698(para)
 msgid "UID already in use (and no <option>-o</option>)"
 msgstr "UID ist schon vergeben (und kein <option>-o</option>)"
 
-#: useradd.8.xml:578(para) groupmod.8.xml:164(para) groupmod.8.xml:170(para)
-#: groupdel.8.xml:96(para)
+#: useradd.8.xml:704(para) groupmod.8.xml:193(para) groupmod.8.xml:199(para)
+#: groupdel.8.xml:125(para)
 msgid "specified group doesn't exist"
 msgstr "angegebene Gruppe ist nicht vorhanden"
 
-#: useradd.8.xml:582(replaceable) groupmod.8.xml:174(replaceable)
-#: groupadd.8.xml:237(replaceable)
+#: useradd.8.xml:708(replaceable) groupmod.8.xml:203(replaceable)
+#: groupadd.8.xml:263(replaceable)
 msgid "9"
 msgstr "9"
 
-#: useradd.8.xml:584(para)
+#: useradd.8.xml:710(para)
 msgid "username already in use"
 msgstr "Benutzername ist schon vergeben"
 
-#: useradd.8.xml:596(para)
+#: useradd.8.xml:722(para)
 msgid "can't create home directory"
 msgstr "Home-Verzeichnis kann nicht erstellt werden"
 
-#: useradd.8.xml:600(replaceable)
+#: useradd.8.xml:726(replaceable)
 msgid "13"
 msgstr "13"
 
 # SB: translation of 'mail spool'?
-#: useradd.8.xml:602(para)
+#: useradd.8.xml:728(para)
 msgid "can't create mail spool"
 msgstr "Mail-Datei kann nicht erstellen werden"
 
-#: useradd.8.xml:542(para)
+#: useradd.8.xml:668(para)
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -1753,7 +2034,7 @@
 "Der Befehl <command>useradd</command> gibt beim Beenden folgende Werte "
 "zurück: <placeholder-1/>"
 
-#: useradd.8.xml:611(para)
+#: useradd.8.xml:737(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1791,36 +2072,36 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: suauth.5.xml:5(refentrytitle) suauth.5.xml:10(refname)
+#: suauth.5.xml:34(refentrytitle) suauth.5.xml:39(refname)
 msgid "suauth"
 msgstr "suauth"
 
-#: suauth.5.xml:6(manvolnum) shadow.5.xml:6(manvolnum)
-#: pwck.8.xml:243(replaceable) porttime.5.xml:6(manvolnum)
-#: passwd.5.xml:6(manvolnum) passwd.1.xml:378(replaceable)
-#: login.defs.5.xml:67(manvolnum) login.access.5.xml:6(manvolnum)
-#: limits.5.xml:6(manvolnum) gshadow.5.xml:6(manvolnum)
-#: grpck.8.xml:217(replaceable) faillog.5.xml:6(manvolnum)
+#: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
+#: pwck.8.xml:276(replaceable) porttime.5.xml:35(manvolnum)
+#: passwd.5.xml:35(manvolnum) passwd.1.xml:420(replaceable)
+#: login.defs.5.xml:98(manvolnum) login.access.5.xml:36(manvolnum)
+#: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
+#: grpck.8.xml:249(replaceable) faillog.5.xml:35(manvolnum)
 msgid "5"
 msgstr "5"
 
-#: suauth.5.xml:7(refmiscinfo) shadow.5.xml:7(refmiscinfo)
-#: porttime.5.xml:7(refmiscinfo) passwd.5.xml:7(refmiscinfo)
-#: login.defs.5.xml:68(refmiscinfo) login.access.5.xml:7(refmiscinfo)
-#: limits.5.xml:7(refmiscinfo) gshadow.5.xml:7(refmiscinfo)
-#: faillog.5.xml:7(refmiscinfo)
+#: suauth.5.xml:36(refmiscinfo) shadow.5.xml:36(refmiscinfo)
+#: porttime.5.xml:36(refmiscinfo) passwd.5.xml:36(refmiscinfo)
+#: login.defs.5.xml:99(refmiscinfo) login.access.5.xml:37(refmiscinfo)
+#: limits.5.xml:37(refmiscinfo) gshadow.5.xml:35(refmiscinfo)
+#: faillog.5.xml:36(refmiscinfo)
 msgid "File Formats and Conversions"
 msgstr "Dateiformate und -konvertierung"
 
-#: suauth.5.xml:11(refpurpose)
+#: suauth.5.xml:40(refpurpose)
 msgid "detailed su control file"
 msgstr "ausführliche Kontrolldatei für su"
 
-#: suauth.5.xml:16(command) suauth.5.xml:142(filename)
+#: suauth.5.xml:45(command) suauth.5.xml:171(filename)
 msgid "/etc/suauth"
 msgstr "/etc/suauth"
 
-#: suauth.5.xml:22(para)
+#: suauth.5.xml:51(para)
 msgid ""
 "The file <filename>/etc/suauth</filename> is referenced whenever the su "
 "command is called. It can change the behaviour of the su command, based upon:"
@@ -1830,7 +2111,7 @@
 "werden. Dies hängt von Folgendem ab:"
 
 #. .RS
-#: suauth.5.xml:29(literallayout)
+#: suauth.5.xml:58(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -1842,14 +2123,14 @@
 "    "
 
 #. .fi
-#: suauth.5.xml:33(para)
+#: suauth.5.xml:62(para)
 msgid ""
 "2) the user executing the su command (or any groups he might be a member of)"
 msgstr ""
 "2) dem Benutzer, der su ausführt (oder einer Gruppe, deren Mitglied er ist)"
 
 # SB: Shouldn't it be ":" at the end?
-#: suauth.5.xml:38(para)
+#: suauth.5.xml:67(para)
 msgid ""
 "The file is formatted like this, with lines starting with a # being treated "
 "as comment lines and ignored;"
@@ -1857,7 +2138,7 @@
 "Die Datei ist folgendermaßen aufgebaut, wobei Zeilen, die mit einem # "
 "beginnen, als Kommentare behandelt und daher ignoriert werden:"
 
-#: suauth.5.xml:43(literallayout)
+#: suauth.5.xml:72(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -1869,7 +2150,7 @@
 "    "
 
 # SB: A "." missing at the end of orginial?
-#: suauth.5.xml:47(para)
+#: suauth.5.xml:76(para)
 msgid ""
 "Where to-id is either the word <emphasis>ALL</emphasis>, a list of usernames "
 "delimited by \",\" or the words <emphasis>ALL EXCEPT</emphasis> followed by "
@@ -1881,7 +2162,7 @@
 "werden, die durch ein \",\" getrennt werden, sein."
 
 # SB: What is the meaning of the last sentence?
-#: suauth.5.xml:53(para)
+#: suauth.5.xml:82(para)
 msgid ""
 "from-id is formatted the same as to-id except the extra word "
 "<emphasis>GROUP</emphasis> is recognised. <emphasis>ALL EXCEPT GROUP</"
@@ -1899,36 +2180,36 @@
 "<citerefentry><refentrytitle>/etc/group</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry> ist notwendig."
 
-#: suauth.5.xml:64(para)
+#: suauth.5.xml:93(para)
 msgid "Action can be one only of the following currently supported options."
 msgstr "Als Aktion können nur die folgenden Optionen angegeben werden."
 
-#: suauth.5.xml:70(emphasis)
+#: suauth.5.xml:99(emphasis)
 msgid "DENY"
 msgstr "DENY"
 
-#: suauth.5.xml:73(para)
+#: suauth.5.xml:102(para)
 msgid "The attempt to su is stopped before a password is even asked for."
 msgstr ""
 "Der Versuch, su auszuführen, wird abgebrochen, ehe nach einem Passwort "
 "gefragt wird."
 
-#: suauth.5.xml:80(emphasis)
+#: suauth.5.xml:109(emphasis)
 msgid "NOPASS"
 msgstr "NOPASS"
 
-#: suauth.5.xml:83(para)
+#: suauth.5.xml:112(para)
 msgid ""
 "The attempt to su is automatically successful; no password is asked for."
 msgstr ""
 "Der Versuch, su auszuführen, hat automatisch Erfolg. Ein Passwort wird nicht "
 "abgefragt."
 
-#: suauth.5.xml:91(emphasis)
+#: suauth.5.xml:120(emphasis)
 msgid "OWNPASS"
 msgstr "OWNPASS"
 
-#: suauth.5.xml:94(para)
+#: suauth.5.xml:123(para)
 msgid ""
 "For the su command to be successful, the user must enter his or her own "
 "password. They are told this."
@@ -1936,7 +2217,7 @@
 "Damit su Erfolg hat, muss der Benutzer sein eigenes Passwort eingeben. "
 "Darauf wird er hingewiesen."
 
-#: suauth.5.xml:102(para)
+#: suauth.5.xml:131(para)
 msgid ""
 "Note there are three separate fields delimited by a colon. No whitespace "
 "must surround this colon. Also note that the file is examined sequentially "
@@ -1951,11 +2232,11 @@
 "wird angewendet, ohne dass die Datei weiter ausgewertet wird. Damit kann ein "
 "Systemadministrator eine strenge Kontrolle ausüben."
 
-#: suauth.5.xml:112(title)
+#: suauth.5.xml:141(title)
 msgid "EXAMPLE"
 msgstr "BEISPIEL"
 
-#: suauth.5.xml:113(literallayout)
+#: suauth.5.xml:142(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2004,11 +2285,11 @@
 "      #\n"
 "    "
 
-#: suauth.5.xml:149(title) pwconv.8.xml:105(title) login.defs.5.xml:428(title)
+#: suauth.5.xml:178(title) pwconv.8.xml:135(title) login.defs.5.xml:455(title)
 msgid "BUGS"
 msgstr "BUGS"
 
-#: suauth.5.xml:150(para)
+#: suauth.5.xml:179(para)
 msgid ""
 "There could be plenty lurking. The file parser is particularly unforgiving "
 "about syntax errors, expecting no spurious whitespace (apart from beginning "
@@ -2019,11 +2300,11 @@
 "Schluss einer Zeile) und dem besonderen Zeichen, das die verschiedenen "
 "Felder von einander trennt."
 
-#: suauth.5.xml:159(title) shadow.3.xml:154(title)
+#: suauth.5.xml:188(title) shadow.3.xml:183(title)
 msgid "DIAGNOSTICS"
 msgstr "DIAGNOSE"
 
-#: suauth.5.xml:160(para)
+#: suauth.5.xml:189(para)
 msgid ""
 "An error parsing the file is reported using "
 "<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</"
@@ -2033,7 +2314,7 @@
 "<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry> mit der Stufe ERR an das Gerät AUTH gemeldet."
 
-#: suauth.5.xml:169(para)
+#: suauth.5.xml:198(para)
 msgid ""
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -2041,25 +2322,30 @@
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: su.1.xml:25(refentrytitle) su.1.xml:30(refname) su.1.xml:35(command)
-#: login.defs.5.xml:363(term)
+#: su.1.xml:54(refentrytitle) su.1.xml:59(refname) su.1.xml:64(command)
+#: login.defs.5.xml:395(term)
 msgid "su"
 msgstr "su"
 
-#: su.1.xml:27(refmiscinfo) sg.1.xml:11(refmiscinfo)
-#: passwd.1.xml:17(refmiscinfo) newgrp.1.xml:11(refmiscinfo)
-#: login.1.xml:43(refmiscinfo) groups.1.xml:7(refmiscinfo)
-#: gpasswd.1.xml:15(refmiscinfo) expiry.1.xml:13(refmiscinfo)
-#: chsh.1.xml:13(refmiscinfo) chfn.1.xml:14(refmiscinfo)
-#: chage.1.xml:7(refmiscinfo)
+#: su.1.xml:56(refmiscinfo) sg.1.xml:40(refmiscinfo)
+#: passwd.1.xml:46(refmiscinfo) newgrp.1.xml:40(refmiscinfo)
+#: login.1.xml:72(refmiscinfo) groups.1.xml:36(refmiscinfo)
+#: gpasswd.1.xml:44(refmiscinfo) expiry.1.xml:43(refmiscinfo)
+#: chsh.1.xml:42(refmiscinfo) chfn.1.xml:43(refmiscinfo)
+#: chage.1.xml:36(refmiscinfo)
 msgid "User Commands"
 msgstr "Dienstprogramme für Benutzer"
 
-#: su.1.xml:31(refpurpose)
+#: su.1.xml:60(refpurpose)
 msgid "change user ID or become superuser"
 msgstr "ändert die Benutzer-ID oder wechselt zu Root"
 
-#: su.1.xml:49(para)
+#: su.1.xml:70(replaceable) login.1.xml:85(replaceable)
+#: login.1.xml:93(replaceable)
+msgid "username"
+msgstr "Benutzername"
+
+#: su.1.xml:78(para)
 msgid ""
 "The <command>su</command> command is used to become another user during a "
 "login session. Invoked without a <option>username</option>, <command>su</"
@@ -2075,7 +2361,7 @@
 "Benutzer nach einer direkten Anmeldung erwartet."
 
 # SB: Bessere Übersetzung als 'Zielbenutzer'?
-#: su.1.xml:58(para)
+#: su.1.xml:87(para)
 msgid ""
 "Additional arguments may be provided after the username, in which case they "
 "are supplied to the user's login shell. In particular, an argument of "
@@ -2090,7 +2376,7 @@
 "Befehl wird von der Shell ausgeführt, die in <filename>/etc/passwd</"
 "filename> für den Zielbenutzer angegeben ist."
 
-#: su.1.xml:67(para)
+#: su.1.xml:96(para)
 msgid ""
 "You can use the <option>--</option> argument to separate <command>su</"
 "command> options from the arguments supplied to the shell."
@@ -2098,7 +2384,7 @@
 "Sie können das Argument <option>--</option> verwenden, um Optionen für "
 "<command>su</command> von Argumenten für die Shell zu trennen."
 
-#: su.1.xml:72(para)
+#: su.1.xml:101(para)
 msgid ""
 "The user will be prompted for a password, if appropriate. Invalid passwords "
 "will produce an error message. All attempts, both valid and invalid, are "
@@ -2109,7 +2395,7 @@
 "auch misslungene Versuche werden protokolliert, um Missbrauch des Systems zu "
 "entdecken."
 
-#: su.1.xml:77(para)
+#: su.1.xml:106(para)
 msgid ""
 "The current environment is passed to the new shell. The value of <envar>"
 "$PATH</envar> is reset to <filename>/bin:/usr/bin</filename> for normal "
@@ -2126,7 +2412,7 @@
 "<filename>/etc/login.defs</filename> geändert werden."
 
 # SB: Not quite sure what subsystem logins are.
-#: su.1.xml:86(para) login.1.xml:135(para)
+#: su.1.xml:115(para) login.1.xml:166(para)
 msgid ""
 "A subsystem login is indicated by the presence of a \"*\" as the first "
 "character of the login shell. The given home directory will be used as the "
@@ -2137,12 +2423,12 @@
 "das Dateisystem verwendet, auf welchem der Benutzer tatsächlich angemeldet "
 "ist."
 
-#: su.1.xml:95(para)
+#: su.1.xml:124(para)
 msgid "The options which apply to the <command>su</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>su</command> unterstützt werden, sind:"
 
-#: su.1.xml:99(term)
+#: su.1.xml:128(term)
 msgid ""
 "<option>-c</option>, <option>--command</option><replaceable>COMMAND</"
 "replaceable>"
@@ -2150,7 +2436,7 @@
 "<option>-c</option>, <option>--command</option><replaceable>BEFEHL</"
 "replaceable>"
 
-#: su.1.xml:104(para)
+#: su.1.xml:133(para)
 msgid ""
 "Specify a command that will be invoked by the shell using its <option>-c</"
 "option>."
@@ -2158,11 +2444,11 @@
 "Gibt einen Befehl an, der von der Shell mittels ihrer Option <option>-c</"
 "option> ausgeführt wird."
 
-#: su.1.xml:111(term)
+#: su.1.xml:140(term)
 msgid "<option>-</option>, <option>-l</option>, <option>--login</option>"
 msgstr "<option>-</option>, <option>-l</option>, <option>--login</option>"
 
-#: su.1.xml:115(para)
+#: su.1.xml:144(para)
 msgid ""
 "Provide an environment similar to what the user would expect had the user "
 "logged in directly."
@@ -2170,7 +2456,7 @@
 "Eine Umgebung wird zur Verfügung gestellt, die der entspricht, die der "
 "Benutzer nach einer direkten Anmeldung erwartet."
 
-#: su.1.xml:119(para)
+#: su.1.xml:148(para)
 msgid ""
 "When <option>-</option> is used, it must be specified as the last "
 "<command>su</command> option. The other forms (<option>-l</option> and "
@@ -2180,15 +2466,15 @@
 "<command>su</command> angegeben werden. Die übrigen Formen ((<option>-l</"
 "option> und <option>--login</option>) unterliegen nicht dieser Beschränkung."
 
-#: su.1.xml:133(para)
+#: su.1.xml:162(para)
 msgid "The shell that will be invoked."
 msgstr "Die Shell, die gestartet wird."
 
-#: su.1.xml:138(para)
+#: su.1.xml:167(para)
 msgid "The shell specified with --shell."
 msgstr "Die Shell, die mit --shell angegeben wurde."
 
-#: su.1.xml:141(para)
+#: su.1.xml:170(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
@@ -2197,7 +2483,7 @@
 "durch die Umgebungsvariable <envar>$SHELL</envar> festgelegt wird."
 
 # SB: Bessere Übersetzung als 'Zielbenutzer'?
-#: su.1.xml:148(para)
+#: su.1.xml:177(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
@@ -2205,7 +2491,7 @@
 "Die Shell, die in <filename>/etc/passwd</filename> für den Zielbenutzer "
 "angegeben ist."
 
-#: su.1.xml:154(para)
+#: su.1.xml:183(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
@@ -2213,7 +2499,7 @@
 "<filename>/bin/sh</filename>, falls durch die obigen Methoden keine Shell "
 "gefunden werden kann."
 
-#: su.1.xml:134(para)
+#: su.1.xml:163(para)
 msgid ""
 "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr ""
@@ -2221,7 +2507,7 @@
 "<placeholder-1/>"
 
 # SB: Bessere Übersetzung als 'Zielbenutzer'?
-#: su.1.xml:161(para)
+#: su.1.xml:190(para)
 msgid ""
 "If the target user has a restricted shell (i.e. the shell field of this "
 "user's entry in <filename>/etc/passwd</filename> is not listed in <filename>/"
@@ -2235,7 +2521,7 @@
 "shell</option> und die Umgebungsvariable <envar>$SHELL</envar> nicht "
 "beachtet, sofern <command>su</command> nicht von Root aufgerufen wird."
 
-#: su.1.xml:172(term)
+#: su.1.xml:201(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -2243,11 +2529,11 @@
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
 
-#: su.1.xml:177(para)
+#: su.1.xml:206(para)
 msgid "Preserve the current environment."
 msgstr "Erhält die aktuelle Umgebung."
 
-#: su.1.xml:178(para)
+#: su.1.xml:207(para)
 msgid ""
 "If the target user has a restricted shell, this option has no effect (unless "
 "<command>su</command> is called by root)."
@@ -2255,7 +2541,7 @@
 "Falls der Zielbenutzer eine beschränkte Shell besitzt, hat diese Option "
 "keinen Effekt (sofern <command>su</command> nicht von Root aufgerufen wird)."
 
-#: su.1.xml:189(para)
+#: su.1.xml:218(para)
 msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -2263,28 +2549,28 @@
 "Diese Version von <command>su</command> hat viele Kompilierungsoptionen. "
 "Deren Nützlichkeit hängt von den Anforderungen der jeweiligen Umgebung ab."
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>CONSOLE</option> (string)"
 msgstr "CHFN_RESTRICT (Zeichenkette)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, either full pathname of a file containing device names or a \":"
 "\" delimited list of device names. Root logins will be allowed only upon "
 "these devices."
 msgstr ""
 
-#: su.1.xml:9(para) login.defs.5.xml:9(para) login.1.xml:9(para)
+#: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
 msgid "If not defined, root will be allowed on any device."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>CONSOLE_GROUPS</option> (string)"
 msgstr "CHFN_RESTRICT (Zeichenkette)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "List of groups to add to the user's supplementary group set when logging in "
 "on the console (as determined by the CONSOLE setting). Default is none. "
@@ -2292,18 +2578,18 @@
 "permanent access to these groups, even when not logged in on the console."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>DEFAULT_HOME</option> (boolean)"
 msgstr "CHFN_AUTH (Boolesh)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Indicate if login is allowed if we can't cd to the home directory. Default "
 "in no."
 msgstr ""
 
-#: su.1.xml:8(para) login.defs.5.xml:8(para) login.1.xml:8(para)
+#: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
 msgid ""
 "If set to <replaceable>yes</replaceable>, the user will login in the root "
 "(<filename>/</filename>) directory if it is not possible to cd to her home "
@@ -2311,41 +2597,41 @@
 msgstr ""
 
 #. XXX: When compiled with PAM support, only sulogin uses ENV_HZ
-#: su.1.xml:3(term) login.defs.5.xml:3(term) login.1.xml:3(term)
+#: su.1.xml:33(term) login.defs.5.xml:33(term) login.1.xml:33(term)
 #, fuzzy
 msgid "<option>ENV_HZ</option> (string)"
 msgstr "MAIL_DIR (Zeichenkette)"
 
-#: su.1.xml:5(para) login.defs.5.xml:5(para) login.1.xml:5(para)
+#: su.1.xml:35(para) login.defs.5.xml:35(para) login.1.xml:35(para)
 msgid ""
 "If set, it will be used to define the HZ environment variable when a user "
 "login. The value must be preceded by <replaceable>HZ=</replaceable>. A "
 "common value on Linux is <replaceable>HZ=100</replaceable>."
 msgstr ""
 
-#: su.1.xml:11(para) login.defs.5.xml:11(para) login.1.xml:11(para)
+#: su.1.xml:41(para) login.defs.5.xml:41(para) login.1.xml:41(para)
 msgid ""
 "The <envar>HZ</envar> environment variable is only set when the user (the "
 "superuser) logs in with <command>sulogin</command>."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENVIRON_FILE</option> (string)"
 msgstr "MAIL_DIR (Zeichenkette)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If this file exists and is readable, login environment will be read from it. "
 "Every line should be in the form name=value."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_PATH</option> (string)"
 msgstr "CHFN_RESTRICT (Zeichenkette)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, it will be used to define the PATH environment variable when a "
 "regular user login. The value can be preceded by <replaceable>PATH=</"
@@ -2354,12 +2640,12 @@
 "usr/bin</replaceable>."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_SUPATH</option> (string)"
 msgstr "CHFN_RESTRICT (Zeichenkette)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, it will be used to define the PATH environment variable when the "
 "superuser login. The value can be preceded by <replaceable>PATH=</"
@@ -2368,12 +2654,12 @@
 "<replaceable>PATH=/bin:/usr/bin</replaceable>."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_TZ</option> (string)"
 msgstr "CHFN_RESTRICT (Zeichenkette)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, it will be used to define the TZ environment variable when a user "
 "login. The value can be the name of a timezone preceded by <replaceable>TZ=</"
@@ -2383,72 +2669,72 @@
 msgstr ""
 
 #. TODO: it can in fact be used to set any other variable
-#: su.1.xml:13(para) login.defs.5.xml:13(para) login.1.xml:13(para)
+#: su.1.xml:43(para) login.defs.5.xml:43(para) login.1.xml:43(para)
 msgid ""
 "If a full path is specified but the file does not exist or cannot be read, "
 "the default is to use <replaceable>TZ=CST6CDT</replaceable>."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
-#: chsh.1.xml:2(term) chfn.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
+#: chsh.1.xml:32(term) chfn.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOGIN_STRING</option> (string)"
 msgstr "CHFN_RESTRICT (Zeichenkette)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
-#: chsh.1.xml:4(para) chfn.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
+#: chsh.1.xml:34(para) chfn.1.xml:34(para)
 msgid ""
 "The string used for prompting a password. The default is to use \"Password: "
 "\", or a translation of that string. If you set this variable, the prompt "
 "will no be translated."
 msgstr ""
 
-#: su.1.xml:9(para) login.defs.5.xml:9(para) login.1.xml:9(para)
-#: chsh.1.xml:9(para) chfn.1.xml:9(para)
+#: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
+#: chsh.1.xml:39(para) chfn.1.xml:39(para)
 msgid ""
 "If the string contains <replaceable>%s</replaceable>, this will be replaced "
 "by the user's name."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>MAIL_CHECK_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (Boolesh)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable checking and display of mailbox status upon login."
 msgstr ""
 
-#: su.1.xml:7(para) login.defs.5.xml:7(para) login.1.xml:7(para)
+#: su.1.xml:37(para) login.defs.5.xml:37(para) login.1.xml:37(para)
 msgid ""
 "You should disable it if the shell startup files already check for mail "
 "(\"mailx -e\" or equivalent)."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>QUOTAS_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (Boolesh)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable setting of ulimit, umask, and niceness from passwd gecos field."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SULOG_FILE</option> (string)"
 msgstr "CHFN_RESTRICT (Zeichenkette)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "If defined, all su activity is logged to this file."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SU_NAME</option> (string)"
 msgstr "MAIL_DIR (Zeichenkette)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "If defined, the command name to display when running \"su -\". For example, "
 "if this is defined as \"su\" then a \"ps\" will display the command is \"-su"
@@ -2456,12 +2742,12 @@
 "being run, e.g. something like \"-sh\"."
 msgstr ""
 
-#: su.1.xml:3(term) login.defs.5.xml:3(term)
+#: su.1.xml:33(term) login.defs.5.xml:33(term)
 #, fuzzy
 msgid "<option>SU_WHEEL_ONLY</option> (boolean)"
 msgstr "CHFN_AUTH (Boolesh)"
 
-#: su.1.xml:5(para) login.defs.5.xml:5(para)
+#: su.1.xml:35(para) login.defs.5.xml:35(para)
 msgid ""
 "If <replaceable>yes</replaceable>, the user must be listed as a member of "
 "the first gid 0 group in <filename>/etc/group</filename> (called "
@@ -2470,18 +2756,18 @@
 "empty, no one will be able to <command>su</command> to uid 0."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SYSLOG_SU_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (Boolesh)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "Enable \"syslog\" logging of <command>su</command> activity - in addition to "
 "sulog file logging."
 msgstr ""
 
-#: su.1.xml:243(para)
+#: su.1.xml:272(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -2497,27 +2783,27 @@
 "citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>"
 
-#: sg.1.xml:9(refentrytitle) sg.1.xml:14(refname) sg.1.xml:20(command)
+#: sg.1.xml:38(refentrytitle) sg.1.xml:43(refname) sg.1.xml:49(command)
 msgid "sg"
 msgstr "sg"
 
-#: sg.1.xml:15(refpurpose)
+#: sg.1.xml:44(refpurpose)
 msgid "execute command as different group ID"
 msgstr "führt einen Befehl unter einer anderen Gruppen-ID aus"
 
-#: sg.1.xml:21(arg) newgrp.1.xml:20(arg)
+#: sg.1.xml:50(arg) newgrp.1.xml:49(arg)
 msgid "-"
 msgstr "-"
 
-#: sg.1.xml:23(arg) expiry.1.xml:23(arg)
+#: sg.1.xml:52(arg) expiry.1.xml:53(arg)
 msgid "-c"
 msgstr "-c"
 
-#: sg.1.xml:22(arg)
+#: sg.1.xml:51(arg)
 msgid "group <placeholder-1/> command"
 msgstr "Gruppe <placeholder-1/> Befehl"
 
-#: sg.1.xml:31(para)
+#: sg.1.xml:60(para)
 msgid ""
 "The <command>sg</command> command works similar to <command>newgrp</command> "
 "but accepts a command. The command will be executed with the <filename>/bin/"
@@ -2541,16 +2827,16 @@
 "<command>sg</command>, daher werden Sie nach Beenden des Befehls "
 "<command>sg</command> zu Ihrer vorherigen Gruppen-ID zurückkehren."
 
-#: sg.1.xml:2(term) newgrp.1.xml:2(term) login.defs.5.xml:2(term)
+#: sg.1.xml:32(term) newgrp.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SYSLOG_SG_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (Boolesh)"
 
-#: sg.1.xml:4(para) newgrp.1.xml:4(para) login.defs.5.xml:4(para)
+#: sg.1.xml:34(para) newgrp.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Enable \"syslog\" logging of <command>sg</command> activity."
 msgstr ""
 
-#: sg.1.xml:90(para)
+#: sg.1.xml:119(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -2587,263 +2873,389 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
-#: shadow.5.xml:5(refentrytitle) shadow.5.xml:10(refname)
-#: shadow.3.xml:5(refentrytitle) shadow.3.xml:10(refname)
-#: pwck.8.xml:31(replaceable) pwck.8.xml:45(replaceable)
-#: grpck.8.xml:24(replaceable) grpck.8.xml:33(replaceable)
+#: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
+#: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
+#: pwck.8.xml:60(replaceable) pwck.8.xml:74(replaceable)
+#: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
 msgid "shadow"
 msgstr "shadow"
 
-#: shadow.5.xml:11(refpurpose)
+#: shadow.5.xml:40(refpurpose)
 msgid "encrypted password file"
 msgstr "verschlüsselte Passwortdatei"
 
-#: shadow.5.xml:16(para)
+#: shadow.5.xml:45(para)
+#, fuzzy
+#| msgid ""
+#| "<emphasis remap=\"I\">shadow</emphasis> contains the encrypted password "
+#| "information for user's accounts and optional the password aging "
+#| "information. Included is:"
 msgid ""
-"<emphasis remap=\"I\">shadow</emphasis> contains the encrypted password "
-"information for user's accounts and optional the password aging information. "
-"Included is:"
+"<filename>shadow</filename> is a file which contains the password "
+"information for the system's accounts and optional aging information."
 msgstr ""
 "<emphasis remap=\"I\">shadow</emphasis> enthält die verschlüsselten "
 "Passwortinformationen für die Benutzerkonten und optional Informationen zum "
 "Verfall der Passwörter. Enthalten ist:"
 
-#: shadow.5.xml:23(para) passwd.5.xml:24(para)
+#: shadow.5.xml:51(para) gshadow.5.xml:82(para)
+msgid ""
+"This file must not be readable by regular users if password security is to "
+"be maintained."
+msgstr ""
+"Um die Sicherheit der Passwörter zu gewährleisten, darf diese Datei nicht "
+"für normale Benutzer lesbar sein."
+
+#: shadow.5.xml:56(para)
+msgid ""
+"Each line of this file contains 9 fields, separated by colons (<quote>:</"
+"quote>), in the following order:"
+msgstr ""
+
+#: shadow.5.xml:63(emphasis) passwd.5.xml:53(para)
 msgid "login name"
 msgstr "Login-Name"
 
-#: shadow.5.xml:26(para) gshadow.5.xml:26(para)
+#: shadow.5.xml:65(para)
+msgid "It must be a valid account name, which exist on the system."
+msgstr ""
+
+#: shadow.5.xml:71(emphasis) gshadow.5.xml:54(para)
 msgid "encrypted password"
 msgstr "verschlüsseltes Passwort"
 
-#: shadow.5.xml:29(para)
-msgid "days since Jan 1, 1970 that password was last changed"
+#: shadow.5.xml:73(para)
+msgid ""
+"Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+"manvolnum></citerefentry> for details on how this string is interpreted."
 msgstr ""
-"Anzahl der Tage gerechnet ab dem 1. Januar 1970, seitdem das Passwort das "
-"letzte Mal geändert wurde"
+"Sie sollten in <citerefentry><refentrytitle>crypt</"
+"refentrytitle><manvolnum>3</manvolnum></citerefentry> nachsehen, wenn Sie "
+"mehr über die Bedeutung dieser Zeichenkette wissen wollen."
 
-#: shadow.5.xml:32(para)
-msgid "days before password may be changed"
+#: shadow.5.xml:78(para)
+#, fuzzy
+#| msgid ""
+#| "If the password field contains some string that is not valid result of "
+#| "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+#| "manvolnum></citerefentry>, for instance ! or *, the user will not be able "
+#| "to use a unix password to log in, subject to "
+#| "<citerefentry><refentrytitle>pam</refentrytitle><manvolnum>7</manvolnum></"
+#| "citerefentry>."
+msgid ""
+"If the password field contains some string that is not a valid result of "
+"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
+"citerefentry>, for instance ! or *, the user will not be able to use a unix "
+"password to log in (but the user may log in the system by other means)."
+msgstr ""
+"Wenn das Passwortfeld eine Zeichenkette enthält, die kein zulässiges "
+"Ergebnis von <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+"manvolnum></citerefentry> ist, z.B. ! oder *, kann sich der Benutzer nicht "
+"mit einem Unix-Passwort anmelden, vorbehaltlich anderer Regelungen durch "
+"<citerefentry><refentrytitle>pam</refentrytitle><manvolnum>7</manvolnum></"
+"citerefentry>."
+
+#: shadow.5.xml:85(para)
+msgid ""
+"This field may be empty, in which case no passwords are required to "
+"authenticate as the specified login name. However, some applications which "
+"read the <filename>/etc/shadow</filename> file may decide not to permit any "
+"access at all if the password field is empty."
+msgstr ""
+
+#: shadow.5.xml:92(para)
+msgid ""
+"A password field which starts with a exclamation mark means that the "
+"password is locked. The remaining characters on the line represent the "
+"password field before the password was locked."
+msgstr ""
+
+#: shadow.5.xml:102(emphasis)
+#, fuzzy
+#| msgid "days before password may be changed"
+msgid "date of last password change"
 msgstr "Anzahl der Tage, bevor das Passwort geändert werden darf"
 
-#: shadow.5.xml:35(para)
-msgid "days after which password must be changed"
-msgstr "Anzahl der Tage, nach denen das Passwort geändert werden muss"
+#: shadow.5.xml:105(para)
+msgid ""
+"The date of the last password change, expressed as the number of days since "
+"Jan 1, 1970."
+msgstr ""
 
-#: shadow.5.xml:38(para)
-msgid "days before password is to expire that user is warned"
+#: shadow.5.xml:109(para)
+msgid ""
+"The value 0 has a special meaning, which is that the user should change her "
+"pasword the next time she will log in the system."
 msgstr ""
-"Anzahl der Tage ehe das Passwort verfällt, an denen der Benutzer gewarnt wird"
 
-#: shadow.5.xml:41(para)
-msgid "days after password expires that account is disabled"
+#: shadow.5.xml:114(para)
+msgid "An empty field means that password aging features are disabled."
 msgstr ""
-"Anzahl der Tage nach dem Verfall des Passwort bis das Konto abgeschaltet wird"
 
-#: shadow.5.xml:44(para)
-msgid "days since Jan 1, 1970 that account is disabled"
+#: shadow.5.xml:121(emphasis)
+#, fuzzy
+#| msgid "Password Changes"
+msgid "minimum password age"
+msgstr "Verändern des Passworts"
+
+#: shadow.5.xml:123(para)
+msgid ""
+"The minimum password age is the number of days the user will have to wait "
+"before she will be allowed to change her password again."
 msgstr ""
-"Anzahl Tage gerechnet ab dem 1. Januar 1970, für die das Konto abgeschaltet "
-"ist"
 
-#: shadow.5.xml:47(para)
-msgid "a reserved field"
-msgstr "ein reserviertes Feld"
+#: shadow.5.xml:128(para)
+msgid "An empty field and value 0 mean that there are no minimum password age."
+msgstr ""
 
-#: shadow.5.xml:51(para)
+#: shadow.5.xml:135(emphasis)
 #, fuzzy
+#| msgid "Password Changes"
+msgid "maximum password age"
+msgstr "Verändern des Passworts"
+
+#: shadow.5.xml:137(para)
 msgid ""
-"The password field must be filled. The encrypted password consists of 13 to "
-"24 characters from the 64 character alphabet a thru z, A thru Z, 0 thru 9, "
-"\\. and /. Optionally it can start with a \"$\" character. This means the "
-"encrypted password was generated using another (not DES) algorithm. For "
-"example if it starts with \"$1$\" it means the MD5-based algorithm was used."
+"The maximum password age is the number of days after which the user will "
+"have to change her password."
 msgstr ""
-"Das Passwortfeld darf nicht leer sein. Ein verschlüsseltes Passwort besteht "
-"aus 13 bis 24 Zeichen, die aus dem Alphabet mit 64 Zeichen stammen (a bis z, "
-"A bis Z, 0 bis 9, \\. und /). Außerdem kann es mit dem Zeichen \"$\" "
-"beginnen. Das bedeutet, dass das Passwort mit einem anderen Algorithmus "
-"(nicht DES) erzeugt wurde. So bedeutet z.B. \"$1$\", dass eine Algorithmus "
-"verwendet wurde, der auf MD5 basiert."
 
-#: shadow.5.xml:60(para)
+#: shadow.5.xml:141(para)
 msgid ""
-"Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry> for details on how this string is interpreted."
+"After this number of days is elapsed, the password may still be valid. The "
+"user should be asked to change her password the next time she will log in."
 msgstr ""
-"Sie sollten in <citerefentry><refentrytitle>crypt</"
-"refentrytitle><manvolnum>3</manvolnum></citerefentry> nachsehen, wenn Sie "
-"mehr über die Bedeutung dieser Zeichenkette wissen wollen."
 
-#: shadow.5.xml:68(para)
+#: shadow.5.xml:146(para)
 msgid ""
-"If the password field contains some string that is not valid result of "
-"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
-"citerefentry>, for instance ! or *, the user will not be able to use a unix "
-"password to log in, subject to <citerefentry><refentrytitle>pam</"
-"refentrytitle><manvolnum>7</manvolnum></citerefentry>."
+"An empty field means that there are no maximum password age, no password "
+"warning period, and no password inactivity period (see below)."
 msgstr ""
-"Wenn das Passwortfeld eine Zeichenkette enthält, die kein zulässiges "
-"Ergebnis von <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry> ist, z.B. ! oder *, kann sich der Benutzer nicht "
-"mit einem Unix-Passwort anmelden, vorbehaltlich anderer Regelungen durch "
-"<citerefentry><refentrytitle>pam</refentrytitle><manvolnum>7</manvolnum></"
-"citerefentry>."
 
-#: shadow.5.xml:77(para)
+#: shadow.5.xml:151(para)
 msgid ""
-"The date of the last password change is given as the number of days since "
-"Jan 1, 1970. The password may not be changed again until the proper number "
-"of days have passed, and must be changed after the maximum number of days. "
-"If the minimum number of days required is greater than the maximum number of "
-"day allowed, this password may not be changed by the user."
+"If the maximum password age is lower than the minimum password age, the user "
+"cannot change her password."
 msgstr ""
-"Das Datum, an dem das Passwort das letzte Mal geändert wurde, wird als "
-"Anzahl der Tage seit dem 1. Januar 1970 angegeben. Es ist möglich, dass das "
-"Passwort vor einer bestimmten Anzahl von Tagen nicht geändert werden darf "
-"oder dass es nach einer bestimmten Anzahl geändert werden muss. Fall die "
-"Mindestanzahl der Tage größer ist als die Höchstanzahl, so kann der Benutzer "
-"sein Passwort nicht ändern."
 
-#: shadow.5.xml:86(para)
+#: shadow.5.xml:159(emphasis)
+#, fuzzy
+#| msgid "Password Changes"
+msgid "password warning period"
+msgstr "Verändern des Passworts"
+
+#: shadow.5.xml:162(para)
+#, fuzzy
+#| msgid ""
+#| "The number of days after a password has expired before the account will "
+#| "be disabled."
 msgid ""
-"An account is considered to be inactive and is disabled if the password is "
-"not changed within the specified number of days after the password expires. "
-"An account will also be disabled on the specified day regardless of other "
-"password expiration information."
+"The number of days before a password is going to expire (see the maximum "
+"password age above) during which the user should be warned."
 msgstr ""
-"Ein Konto wird als inaktive angesehen und abgeschaltet, wenn das Passwort "
-"nicht innerhalb der angegebenen Anzahl von Tagen geändert wird, nachdem das "
-"Passwort abgelaufen ist. Unabhängig von anderen Informationen über den "
-"Verfall des Passworts, wird ein Konto auch am angegeben Tag abgeschaltet."
+"Die Anzahl von Tagen, für die ein Passwort abgelaufen ist, bis das Konto "
+"deaktiviert wird."
 
-#: shadow.5.xml:93(para)
+#: shadow.5.xml:167(para)
 msgid ""
-"This information supersedes any password or password age information present "
-"in <filename>/etc/passwd</filename>."
+"An empty field and value 0 mean that there are no password warning period."
 msgstr ""
-"Diese Angaben ersetzen alle Angaben zu Passwörtern und deren Verfall in "
-"<filename>/etc/passwd</filename>."
 
-#: shadow.5.xml:98(para) gshadow.5.xml:54(para)
+#: shadow.5.xml:175(emphasis)
+msgid "password inactivity period"
+msgstr ""
+
+#: shadow.5.xml:178(para)
 msgid ""
-"This file must not be readable by regular users if password security is to "
-"be maintained."
+"The number of days after a password has expired (see the maximum password "
+"age above) during which the password should still be accepted (and the user "
+"should update her password during the next login)."
 msgstr ""
-"Um die Sicherheit der Passwörter zu gewährleisten, darf diese Datei nicht "
-"für normale Benutzer lesbar sein."
 
-#: shadow.5.xml:124(para)
+#: shadow.5.xml:184(para)
 msgid ""
+"After expiration of the password and this expiration period is elapsed, no "
+"login is possible using the current user's password. The user should contact "
+"her administrator."
+msgstr ""
+
+#: shadow.5.xml:189(para)
+msgid ""
+"An empty field means that there are no enforcement of an inactivity period."
+msgstr ""
+
+#: shadow.5.xml:197(emphasis)
+#, fuzzy
+#| msgid "User account information."
+msgid "account expiration date"
+msgstr "Informationen zu den Benutzerkonten."
+
+#: shadow.5.xml:200(para)
+msgid ""
+"The date of expiration of the account, expressed as the number of days since "
+"Jan 1, 1970."
+msgstr ""
+
+#: shadow.5.xml:204(para)
+msgid ""
+"Note that an account expiration differs from a password expiration. In case "
+"of an acount expiration, the user shall not be allowed to login. In case of "
+"a password expiration, the user is not allowed to login using her password."
+msgstr ""
+
+#: shadow.5.xml:210(para)
+msgid "An empty field means that the account will never expire."
+msgstr ""
+
+#: shadow.5.xml:213(para)
+msgid ""
+"The value 0 should not be used as it is interpreted as either an account "
+"with no expiration, or as an expiration on Jan 1, 1970."
+msgstr ""
+
+#: shadow.5.xml:221(emphasis)
+#, fuzzy
+#| msgid "a reserved field"
+msgid "reserved field"
+msgstr "ein reserviertes Feld"
+
+#: shadow.5.xml:223(para)
+#, fuzzy
+#| msgid "sp_flag - reserved for future use"
+msgid "This field is reserved for future use."
+msgstr "sp_flag - für zukünftigen Gebrauch reserviert"
+
+#: shadow.5.xml:249(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>"
+msgid ""
 "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>pwconv</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>login</"
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>pwconv</"
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>"
 
-#: shadow.3.xml:7(refmiscinfo)
+#: shadow.3.xml:36(refmiscinfo)
 msgid "Library Calls"
 msgstr "Biliotheksaufrufe"
 
-#: shadow.3.xml:11(refname)
+#: shadow.3.xml:40(refname)
 msgid "getspnam"
 msgstr "getspnam"
 
 # SB: Übersetzung iO?
-#: shadow.3.xml:12(refpurpose)
+#: shadow.3.xml:41(refpurpose)
 msgid "encrypted password file routines"
 msgstr "Routinen für die Datei, die die verschlüsselten Passwörter enthält"
 
-#: shadow.3.xml:16(title)
+#: shadow.3.xml:45(title)
 msgid "SYNTAX"
 msgstr "SYNTAX"
 
-#: shadow.3.xml:18(emphasis)
+#: shadow.3.xml:47(emphasis)
 msgid "#include &lt;shadow.h&gt;"
 msgstr "#include &lt;shadow.h&gt;"
 
-#: shadow.3.xml:22(emphasis)
+#: shadow.3.xml:51(emphasis)
 msgid "struct spwd *getspent();"
 msgstr "struct spwd *getspent();"
 
-#: shadow.3.xml:26(emphasis)
+#: shadow.3.xml:55(emphasis)
 msgid "struct spwd *getspnam(char"
 msgstr "truct spwd *getspnam(char"
 
-#: shadow.3.xml:27(emphasis)
+#: shadow.3.xml:56(emphasis)
 msgid "*name"
 msgstr "*name"
 
-#: shadow.3.xml:27(emphasis) shadow.3.xml:40(emphasis)
-#: shadow.3.xml:45(emphasis) shadow.3.xml:51(emphasis)
+#: shadow.3.xml:56(emphasis) shadow.3.xml:69(emphasis)
+#: shadow.3.xml:74(emphasis) shadow.3.xml:80(emphasis)
 msgid ");"
 msgstr ");"
 
-#: shadow.3.xml:31(emphasis)
+#: shadow.3.xml:60(emphasis)
 msgid "void setspent();"
 msgstr "void setspent();"
 
-#: shadow.3.xml:35(emphasis)
+#: shadow.3.xml:64(emphasis)
 msgid "void endspent();"
 msgstr "void endspent();"
 
-#: shadow.3.xml:39(emphasis)
+#: shadow.3.xml:68(emphasis)
 msgid "struct spwd *fgetspent(FILE"
 msgstr "struct spwd *fgetspent(FILE"
 
-#: shadow.3.xml:40(emphasis) shadow.3.xml:51(emphasis)
+#: shadow.3.xml:69(emphasis) shadow.3.xml:80(emphasis)
 msgid "*fp"
 msgstr "*fp"
 
-#: shadow.3.xml:44(emphasis)
+#: shadow.3.xml:73(emphasis)
 msgid "struct spwd *sgetspent(char"
 msgstr "struct spwd *sgetspent(char"
 
-#: shadow.3.xml:45(emphasis)
+#: shadow.3.xml:74(emphasis)
 msgid "*cp"
 msgstr "*cp"
 
-#: shadow.3.xml:49(emphasis)
+#: shadow.3.xml:78(emphasis)
 msgid "int putspent(struct spwd"
 msgstr "int putspent(struct spwd"
 
-#: shadow.3.xml:50(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "*p,"
 msgstr "*p,"
 
-#: shadow.3.xml:50(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "FILE"
 msgstr "DATEIEN"
 
-#: shadow.3.xml:55(emphasis)
+#: shadow.3.xml:84(emphasis)
 msgid "int lckpwdf();"
 msgstr "int lckpwdf();"
 
-#: shadow.3.xml:59(emphasis)
+#: shadow.3.xml:88(emphasis)
 msgid "int ulckpwdf();"
 msgstr "int ulckpwdf();"
 
-#: shadow.3.xml:65(para)
+#: shadow.3.xml:94(para)
 msgid ""
 "<emphasis remap=\"I\">shadow</emphasis> manipulates the contents of the "
 "shadow password file, <filename>/etc/shadow</filename>. The structure in the "
@@ -2853,7 +3265,7 @@
 "Passwort-Datei <filename>/etc/shadow</filename>. Der Aufbau der Datei "
 "<emphasis remap=\"I\">#include</emphasis> ist:"
 
-#: shadow.3.xml:70(programlisting)
+#: shadow.3.xml:99(programlisting)
 #, no-wrap
 msgid ""
 "struct spwd {\n"
@@ -2882,34 +3294,34 @@
 "}\n"
 "    "
 
-#: shadow.3.xml:82(para)
+#: shadow.3.xml:111(para)
 msgid "The meanings of each field are:"
 msgstr "Die Bedeutung dieser Felder ist:"
 
 # SB: Übersetzung von 'null-terminated'?
-#: shadow.3.xml:85(para)
+#: shadow.3.xml:114(para)
 msgid "sp_namp - pointer to null-terminated user name"
 msgstr "sp_namp - Verweis auf Benutzername, der mit einer Null endet"
 
-#: shadow.3.xml:88(para)
+#: shadow.3.xml:117(para)
 msgid "sp_pwdp - pointer to null-terminated password"
 msgstr "sp_pwdp - Verweis auf Passwort, das mit einer Null endet"
 
-#: shadow.3.xml:91(para)
+#: shadow.3.xml:120(para)
 msgid "sp_lstchg - days since Jan 1, 1970 password was last changed"
 msgstr ""
 "sp_lstchg - Anzahl der Tage gerechnet ab dem 1. Januar 1970, seitdem das "
 "Passwort das letzte Mal geändert wurde"
 
-#: shadow.3.xml:94(para)
+#: shadow.3.xml:123(para)
 msgid "sp_min - days before which password may not be changed"
 msgstr "sp_min - Anzahl der Tage, ehe das Passwort nicht geändert werden darf"
 
-#: shadow.3.xml:97(para)
+#: shadow.3.xml:126(para)
 msgid "sp_max - days after which password must be changed"
 msgstr "sp_max - Anzahl der Tage, nach denen das Passwort geändert werden muss"
 
-#: shadow.3.xml:100(para)
+#: shadow.3.xml:129(para)
 msgid ""
 "sp_warn - days before password is to expire that user is warned of pending "
 "password expiration"
@@ -2917,7 +3329,7 @@
 "sp_warn - Anzahl der Tage ehe das Passwort verfällt, an denen der Benutzer "
 "vor dem Verfall gewarnt wird"
 
-#: shadow.3.xml:105(para)
+#: shadow.3.xml:134(para)
 msgid ""
 "sp_inact - days after password expires that account is considered inactive "
 "and disabled"
@@ -2925,17 +3337,17 @@
 "sp_inact - Anzahl der Tage nach dem Verfall des Passworts, nach denen das "
 "Konto als inaktive angesehen und abgeschaltet wird"
 
-#: shadow.3.xml:110(para)
+#: shadow.3.xml:139(para)
 msgid "sp_expire - days since Jan 1, 1970 when account will be disabled"
 msgstr ""
 "sp_expire - Anzahl Tage gerechnet ab dem 1. Januar 1970, für die das Konto "
 "abgeschaltet ist"
 
-#: shadow.3.xml:113(para)
+#: shadow.3.xml:142(para)
 msgid "sp_flag - reserved for future use"
 msgstr "sp_flag - für zukünftigen Gebrauch reserviert"
 
-#: shadow.3.xml:121(para)
+#: shadow.3.xml:150(para)
 msgid ""
 "<emphasis>getspent</emphasis>, <emphasis>getspname</emphasis>, "
 "<emphasis>fgetspent</emphasis>, and <emphasis>sgetspent</emphasis> each "
@@ -2959,7 +3371,7 @@
 "ab der aktuellen Position in der Datei nach einem Eintrag, der mit "
 "<emphasis>name</emphasis> übereinstimmt."
 
-#: shadow.3.xml:134(para)
+#: shadow.3.xml:163(para)
 msgid ""
 "<emphasis>setspent</emphasis> and <emphasis>endspent</emphasis> may be used "
 "to begin and end, respectively, access to the shadow password file."
@@ -2968,7 +3380,7 @@
 "verwendet werden, um den Zugriff auf die Shadow-Passwort-Datei zu beginnen "
 "oder zu beenden."
 
-#: shadow.3.xml:140(para)
+#: shadow.3.xml:169(para)
 msgid ""
 "The <emphasis>lckpwdf</emphasis> and <emphasis>ulckpwdf</emphasis> routines "
 "should be used to insure exclusive access to the <filename>/etc/shadow</"
@@ -2989,7 +3401,7 @@
 "scheitern, gibt <emphasis>lckpwdf</emphasis> -1 zurück. Wurden beide Sperren "
 "erhalten, wird 0 zurückgegeben."
 
-#: shadow.3.xml:155(para)
+#: shadow.3.xml:184(para)
 msgid ""
 "Routines return NULL if no more entries are available or if an error occurs "
 "during processing. Routines which have <emphasis>int</emphasis> as the "
@@ -3000,7 +3412,7 @@
 "<emphasis>int</emphasis> als Rückgabewert haben, geben im Erfolgsfall 0 und "
 "beim Scheitern -1 zurück."
 
-#: shadow.3.xml:165(para)
+#: shadow.3.xml:194(para)
 msgid ""
 "These routines may only be used by the superuser as access to the shadow "
 "password file is restricted."
@@ -3008,7 +3420,7 @@
 "Diese Routinen können nur von Root verwendet werden, da der Zugriff auf die "
 "Shadow-Passwort-Datei beschränkt ist."
 
-#: shadow.3.xml:185(para)
+#: shadow.3.xml:214(para)
 msgid ""
 "<citerefentry><refentrytitle>getpwent</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -3018,31 +3430,31 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: pwconv.8.xml:12(refentrytitle) pwconv.8.xml:17(refname)
-#: pwconv.8.xml:26(command) login.defs.5.xml:356(term)
+#: pwconv.8.xml:42(refentrytitle) pwconv.8.xml:47(refname)
+#: pwconv.8.xml:56(command) login.defs.5.xml:388(term)
 msgid "pwconv"
 msgstr "pwconv"
 
-#: pwconv.8.xml:18(refname) pwconv.8.xml:29(command)
+#: pwconv.8.xml:48(refname) pwconv.8.xml:59(command)
 msgid "pwunconv"
 msgstr "pwunconv"
 
-#: pwconv.8.xml:19(refname) pwconv.8.xml:32(command)
-#: login.defs.5.xml:270(term)
+#: pwconv.8.xml:49(refname) pwconv.8.xml:62(command)
+#: login.defs.5.xml:302(term)
 msgid "grpconv"
 msgstr "grpconv"
 
-#: pwconv.8.xml:20(refname) pwconv.8.xml:35(command)
-#: login.defs.5.xml:276(term)
+#: pwconv.8.xml:50(refname) pwconv.8.xml:65(command)
+#: login.defs.5.xml:308(term)
 msgid "grpunconv"
 msgstr "grpunconv"
 
-#: pwconv.8.xml:21(refpurpose)
+#: pwconv.8.xml:51(refpurpose)
 msgid "convert to and from shadow passwords and groups"
 msgstr "konvertiert zu oder von Shadow-Passwörtern und -gruppen"
 
 # SB: Translation ok?
-#: pwconv.8.xml:41(para)
+#: pwconv.8.xml:71(para)
 msgid ""
 "The <command>pwconv</command> command creates <emphasis remap=\"I\">shadow</"
 "emphasis> from <emphasis remap=\"I\">passwd</emphasis> and an optionally "
@@ -3054,7 +3466,7 @@
 "\">shadow</emphasis>-Datei."
 
 # SB: Translation ok?
-#: pwconv.8.xml:47(para)
+#: pwconv.8.xml:77(para)
 msgid ""
 "The <command>pwunconv</command> command creates <emphasis remap=\"I"
 "\">passwd</emphasis> from <emphasis remap=\"I\">passwd</emphasis> and "
@@ -3066,7 +3478,7 @@
 "emphasis>- und <emphasis remap=\"I\">shadow</emphasis>-Datei und entfernt "
 "anschließend die<emphasis remap=\"I\">shadow</emphasis>-Datei."
 
-#: pwconv.8.xml:54(para)
+#: pwconv.8.xml:84(para)
 msgid ""
 "The <command>grpconv</command> command creates <emphasis remap=\"I"
 "\">gshadow</emphasis> from <emphasis remap=\"I\">group</emphasis> and an "
@@ -3077,7 +3489,7 @@
 "Datei und gegebenenfalls aus einer bereits vorhandenen <emphasis remap=\"I"
 "\">gshadow</emphasis>-Datei."
 
-#: pwconv.8.xml:60(para)
+#: pwconv.8.xml:90(para)
 msgid ""
 "The <command>grpunconv</command> command creates <emphasis remap=\"I"
 "\">group</emphasis> from <emphasis remap=\"I\">group</emphasis> and "
@@ -3089,7 +3501,7 @@
 "und <emphasis remap=\"I\">gshadow</emphasis>-Datei und entfernt anschließend "
 "die <emphasis remap=\"I\">gshadow</emphasis>-Datei."
 
-#: pwconv.8.xml:67(para)
+#: pwconv.8.xml:97(para)
 msgid ""
 "These four programs all operate on the normal and shadow password and group "
 "files: <filename>/etc/passwd</filename>, <filename>/etc/group</filename>, "
@@ -3100,7 +3512,7 @@
 "<filename>/etc/group</filename>, <filename>/etc/shadow</filename> und "
 "<filename>/etc/gshadow</filename>."
 
-#: pwconv.8.xml:74(para)
+#: pwconv.8.xml:104(para)
 msgid ""
 "Each program acquires the necessary locks before conversion. "
 "<command>pwconv</command> and <command>grpconv</command> are similar. First, "
@@ -3121,7 +3533,7 @@
 "Shadow-Datei zu aktualisieren, falls die Hauptdatei von Hand bearbeitet "
 "wurde."
 
-#: pwconv.8.xml:85(para)
+#: pwconv.8.xml:115(para)
 msgid ""
 "<command>pwconv</command> will use the values of <emphasis remap=\"I"
 "\">PASS_MIN_DAYS</emphasis>, <emphasis remap=\"I\">PASS_MAX_DAYS</emphasis>, "
@@ -3134,7 +3546,7 @@
 "defs</filename>, wenn neue Einträge <filename>/etc/shadow</filename> "
 "hinzugefügt werden."
 
-#: pwconv.8.xml:94(para)
+#: pwconv.8.xml:124(para)
 msgid ""
 "Likewise <command>pwunconv</command> and <command>grpunconv</command> are "
 "similar. Passwords in the main file are updated from the shadowed file. "
@@ -3151,7 +3563,7 @@
 "Passwörtern geht durch <command>pwunconv</command> verloren. Es wird aber so "
 "viel wie möglich umgewandelt."
 
-#: pwconv.8.xml:106(para)
+#: pwconv.8.xml:136(para)
 msgid ""
 "Errors in the password or group files (such as invalid or duplicate entries) "
 "may cause these programs to loop forever or fail in other strange ways. "
@@ -3164,20 +3576,20 @@
 "ausführen, um solche Fehler zu entfernen, bevor Sie von oder zu Shadow-"
 "Passwörtern oder -gruppen umwandeln."
 
-#: pwconv.8.xml:117(para)
+#: pwconv.8.xml:147(para)
 msgid ""
 "The following configuration variable in <filename>/etc/login.defs</filename> "
 "changes the behavior of <command>grpconv</command> and <command>grpunconv</"
 "command>:"
 msgstr ""
 
-#: pwconv.8.xml:125(para)
+#: pwconv.8.xml:155(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of <command>pwconv</command>:"
 msgstr ""
 
-#: pwconv.8.xml:151(para)
+#: pwconv.8.xml:181(para)
 msgid ""
 "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -3191,37 +3603,37 @@
 "<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>."
 
-#: pwck.8.xml:11(refentrytitle) pwck.8.xml:16(refname) pwck.8.xml:22(command)
-#: pwck.8.xml:37(command) login.defs.5.xml:348(term)
+#: pwck.8.xml:40(refentrytitle) pwck.8.xml:45(refname) pwck.8.xml:51(command)
+#: pwck.8.xml:66(command) login.defs.5.xml:380(term)
 msgid "pwck"
 msgstr "pwck"
 
-#: pwck.8.xml:17(refpurpose)
+#: pwck.8.xml:46(refpurpose)
 msgid "verify integrity of password files"
 msgstr "überprüft die Stimmigkeit der Passwortdateien"
 
-#: pwck.8.xml:23(arg) pwck.8.xml:38(arg) pwck.8.xml:111(option)
+#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:140(option)
 msgid "-q"
 msgstr "-q"
 
-#: pwck.8.xml:24(arg) pwck.8.xml:132(option) grpck.8.xml:29(arg)
-#: grpck.8.xml:101(option)
+#: pwck.8.xml:53(arg) pwck.8.xml:161(option) grpck.8.xml:58(arg)
+#: grpck.8.xml:130(option)
 msgid "-s"
 msgstr "-s"
 
-#: pwck.8.xml:27(replaceable) pwck.8.xml:42(replaceable)
-#: passwd.5.xml:5(refentrytitle) passwd.5.xml:10(refname)
-#: passwd.1.xml:15(refentrytitle) passwd.1.xml:20(refname)
-#: passwd.1.xml:26(command) login.defs.5.xml:337(term)
+#: pwck.8.xml:56(replaceable) pwck.8.xml:71(replaceable)
+#: passwd.5.xml:34(refentrytitle) passwd.5.xml:39(refname)
+#: passwd.1.xml:44(refentrytitle) passwd.1.xml:49(refname)
+#: passwd.1.xml:55(command) login.defs.5.xml:369(term)
 msgid "passwd"
 msgstr "passwd"
 
-#: pwck.8.xml:39(arg) pwck.8.xml:122(option) login.1.xml:186(option)
-#: grpck.8.xml:20(arg) grpck.8.xml:91(option) gpasswd.1.xml:120(option)
+#: pwck.8.xml:68(arg) pwck.8.xml:151(option) login.1.xml:222(option)
+#: grpck.8.xml:49(arg) grpck.8.xml:120(option)
 msgid "-r"
 msgstr "-r"
 
-#: pwck.8.xml:53(para)
+#: pwck.8.xml:82(para)
 msgid ""
 "The <command>pwck</command> command verifies the integrity of the system "
 "authentication information. All entries in the <filename>/etc/passwd</"
@@ -3237,35 +3649,35 @@
 "Der Benutzer wird aufgefordert, Einträge zu löschen, die falsch formatiert "
 "sind oder andere unbehebbare Fehler enthalten."
 
-#: pwck.8.xml:62(para) grpck.8.xml:51(para)
+#: pwck.8.xml:91(para) grpck.8.xml:80(para)
 msgid "Checks are made to verify that each entry has:"
 msgstr "Es wird überprüft, ob jeder Eintrag folgende Eigenschaften aufweist:"
 
-#: pwck.8.xml:65(para) grpck.8.xml:55(para)
+#: pwck.8.xml:94(para) grpck.8.xml:84(para)
 msgid "the correct number of fields"
 msgstr "die richtige Anzahl von Feldern"
 
-#: pwck.8.xml:68(para)
+#: pwck.8.xml:97(para)
 msgid "a unique user name"
 msgstr "einen eindeutigen Benutzernamen"
 
-#: pwck.8.xml:71(para)
+#: pwck.8.xml:100(para)
 msgid "a valid user and group identifier"
 msgstr "eine gültige Benutzer- und Gruppenkennung"
 
-#: pwck.8.xml:74(para)
+#: pwck.8.xml:103(para)
 msgid "a valid primary group"
 msgstr "eine gültige Hauptgruppe"
 
-#: pwck.8.xml:77(para)
+#: pwck.8.xml:106(para)
 msgid "a valid home directory"
 msgstr "ein gültiges Home-Verzeichnis"
 
-#: pwck.8.xml:80(para)
+#: pwck.8.xml:109(para)
 msgid "a valid login shell"
 msgstr "eine gültige Login-Shell"
 
-#: pwck.8.xml:84(para)
+#: pwck.8.xml:113(para)
 msgid ""
 "The checks for correct number of fields and unique user name are fatal. If "
 "the entry has the wrong number of fields, the user will be prompted to "
@@ -3285,7 +3697,7 @@
 "Fehlern wird eine Warnung abgegeben und der Benutzer aufgefordert, den "
 "Fehler mittels des Befehls <command>usermod</command> zu beheben."
 
-#: pwck.8.xml:95(para)
+#: pwck.8.xml:124(para)
 msgid ""
 "The commands which operate on the <filename>/etc/passwd</filename> file are "
 "not able to alter corrupted or duplicated entries. <command>pwck</command> "
@@ -3296,13 +3708,13 @@
 "sollte <command>pwck</command> verwendet werden, um den betreffenden Eintrag "
 "zu entfernen."
 
-#: pwck.8.xml:105(para)
+#: pwck.8.xml:134(para)
 msgid "The options which apply to the <command>pwck</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>pwck</command> unterstützt werden, "
 "sind:"
 
-#: pwck.8.xml:114(para)
+#: pwck.8.xml:143(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
@@ -3310,11 +3722,11 @@
 "Meldet nur Fehler. Warnung, die keine Handlung des Benutzers erfordern, "
 "werden nicht angezeigt."
 
-#: pwck.8.xml:125(para)
+#: pwck.8.xml:154(para)
 msgid "Execute the <command>pwck</command> command in read-only mode."
 msgstr "Führt den Befehl <command>pwck</command> im Modus Nur-Lesen aus."
 
-#: pwck.8.xml:135(para)
+#: pwck.8.xml:164(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
@@ -3322,7 +3734,7 @@
 "Ordnet die Einträge in <filename>/etc/passwd</filename> und <filename>/etc/"
 "shadow</filename> nach der UID."
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:172(para)
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename>. The user may select "
@@ -3334,39 +3746,59 @@
 "kann andere Dateien mit den Parametern <emphasis remap=\"I\">passwd</"
 "emphasis> und <emphasis remap=\"I\">shadow</emphasis> auswählen."
 
-#: pwck.8.xml:192(para)
+#: pwck.8.xml:221(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>group</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"citerefentry>, <citerefentry><refentrytitle>grpck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>usermod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>usermod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"citerefentry>."
 
-#: pwck.8.xml:227(para)
+#: pwck.8.xml:260(para)
 msgid "one or more bad password entries"
 msgstr "ein oder mehrere fehlerhafte Passworteinträge"
 
-#: pwck.8.xml:233(para)
+#: pwck.8.xml:266(para)
 msgid "can't open password files"
 msgstr "kann die Passwortdatei nicht öffnen"
 
-#: pwck.8.xml:239(para)
+#: pwck.8.xml:272(para)
 msgid "can't lock password files"
 msgstr "kann die Passwortdatei nicht sperren"
 
-#: pwck.8.xml:245(para)
+#: pwck.8.xml:278(para)
 msgid "can't update password files"
 msgstr "kann die Passwortdatei nicht aktualisieren"
 
-#: pwck.8.xml:209(para)
+#: pwck.8.xml:284(para)
+#, fuzzy
+#| msgid "can't open password files"
+msgid "can't sort password files"
+msgstr "kann die Passwortdatei nicht öffnen"
+
+#: pwck.8.xml:242(para)
 msgid ""
 "The <command>pwck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -3374,16 +3806,16 @@
 "Der Befehl <command>pwck</command> gibt beim Beenden folgende Werte zurück: "
 "<placeholder-1/>"
 
-#: porttime.5.xml:5(refentrytitle) porttime.5.xml:10(refname)
+#: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
 msgid "porttime"
 msgstr "porttime"
 
 # SB: Übersetzung?
-#: porttime.5.xml:11(refpurpose)
+#: porttime.5.xml:40(refpurpose)
 msgid "port access time file"
 msgstr "Datei für zeitlich begrenzten Zugang zu Ports"
 
-#: porttime.5.xml:16(para)
+#: porttime.5.xml:45(para)
 msgid ""
 "<emphasis remap=\"I\">porttime</emphasis> contains a list of tty devices, "
 "user names, and permitted login times."
@@ -3391,7 +3823,7 @@
 "<emphasis remap=\"I\">porttime</emphasis> enthält eine Liste von tty-"
 "Geräten, Benutzernamen und zulässigen Login-Zeiten."
 
-#: porttime.5.xml:21(para)
+#: porttime.5.xml:50(para)
 msgid ""
 "Each entry consists of three colon separated fields. The first field is a "
 "comma separated list of tty devices, or an asterisk to indicate that all tty "
@@ -3408,7 +3840,7 @@
 "Eintrag auf alle Benutzernamen zutrifft. Das dritte Feld ist eine Liste von "
 "Login-Zeiten, die durch Kommata getrennt sind."
 
-#: porttime.5.xml:30(para)
+#: porttime.5.xml:59(para)
 msgid ""
 "Each access time entry consists of zero or more days of the week, "
 "abbreviated <emphasis>Su</emphasis>, <emphasis>Mo</emphasis>, <emphasis>Tu</"
@@ -3427,11 +3859,11 @@
 "<emphasis>Al</emphasis> wird jeder Tag gewählt. Falls keine Tage angegeben "
 "werden, wird <emphasis>Al</emphasis> angenommen."
 
-#: porttime.5.xml:44(title)
+#: porttime.5.xml:73(title)
 msgid "EXAMPLES"
 msgstr "BEISPIELE"
 
-#: porttime.5.xml:45(para)
+#: porttime.5.xml:74(para)
 msgid ""
 "The following entry allows access to user <emphasis remap=\"B\">jfh</"
 "emphasis> on every port during weekdays from 9am to 5pm."
@@ -3439,11 +3871,11 @@
 "Der folgende Eintrag erlaubt dem Benutzer <emphasis remap=\"B\">jfh</"
 "emphasis> Zugriff auf jeden Port während Werktagen von 9 bis 17 Uhr."
 
-#: porttime.5.xml:51(para)
+#: porttime.5.xml:80(para)
 msgid "*:jfh:Wk0900-1700"
 msgstr "*:jfh:Wk0900-1700"
 
-#: porttime.5.xml:53(para)
+#: porttime.5.xml:82(para)
 msgid ""
 "The following entries allow access only to the users <emphasis>root</"
 "emphasis> and <emphasis>oper</emphasis> on <filename>/dev/console</filename> "
@@ -3457,7 +3889,7 @@
 "filename> eine geordnete Liste der Zugriffszeiten ist. Jeder andere Benutzer "
 "fällt unter den zweiten Eintrag, welcher Zugriff zu keiner Zeit erlaubt."
 
-#: porttime.5.xml:62(programlisting)
+#: porttime.5.xml:91(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3470,7 +3902,7 @@
 "      console:*:\n"
 "    "
 
-#: porttime.5.xml:67(para)
+#: porttime.5.xml:96(para)
 msgid ""
 "The following entry allows access for the user <emphasis>games</emphasis> on "
 "any port during non-working hours."
@@ -3478,19 +3910,19 @@
 "Der folgende Eintrag erlaubt dem Benutzer <emphasis>games</emphasis> Zugriff "
 "auf jeden Port außerhalb von Arbeitszeiten."
 
-#: porttime.5.xml:72(para)
+#: porttime.5.xml:101(para)
 msgid "*:games:Wk1700-0900,SaSu0000-2400"
 msgstr "*:games:Wk1700-0900,SaSu0000-2400"
 
-#: porttime.5.xml:79(filename) logoutd.8.xml:38(filename)
+#: porttime.5.xml:108(filename) logoutd.8.xml:67(filename)
 msgid "/etc/porttime"
 msgstr "/etc/porttime"
 
-#: porttime.5.xml:81(para) logoutd.8.xml:40(para)
+#: porttime.5.xml:110(para) logoutd.8.xml:69(para)
 msgid "File containing port access."
 msgstr "Datei, die den Port-Zugriff enthält."
 
-#: porttime.5.xml:89(para) login.access.5.xml:79(para)
+#: porttime.5.xml:118(para) login.access.5.xml:109(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -3498,11 +3930,11 @@
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: passwd.5.xml:11(refpurpose)
+#: passwd.5.xml:40(refpurpose)
 msgid "the password file"
 msgstr "die Passwortdatei"
 
-#: passwd.5.xml:16(para)
+#: passwd.5.xml:45(para)
 msgid ""
 "<filename>/etc/passwd</filename> contains one line for each user account, "
 "with seven fields delimited by colons (<quote>:</quote>). These fields are:"
@@ -3511,32 +3943,32 @@
 "wobei jeder Eintrag sieben Felder besitzt, die durch Doppelpunkt (<quote>:</"
 "quote>) getrennt sind. Diese Felder sind:"
 
-#: passwd.5.xml:27(para)
+#: passwd.5.xml:56(para)
 msgid "optional encrypted password"
 msgstr "optional verschlüsseltes Passwort"
 
-#: passwd.5.xml:30(para)
+#: passwd.5.xml:59(para)
 msgid "numerical user ID"
 msgstr "numerische Benutzer-ID"
 
-#: passwd.5.xml:33(para)
+#: passwd.5.xml:62(para)
 msgid "numerical group ID"
 msgstr "numerische Gruppen-ID"
 
-#: passwd.5.xml:36(para)
+#: passwd.5.xml:65(para)
 msgid "user name or comment field"
 msgstr "Benutzername oder Kommentarfeld"
 
-#: passwd.5.xml:39(para)
+#: passwd.5.xml:68(para)
 msgid "user home directory"
 msgstr "Home-Verzeichnis des Benutzers"
 
 # SB: Übersetzung von "command interpreter"?
-#: passwd.5.xml:42(para)
+#: passwd.5.xml:71(para)
 msgid "optional user command interpreter"
 msgstr "optional Befehlsinterpreter des Benutzers"
 
-#: passwd.5.xml:46(para)
+#: passwd.5.xml:75(para)
 msgid ""
 "The encrypted password field may be blank, in which case no password is "
 "required to authenticate as the specified login name. However, some "
@@ -3568,7 +4000,7 @@
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>."
 
-#: passwd.5.xml:65(para)
+#: passwd.5.xml:94(para)
 msgid ""
 "The comment field is used by various system utilities, such as "
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
@@ -3578,7 +4010,7 @@
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> ausgewertet."
 
-#: passwd.5.xml:71(para)
+#: passwd.5.xml:100(para)
 msgid ""
 "The home directory field provides the name of the initial working directory. "
 "The <command>login</command> program uses this information to set the value "
@@ -3590,7 +4022,7 @@
 "setzen."
 
 # SB: Übersetzung von "command language interpreter"?
-#: passwd.5.xml:77(para)
+#: passwd.5.xml:106(para)
 msgid ""
 "The command interpreter field provides the name of the user's command "
 "language interpreter, or the name of the initial program to execute. The "
@@ -3605,57 +4037,78 @@
 "setzen. Falls dieses Feld leer ist, wird ihm standardmäßig der Wert "
 "<filename>/bin/sh</filename> zugewiesen."
 
-#: passwd.5.xml:98(para)
+#: passwd.5.xml:127(para)
 msgid "optional encrypted password file"
 msgstr "optionale Datei für verschlüsseltes Passwort"
 
-#: passwd.5.xml:106(para)
+#: passwd.5.xml:135(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
+#| "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>login</"
+"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>getent</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
-"refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"citerefentry>, <citerefentry><refentrytitle>pwck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>pwconv</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>pwunconv</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>login</"
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
+"citerefentry>, <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwconv</refentrytitle><manvolnum>8</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>pwunconv</"
+"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
+"<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
 # SB: Couldn't update translation for passwd.1 yet, since shadow cvs is down.
-#: passwd.1.xml:21(refpurpose)
+#: passwd.1.xml:50(refpurpose)
 msgid "change user password"
 msgstr "ändert das Passwort eines Benutzers"
 
-#: passwd.1.xml:38(para)
+#: passwd.1.xml:67(para)
 #, fuzzy
 msgid ""
 "The <command>passwd</command> command changes passwords for user accounts. A "
 "normal user may only change the password for his/her own account, while the "
 "superuser may change the password for any account. <command>passwd</command> "
-"also changes account information, such as the full name of the user, the "
-"user's login shell, or his/her password expiry date and interval."
+"also changes the account or associated password validity period."
 msgstr ""
 "<command>passwd</command> ändert die Passwörter von Benutzerkonten. Ein "
 "normaler Benutzer kann nur das Passwort seines Kontos verändern, der "
@@ -3664,11 +4117,11 @@
 "der vollständige Name des Benutzers, seine Login-Shell und Verfallsdatum und "
 "-intervall des Passworts verändert werden."
 
-#: passwd.1.xml:48(title)
+#: passwd.1.xml:76(title)
 msgid "Password Changes"
 msgstr "Verändern des Passworts"
 
-#: passwd.1.xml:49(para)
+#: passwd.1.xml:77(para)
 #, fuzzy
 msgid ""
 "The user is first prompted for his/her old password, if one is present. This "
@@ -3682,7 +4135,7 @@
 "das richtige Passwort einzugeben. Der Superuser kann diesen Schritt "
 "überspringen, so dass vergessene Passwörter geändert werden können."
 
-#: passwd.1.xml:57(para)
+#: passwd.1.xml:85(para)
 msgid ""
 "After the password has been entered, password aging information is checked "
 "to see if the user is permitted to change the password at this time. If not, "
@@ -3693,7 +4146,7 @@
 "das Passwort zu dieser Zeit verändern darf. Wenn nicht, lehnt "
 "<command>passwd</command> die Änderung des Passworts ab und beendet sich."
 
-#: passwd.1.xml:64(para)
+#: passwd.1.xml:92(para)
 msgid ""
 "The user is then prompted twice for a replacement password. The second entry "
 "is compared against the first and both are required to match in order for "
@@ -3703,7 +4156,7 @@
 "Beide Eingaben werden miteinander verglichen. Sie müssen übereinstimmen, "
 "damit das Passwort geändert wird."
 
-#: passwd.1.xml:70(para)
+#: passwd.1.xml:98(para)
 msgid ""
 "Then, the password is tested for complexity. As a general guideline, "
 "passwords should consist of 6 to 8 characters including one or more "
@@ -3714,19 +4167,19 @@
 "bestehen sollten und ein oder mehrere Zeichen aus folgenden Mengen enthalten "
 "sollten:"
 
-#: passwd.1.xml:78(para)
+#: passwd.1.xml:106(para)
 msgid "lower case alphabetics"
 msgstr "Kleinbuchstaben"
 
-#: passwd.1.xml:81(para)
+#: passwd.1.xml:109(para)
 msgid "digits 0 thru 9"
 msgstr "Ziffern 0 bis 9"
 
-#: passwd.1.xml:84(para)
+#: passwd.1.xml:112(para)
 msgid "punctuation marks"
 msgstr "Satzzeichen"
 
-#: passwd.1.xml:88(para)
+#: passwd.1.xml:116(para)
 msgid ""
 "Care must be taken not to include the system default erase or kill "
 "characters. <command>passwd</command> will reject any password which is not "
@@ -3736,11 +4189,11 @@
 "Zeichen des Systems eingeben. <command>passwd</command> weist Passwörter "
 "zurück, die nicht hinreichend komplex sind."
 
-#: passwd.1.xml:97(title)
+#: passwd.1.xml:125(title)
 msgid "Hints for user passwords"
 msgstr "Hinweise zu Benutzerpasswörtern"
 
-#: passwd.1.xml:98(para)
+#: passwd.1.xml:126(para)
 msgid ""
 "The security of a password depends upon the strength of the encryption "
 "algorithm and the size of the key space. The <emphasis>UNIX</emphasis> "
@@ -3754,7 +4207,7 @@
 "DES-Algorithmus und ist sehr sicher. Die Größe des Schlüsselraums hängt von "
 "der Zufälligkeit des gewählten Passworts ab."
 
-#: passwd.1.xml:106(para)
+#: passwd.1.xml:134(para)
 msgid ""
 "Compromises in password security normally result from careless password "
 "selection or handling. For this reason, you should not select a password "
@@ -3769,23 +4222,23 @@
 "Ihre Adresse sein. All das kann dazu verwendet werden, das Passwort zu "
 "erraten, und stellt daher eine Gefahr für die Sicherheit Ihres Systems dar."
 
-#: passwd.1.xml:115(para)
+#: passwd.1.xml:143(para)
 msgid ""
 "You can find advices on how to choose a strong password on http://en."
 "wikipedia.org/wiki/Password_strength"
 msgstr ""
 
-#: passwd.1.xml:124(para)
+#: passwd.1.xml:152(para)
 msgid "The options which apply to the <command>passwd</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>passwd</command> unterstützt werden, "
 "sind:"
 
-#: passwd.1.xml:129(term) faillog.8.xml:42(term)
+#: passwd.1.xml:157(term) faillog.8.xml:71(term)
 msgid "<option>-a</option>, <option>--all</option>"
 msgstr "<option>-a</option>, <option>--all</option>"
 
-#: passwd.1.xml:133(para)
+#: passwd.1.xml:161(para)
 msgid ""
 "This option can be used only with <option>-S</option> and causes show status "
 "for all users."
@@ -3793,11 +4246,11 @@
 "Diese Option kann nur in Verbindung mit <option>-S</option> verwendet werden "
 "und führt dazu, dass der Status aller Benutzer angezeigt wird."
 
-#: passwd.1.xml:140(term)
+#: passwd.1.xml:168(term)
 msgid "<option>-d</option>, <option>--delete</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
-#: passwd.1.xml:144(para)
+#: passwd.1.xml:172(para)
 msgid ""
 "Delete a user's password (make it empty). This is a quick way to disable a "
 "password for an account. It will set the named account passwordless."
@@ -3806,11 +4259,11 @@
 "Weg, um das Passwort eines Kontos zu deaktivieren. Dem Konto ist dann kein "
 "Passwort zugeordnet."
 
-#: passwd.1.xml:152(term)
+#: passwd.1.xml:180(term)
 msgid "<option>-e</option>, <option>--expire</option>"
 msgstr "<option>-e</option>, <option>--expire</option>"
 
-#: passwd.1.xml:156(para)
+#: passwd.1.xml:184(para)
 msgid ""
 "Immediately expire an account's password. This in effect can force a user to "
 "change his/her password at the user's next login."
@@ -3819,7 +4272,7 @@
 "erreicht werden, dass ein Benutzer beim nächsten Login das Passwort ändern "
 "muss."
 
-#: passwd.1.xml:169(term)
+#: passwd.1.xml:197(term)
 msgid ""
 "<option>-i</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -3827,7 +4280,7 @@
 "<option>-i</option>, <option>--inactive</option><replaceable>INAKTIV</"
 "replaceable>"
 
-#: passwd.1.xml:173(para)
+#: passwd.1.xml:201(para)
 msgid ""
 "This option is used to disable an account after the password has been "
 "expired for a number of days. After a user account has had an expired "
@@ -3839,12 +4292,12 @@
 "abgelaufenes Passwort für länger als <replaceable>INAKTIV</replaceable> Tage "
 "hatte, kann sich der Benutzer nicht mehr auf diesem Konto anmelden."
 
-#: passwd.1.xml:182(term)
+#: passwd.1.xml:210(term)
 msgid "<option>-k</option>, <option>--keep-tokens</option>"
 msgstr "<option>-k</option>, <option>--keep-tokens</option>"
 
 # FIXME: Übersetzung, die näher am Original ist (tokens). sb
-#: passwd.1.xml:186(para)
+#: passwd.1.xml:214(para)
 #, fuzzy
 msgid ""
 "Indicate password change should be performed only for expired authentication "
@@ -3855,30 +4308,42 @@
 "durchgeführt werden soll. Der Benutzer möchte seine gültigen Passwörter "
 "behalten."
 
-#: passwd.1.xml:194(term)
+#: passwd.1.xml:222(term)
 msgid "<option>-l</option>, <option>--lock</option>"
 msgstr "<option>-l</option>, <option>--lock</option>"
 
-#: passwd.1.xml:198(para)
+#: passwd.1.xml:226(para)
 #, fuzzy
 msgid ""
-"Lock the named account. This option disables an account by changing the "
-"password to a value which matches no possible encrypted value, and by "
-"setting the account expiry field to 1."
+"Lock the password of the named account. This option disables a password by "
+"changing it to a value which matches no possible encrypted value (it adds a "
+"´!´ at the beginning of the password)."
 msgstr ""
 "Sperrt das bezeichnete Konto. Die Option schaltet ein Konto ab, indem es ein "
 "Passwort zuweist, das mit keinem möglichen verschlüsselten Wert "
 "übereinstimmen kann."
 
-#: passwd.1.xml:206(term) chage.1.xml:109(term)
+#: passwd.1.xml:232(para)
 msgid ""
+"Note that this does not disable the account. The user may still be able to "
+"login using another authentication token (e.g. an SSH key). To disable the "
+"account, administrators should use <command>usermod --expiredate 1</command> "
+"(this set the account's expire date to Jan 2, 1970)."
+msgstr ""
+
+#: passwd.1.xml:239(para)
+msgid "Users with a locked password are not allowed to change their password."
+msgstr ""
+
+#: passwd.1.xml:246(term) chage.1.xml:138(term)
+msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_TAGE</"
 "replaceable>"
 
-#: passwd.1.xml:210(para) chage.1.xml:113(para)
+#: passwd.1.xml:250(para) chage.1.xml:142(para)
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
@@ -3889,7 +4354,7 @@
 "von Null in diesem Feld bedeutet, dass der Benutzer sein Passwort jederzeit "
 "ändern darf."
 
-#: passwd.1.xml:228(term)
+#: passwd.1.xml:268(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
@@ -3897,23 +4362,33 @@
 "<option>-r</option>, <option>--repository</"
 "option><replaceable>PASSWORTDEPOT</replaceable>"
 
-#: passwd.1.xml:232(para)
+#: passwd.1.xml:272(para)
 #, fuzzy
 msgid "change password in <replaceable>REPOSITORY</replaceable> repository"
 msgstr "Ändert das Passwort im Depot <replaceable>PASSWORTDEPOT</replaceable>."
 
-#: passwd.1.xml:238(term)
+#: passwd.1.xml:278(term)
 msgid "<option>-S</option>, <option>--status</option>"
 msgstr "<option>-S</option>, <option>--status</option>"
 
-#: passwd.1.xml:242(para)
+#: passwd.1.xml:282(para)
+#, fuzzy
+#| msgid ""
+#| "Display account status information. The status information consists of 7 "
+#| "fields. The first field is the user's login name. The second field "
+#| "indicates if the user account is locked (L), has no password (NP), or has "
+#| "a usable password (P). The third field gives the date of the last "
+#| "password change. The next four fields are the minimum age, maximum age, "
+#| "warning period, and inactivity period for the password. These ages are "
+#| "expressed in days."
 msgid ""
 "Display account status information. The status information consists of 7 "
 "fields. The first field is the user's login name. The second field indicates "
-"if the user account is locked (L), has no password (NP), or has a usable "
-"password (P). The third field gives the date of the last password change. "
-"The next four fields are the minimum age, maximum age, warning period, and "
-"inactivity period for the password. These ages are expressed in days."
+"if the user account has a locked password (L), has no password (NP), or has "
+"a usable password (P). The third field gives the date of the last password "
+"change. The next four fields are the minimum age, maximum age, warning "
+"period, and inactivity period for the password. These ages are expressed in "
+"days."
 msgstr ""
 "Zeigt Informationen über den Kontostatus an. Die Statusinformation besteht "
 "aus sieben Feldern. Das erste Feld ist der Login-Name des Benutzers. Das "
@@ -3923,22 +4398,23 @@
 "das Mindestalter, das Höchstalter, die Dauer der Warnung und die Dauer der "
 "Untätigkeit für das Passwort. Die Zeiträume werden in Tagen ausgedrückt."
 
-#: passwd.1.xml:255(term)
+#: passwd.1.xml:296(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
 msgstr "<option>-u</option>, <option>--unlock</option>"
 
-#: passwd.1.xml:259(para)
+#: passwd.1.xml:300(para)
 #, fuzzy
 msgid ""
-"Unlock the named account. This option re-enables an account by changing the "
-"password back to its previous value (to value before using <option>-l</"
-"option> option), and by resetting the account expiry field."
+"Unlock the password of the named account. This option re-enables a password "
+"by changing the password back to its previous value (to the value before "
+"using the <option>-l</option> option), and by resetting the account expiry "
+"field."
 msgstr ""
 "Entsperrt das bezeichnete Konto. Diese Option reaktiviert ein Konto wieder, "
 "indem das Passwort auf seinen alten Wert, den es hatte, bevor die Option "
 "<option>-l</option> verwendet wurde, zurückgesetzt wird."
 
-#: passwd.1.xml:268(term)
+#: passwd.1.xml:310(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -3946,7 +4422,7 @@
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_TAGE</"
 "replaceable>"
 
-#: passwd.1.xml:272(para)
+#: passwd.1.xml:314(para)
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
@@ -3958,7 +4434,7 @@
 "replaceable> bezeichnet die Anzahl der Tage, für die ein Benutzer vor "
 "Verfall seines Passworts gewarnt wird."
 
-#: passwd.1.xml:281(term)
+#: passwd.1.xml:323(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -3966,7 +4442,7 @@
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_TAGE</"
 "replaceable>"
 
-#: passwd.1.xml:285(para)
+#: passwd.1.xml:327(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
@@ -3974,7 +4450,7 @@
 "Bestimmt die maximale Anzahl von Tagen, die das Passwort gültig bleibt. Nach "
 "<replaceable>MAX_TAGE</replaceable> Tagen muss das Passwort geändert werden."
 
-#: passwd.1.xml:297(para)
+#: passwd.1.xml:339(para)
 msgid ""
 "Not all options may be supported. Password complexity checking may vary from "
 "site to site. The user is urged to select a password as complex as he or she "
@@ -3988,68 +4464,68 @@
 "ändern, wenn auf dem System NIS aktiviert ist, sie aber nicht am NIS-Server "
 "angemeldet sind."
 
-#: passwd.1.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: gpasswd.1.xml:2(term) chpasswd.8.xml:2(term) chgpasswd.8.xml:2(term)
+#: passwd.1.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: gpasswd.1.xml:30(term) chpasswd.8.xml:30(term) chgpasswd.8.xml:30(term)
 msgid "<option>ENCRYPT_METHOD</option> (string)"
 msgstr ""
 
-#: passwd.1.xml:4(para) newusers.8.xml:4(para) login.defs.5.xml:4(para)
-#: gpasswd.1.xml:4(para) chpasswd.8.xml:4(para) chgpasswd.8.xml:4(para)
+#: passwd.1.xml:32(para) newusers.8.xml:32(para) login.defs.5.xml:32(para)
+#: gpasswd.1.xml:32(para) chpasswd.8.xml:32(para) chgpasswd.8.xml:32(para)
 msgid ""
 "This defines the system default encryption algorithm for encrypting "
 "passwords (if no algorithm are specified on the command line)."
 msgstr ""
 
-#: passwd.1.xml:12(para) newusers.8.xml:12(para) login.defs.5.xml:12(para)
-#: gpasswd.1.xml:12(para) chpasswd.8.xml:12(para) chgpasswd.8.xml:12(para)
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
 msgid "<replaceable>DES</replaceable> (default)"
 msgstr ""
 
-#: passwd.1.xml:15(replaceable) newusers.8.xml:15(replaceable)
-#: login.defs.5.xml:15(replaceable) gpasswd.1.xml:15(replaceable)
-#: chpasswd.8.xml:15(replaceable) chgpasswd.8.xml:15(replaceable)
+#: passwd.1.xml:43(replaceable) newusers.8.xml:43(replaceable)
+#: login.defs.5.xml:43(replaceable) gpasswd.1.xml:43(replaceable)
+#: chpasswd.8.xml:43(replaceable) chgpasswd.8.xml:43(replaceable)
 msgid "MD5"
 msgstr ""
 
-#: passwd.1.xml:18(replaceable) newusers.8.xml:18(replaceable)
-#: login.defs.5.xml:18(replaceable) gpasswd.1.xml:18(replaceable)
-#: chpasswd.8.xml:18(replaceable) chgpasswd.8.xml:18(replaceable)
+#: passwd.1.xml:46(replaceable) newusers.8.xml:46(replaceable)
+#: login.defs.5.xml:46(replaceable) gpasswd.1.xml:46(replaceable)
+#: chpasswd.8.xml:46(replaceable) chgpasswd.8.xml:46(replaceable)
 msgid "SHA256"
 msgstr ""
 
-#: passwd.1.xml:21(replaceable) newusers.8.xml:21(replaceable)
-#: login.defs.5.xml:21(replaceable) gpasswd.1.xml:21(replaceable)
-#: chpasswd.8.xml:21(replaceable) chgpasswd.8.xml:21(replaceable)
+#: passwd.1.xml:49(replaceable) newusers.8.xml:49(replaceable)
+#: login.defs.5.xml:49(replaceable) gpasswd.1.xml:49(replaceable)
+#: chpasswd.8.xml:49(replaceable) chgpasswd.8.xml:49(replaceable)
 msgid "SHA512"
 msgstr ""
 
-#: passwd.1.xml:8(para) newusers.8.xml:8(para) login.defs.5.xml:8(para)
-#: gpasswd.1.xml:8(para) chpasswd.8.xml:8(para) chgpasswd.8.xml:8(para)
+#: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
+#: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
 msgid "It can take one of these values: <placeholder-1/>"
 msgstr ""
 
-#: passwd.1.xml:25(para) newusers.8.xml:25(para) login.defs.5.xml:25(para)
-#: gpasswd.1.xml:25(para) chpasswd.8.xml:25(para) chgpasswd.8.xml:25(para)
+#: passwd.1.xml:53(para) newusers.8.xml:53(para) login.defs.5.xml:53(para)
+#: gpasswd.1.xml:53(para) chpasswd.8.xml:53(para) chgpasswd.8.xml:53(para)
 msgid ""
 "Note: this parameter overrides the <option>MD5_CRYPT_ENAB</option> variable."
 msgstr ""
 
-#: passwd.1.xml:29(para) passwd.1.xml:23(para) newusers.8.xml:29(para)
-#: newusers.8.xml:23(para) login.defs.5.xml:29(para) login.defs.5.xml:23(para)
-#: gpasswd.1.xml:29(para) gpasswd.1.xml:23(para) chpasswd.8.xml:29(para)
-#: chpasswd.8.xml:23(para) chgpasswd.8.xml:29(para) chgpasswd.8.xml:23(para)
+#: passwd.1.xml:57(para) passwd.1.xml:53(para) newusers.8.xml:57(para)
+#: newusers.8.xml:53(para) login.defs.5.xml:57(para) login.defs.5.xml:53(para)
+#: gpasswd.1.xml:57(para) gpasswd.1.xml:53(para) chpasswd.8.xml:57(para)
+#: chpasswd.8.xml:53(para) chgpasswd.8.xml:57(para) chgpasswd.8.xml:53(para)
 msgid ""
 "Note: if you use PAM, it is recommended to set this variable consistently "
 "with the PAM modules configuration."
 msgstr ""
 
-#: passwd.1.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: gpasswd.1.xml:2(term) chpasswd.8.xml:2(term) chgpasswd.8.xml:2(term)
+#: passwd.1.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: gpasswd.1.xml:32(term) chpasswd.8.xml:32(term) chgpasswd.8.xml:32(term)
 msgid "<option>MD5_CRYPT_ENAB</option> (boolean)"
 msgstr ""
 
-#: passwd.1.xml:4(para) newusers.8.xml:4(para) login.defs.5.xml:4(para)
-#: gpasswd.1.xml:4(para) chpasswd.8.xml:4(para) chgpasswd.8.xml:4(para)
+#: passwd.1.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
+#: gpasswd.1.xml:34(para) chpasswd.8.xml:34(para) chgpasswd.8.xml:34(para)
 msgid ""
 "Indicate if passwords must be encrypted using the MD5-based algorithm. If "
 "set to <replaceable>yes</replaceable>, new passwords will be encrypted using "
@@ -4060,57 +4536,57 @@
 "<replaceable>no</replaceable>."
 msgstr ""
 
-#: passwd.1.xml:14(para) newusers.8.xml:14(para) login.defs.5.xml:14(para)
-#: gpasswd.1.xml:14(para) chpasswd.8.xml:14(para) chgpasswd.8.xml:14(para)
+#: passwd.1.xml:44(para) newusers.8.xml:44(para) login.defs.5.xml:44(para)
+#: gpasswd.1.xml:44(para) chpasswd.8.xml:44(para) chgpasswd.8.xml:44(para)
 msgid ""
 "This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
 "or by any command line option used to configure the encryption algorithm."
 msgstr ""
 
-#: passwd.1.xml:19(para) newusers.8.xml:19(para) login.defs.5.xml:19(para)
-#: gpasswd.1.xml:19(para) chpasswd.8.xml:19(para) chgpasswd.8.xml:19(para)
+#: passwd.1.xml:49(para) newusers.8.xml:49(para) login.defs.5.xml:49(para)
+#: gpasswd.1.xml:49(para) chpasswd.8.xml:49(para) chgpasswd.8.xml:49(para)
 msgid ""
 "This variable is deprecated. You should use <option>ENCRYPT_METHOD</option>."
 msgstr ""
 
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>OBSCURE_CHECKS_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (Boolesh)"
 
-#: passwd.1.xml:4(para) login.defs.5.xml:4(para)
+#: passwd.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Enable additional checks upon password changes."
 msgstr ""
 
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_ALWAYS_WARN</option> (boolean)"
 msgstr "CHFN_AUTH (Boolesh)"
 
-#: passwd.1.xml:4(para) login.defs.5.xml:4(para)
+#: passwd.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Warn about weak passwords (but still allow them) if you are root."
 msgstr ""
 
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_CHANGE_TRIES</option> (number)"
 msgstr "PASS_WARN_AGE (Zahl)"
 
-#: passwd.1.xml:4(para) login.defs.5.xml:4(para)
+#: passwd.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Maximum number of attempts to change password if rejected (too easy)."
 msgstr ""
 
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_MAX_LEN</option> (number)"
 msgstr "PASS_MAX_DAYS (Zahl)"
 
-#: passwd.1.xml:3(term) login.defs.5.xml:3(term)
+#: passwd.1.xml:33(term) login.defs.5.xml:33(term)
 #, fuzzy
 msgid "<option>PASS_MIN_LEN</option> (number)"
 msgstr "PASS_MIN_DAYS (Zahl)"
 
-#: passwd.1.xml:5(para) login.defs.5.xml:5(para)
+#: passwd.1.xml:35(para) login.defs.5.xml:35(para)
 msgid ""
 "Number of significant characters in the password for crypt(). "
 "<option>PASS_MAX_LEN</option> is 8 by default. Don't change unless your crypt"
@@ -4118,18 +4594,18 @@
 "<replaceable>yes</replaceable>."
 msgstr ""
 
-#: passwd.1.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: gpasswd.1.xml:2(term) chpasswd.8.xml:2(term) chgpasswd.8.xml:2(term)
+#: passwd.1.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: gpasswd.1.xml:30(term) chpasswd.8.xml:30(term) chgpasswd.8.xml:30(term)
 msgid "<option>SHA_CRYPT_MIN_ROUNDS</option> (number)"
 msgstr ""
 
-#: passwd.1.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
-#: gpasswd.1.xml:3(term) chpasswd.8.xml:3(term) chgpasswd.8.xml:3(term)
+#: passwd.1.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
+#: gpasswd.1.xml:31(term) chpasswd.8.xml:31(term) chgpasswd.8.xml:31(term)
 msgid "<option>SHA_CRYPT_MAX_ROUNDS</option> (number)"
 msgstr ""
 
-#: passwd.1.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
-#: gpasswd.1.xml:5(para) chpasswd.8.xml:5(para) chgpasswd.8.xml:5(para)
+#: passwd.1.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
+#: gpasswd.1.xml:33(para) chpasswd.8.xml:33(para) chgpasswd.8.xml:33(para)
 msgid ""
 "When <option>ENCRYPT_METHOD</option> is set to <replaceable>SHA256</"
 "replaceable> or <replaceable>SHA512</replaceable>, this defines the number "
@@ -4137,61 +4613,61 @@
 "of rounds is not specified on the command line)."
 msgstr ""
 
-#: passwd.1.xml:12(para) newusers.8.xml:12(para) login.defs.5.xml:12(para)
-#: gpasswd.1.xml:12(para) chpasswd.8.xml:12(para) chgpasswd.8.xml:12(para)
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
 msgid ""
 "With a lot of rounds, it is more difficult to brute forcing the password. "
 "But note also that more CPU resources will be needed to authenticate users."
 msgstr ""
 
-#: passwd.1.xml:17(para) newusers.8.xml:17(para) login.defs.5.xml:17(para)
-#: gpasswd.1.xml:17(para) chpasswd.8.xml:17(para) chgpasswd.8.xml:17(para)
+#: passwd.1.xml:45(para) newusers.8.xml:45(para) login.defs.5.xml:45(para)
+#: gpasswd.1.xml:45(para) chpasswd.8.xml:45(para) chgpasswd.8.xml:45(para)
 msgid ""
 "If not specified, the libc will choose the default number of rounds (5000)."
 msgstr ""
 
-#: passwd.1.xml:21(para) newusers.8.xml:21(para) login.defs.5.xml:21(para)
-#: gpasswd.1.xml:21(para) chpasswd.8.xml:21(para) chgpasswd.8.xml:21(para)
+#: passwd.1.xml:49(para) newusers.8.xml:49(para) login.defs.5.xml:49(para)
+#: gpasswd.1.xml:49(para) chpasswd.8.xml:49(para) chgpasswd.8.xml:49(para)
 msgid "The values must be inside the 1000-999999999 range."
 msgstr ""
 
-#: passwd.1.xml:24(para) newusers.8.xml:24(para) login.defs.5.xml:24(para)
-#: gpasswd.1.xml:24(para) chpasswd.8.xml:24(para) chgpasswd.8.xml:24(para)
+#: passwd.1.xml:52(para) newusers.8.xml:52(para) login.defs.5.xml:52(para)
+#: gpasswd.1.xml:52(para) chpasswd.8.xml:52(para) chgpasswd.8.xml:52(para)
 msgid ""
 "If only one of the <option>SHA_CRYPT_MIN_ROUNDS</option> or "
 "<option>SHA_CRYPT_MAX_ROUNDS</option> values is set, then this value will be "
 "used."
 msgstr ""
 
-#: passwd.1.xml:29(para) newusers.8.xml:29(para) login.defs.5.xml:29(para)
-#: gpasswd.1.xml:29(para) chpasswd.8.xml:29(para) chgpasswd.8.xml:29(para)
+#: passwd.1.xml:57(para) newusers.8.xml:57(para) login.defs.5.xml:57(para)
+#: gpasswd.1.xml:57(para) chpasswd.8.xml:57(para) chgpasswd.8.xml:57(para)
 msgid ""
 "If <option>SHA_CRYPT_MIN_ROUNDS</option> &gt; <option>SHA_CRYPT_MAX_ROUNDS</"
 "option>, the highest value will be used."
 msgstr ""
 
-#: passwd.1.xml:356(para) chage.1.xml:212(para)
+#: passwd.1.xml:398(para) chage.1.xml:241(para)
 msgid "permission denied"
 msgstr "Berechtigung verweigert"
 
-#: passwd.1.xml:362(para)
+#: passwd.1.xml:404(para)
 msgid "invalid combination of options"
 msgstr "ungültige Kombination von Optionen"
 
-#: passwd.1.xml:368(para)
+#: passwd.1.xml:410(para)
 msgid "unexpected failure, nothing done"
 msgstr "unerwarteter Fehler, nichts wurde verändert"
 
-#: passwd.1.xml:374(para)
+#: passwd.1.xml:416(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr "unerwarteter Fehler, die Datei <filename>passwd</filename> fehlt"
 
-#: passwd.1.xml:380(para)
+#: passwd.1.xml:422(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr ""
 "Datei <filename>passwd</filename> wird benutzt, bitte nochmal versuchen"
 
-#: passwd.1.xml:344(para)
+#: passwd.1.xml:386(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -4199,30 +4675,40 @@
 "Der Befehl <command>passwd</command> gibt beim Beenden folgende Werte "
 "zurück: <placeholder-1/>"
 
-#: passwd.1.xml:395(para)
+#: passwd.1.xml:437(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
+"citerefentry>. <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
+"citerefentry>, <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: nologin.8.xml:5(refentrytitle) nologin.8.xml:10(refname)
-#: nologin.8.xml:16(command)
+#: nologin.8.xml:34(refentrytitle) nologin.8.xml:39(refname)
+#: nologin.8.xml:45(command)
 msgid "nologin"
 msgstr "nologin"
 
-#: nologin.8.xml:11(refpurpose)
+#: nologin.8.xml:40(refpurpose)
 msgid "politely refuse a login"
 msgstr "lehnt höflich eine Anmeldung ab"
 
-#: nologin.8.xml:22(para)
+#: nologin.8.xml:51(para)
 msgid ""
 "The <command>nologin</command> command displays a message that an account is "
 "not available and exits non-zero. It is intended as a replacement shell "
@@ -4232,7 +4718,7 @@
 "nicht verfügbar ist, und gibt eine Wert von ungleich Null zurück. Dies ist "
 "als Einsatz für das Shell-Feld bei abgeschalteten Konten vorgesehen."
 
-#: nologin.8.xml:27(para)
+#: nologin.8.xml:56(para)
 msgid ""
 "To disable all logins, investigate <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
@@ -4241,7 +4727,7 @@
 "<citerefentry><refentrytitle>nologin</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>."
 
-#: nologin.8.xml:36(para)
+#: nologin.8.xml:65(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
@@ -4252,35 +4738,47 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 # SB: English manual should be "HISTORY"
-#: nologin.8.xml:47(title)
-msgid "HYSTORY"
+#: nologin.8.xml:76(title)
+#, fuzzy
+#| msgid "HYSTORY"
+msgid "HISTORY"
 msgstr "GESCHICHTE"
 
-#: nologin.8.xml:48(para)
-msgid "The <command>nologin</command> command appeared in BSD 4.4."
+#: nologin.8.xml:77(para)
+#, fuzzy
+#| msgid "The <command>nologin</command> command appeared in BSD 4.4."
+msgid "The <command>nologin</command> command appearred in BSD 4.4."
 msgstr "Der Befehl <command>nologin</command> tauchte erstmal in BSD 4.4 auf."
 
-#: newusers.8.xml:21(refentrytitle) newusers.8.xml:26(refname)
-#: newusers.8.xml:32(command) login.defs.5.xml:321(term)
+#: newusers.8.xml:50(refentrytitle) newusers.8.xml:55(refname)
+#: newusers.8.xml:61(command) login.defs.5.xml:353(term)
 msgid "newusers"
 msgstr "newusers"
 
-#: newusers.8.xml:27(refpurpose)
+#: newusers.8.xml:56(refpurpose)
 msgid "update and create new users in batch"
 msgstr "erstellt oder aktualisiert mehrere neue Benutzer am Stück"
 
-#: newusers.8.xml:34(replaceable)
+#: newusers.8.xml:63(replaceable)
 msgid "new_users"
 msgstr "neue_benutzer"
 
-#: newusers.8.xml:41(para)
+#: newusers.8.xml:70(para)
+#, fuzzy
+#| msgid ""
+#| "The <command>newusers</command> command reads a file of user name and "
+#| "clear-text password pairs and uses this information to update a group of "
+#| "existing users or to create new users. Each line is in the same format as "
+#| "the standard password file (see <citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the following "
+#| "exceptions:"
 msgid ""
 "The <command>newusers</command> command reads a file of user name and clear-"
 "text password pairs and uses this information to update a group of existing "
 "users or to create new users. Each line is in the same format as the "
 "standard password file (see <citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the following "
-"exceptions:"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the exceptions "
+"explained below:"
 msgstr ""
 "Der Befehl <command>newusers</command> verwendet eine Datei mit "
 "Benutzernamen und entsprechenden Klartext-Passwörtern und aktualisiert damit "
@@ -4289,11 +4787,32 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>) mit den folgenden Ausnahmen:"
 
-#: newusers.8.xml:53(emphasis)
+#: newusers.8.xml:78(para)
+msgid "pw_name:pw_passwd:pw_uid:pw_gid:pw_gecos:pw_dir:pw_shell"
+msgstr ""
+
+#: newusers.8.xml:83(emphasis)
+#, fuzzy
+#| msgid "group_name"
+msgid "pw_name"
+msgstr "Gruppen_Name"
+
+#: newusers.8.xml:86(para)
+msgid "This is the name of the user."
+msgstr ""
+
+#: newusers.8.xml:89(para)
+msgid ""
+"It can be the name of a new user or the name of an existing user (or an user "
+"created before by <command>newusers</command>). In case of an existing user, "
+"the user's information will be changed, otherwise a new user will be created."
+msgstr ""
+
+#: newusers.8.xml:100(emphasis)
 msgid "pw_passwd"
 msgstr "pw_passwd"
 
-#: newusers.8.xml:56(para)
+#: newusers.8.xml:103(para)
 msgid ""
 "This field will be encrypted and used as the new value of the encrypted "
 "password."
@@ -4301,47 +4820,122 @@
 "Dieses Feld wird verschlüsselt und als neuer Wert für das verschlüsselte "
 "Passwort verwendet."
 
-#: newusers.8.xml:64(emphasis)
+#: newusers.8.xml:111(emphasis)
+#, fuzzy
+#| msgid "pw_gid"
+msgid "pw_uid"
+msgstr "pw_gid"
+
+#: newusers.8.xml:114(para)
+msgid "This field is used to define the UID of the user."
+msgstr ""
+
+#: newusers.8.xml:117(para)
+msgid ""
+"If the field is empty, an new (unused) UID will be defined automatically by "
+"<command>newusers</command>."
+msgstr ""
+
+#: newusers.8.xml:121(para)
+msgid "If this field contains a number, this number will be used as the UID."
+msgstr ""
+
+#: newusers.8.xml:125(para)
+msgid ""
+"If this field contains the name of an existing user (or the name of an user "
+"created before by <command>newusers</command>), the UID of the specified "
+"user will be used."
+msgstr ""
+
+#: newusers.8.xml:135(emphasis)
 msgid "pw_gid"
 msgstr "pw_gid"
 
-#: newusers.8.xml:67(para)
+#: newusers.8.xml:138(para)
+msgid "This field is used to define the primary group ID for the user."
+msgstr ""
+
+#: newusers.8.xml:141(para)
 msgid ""
-"This field must contain the name (or number) of a group. The user will be "
-"added as a member to this group. When a non-existent group name or number is "
-"specified, a new group will be created. In the case of a non-existent group "
-"number, both the name and the number of the new group will be this number."
+"If this field contains the name of an existing group (or a group created "
+"before by <command>newusers</command>), the GID of this group will be used "
+"as the primary group ID for the user."
 msgstr ""
-"Dieses Feld muss den Namen (oder die Nummer) einer Gruppe enthalten. Der "
-"Benutzer wird dieser Gruppe hinzugefügt. Wenn ein nicht existierender "
-"Gruppenname oder -nummer angegeben wird, wird eine neue Gruppe erstellt. "
-"Falls eine nicht existierende Gruppennummer angegeben wird, wird diese "
-"Nummer auch der Name der neuen Gruppe sein. "
 
-#: newusers.8.xml:78(emphasis)
+#: newusers.8.xml:147(para)
+msgid ""
+"If this field is a number, this number will be used as the primary group ID "
+"of the user. If no groups exist with this GID, a new group will be created "
+"with this GID, and the name of the user."
+msgstr ""
+
+#: newusers.8.xml:153(para)
+msgid ""
+"If this field is empty, a new group will be created with the name of the "
+"user and a GID will be automatically defined by <command>newusers</command> "
+"to be used as the primary group ID for the user and as the GID for the new "
+"group."
+msgstr ""
+
+#: newusers.8.xml:159(para)
+msgid ""
+"If this field contains the name of a group which does not exist (and was not "
+"created earlier wbefore by <command>newusers</command>), a new group will be "
+"created with the specified name and a GID will be automatically defined by "
+"<command>newusers</command> to be used as the primary group ID for the user "
+"and Gs the ID for the new group."
+msgstr ""
+
+#: newusers.8.xml:171(emphasis)
+msgid "pw_gecos"
+msgstr ""
+
+#: newusers.8.xml:174(para)
+msgid "This field is copied in the GECOS field of the user."
+msgstr ""
+
+#: newusers.8.xml:181(emphasis)
 msgid "pw_dir"
 msgstr "pw_dir"
 
-#: newusers.8.xml:81(para)
+#: newusers.8.xml:184(para)
+msgid "This field is used to define the home directory of the user."
+msgstr ""
+
+#: newusers.8.xml:187(para)
 msgid ""
-"This field will be checked for existence as a directory, and a new directory "
-"with this name will be created if it does not already exist. The ownership "
-"of the directory will be set to be that of the user being created or updated."
+"If this field does not specify an existing directory, the specified "
+"directory is created, with ownership set to the user being created or "
+"updated and its primary group."
 msgstr ""
-"Dieses Feld wird darauf überprüft, ob es als Verzeichnis existiert. Wenn es "
-"es nicht gibt, wird ein neues Verzeichnis unter diesem Namen erstellt. Der "
-"Eigentümer des Verzeichnisses wird der Benutzer sein, der erstellt oder "
-"aktualisiert wird."
 
-#: newusers.8.xml:91(para)
+#: newusers.8.xml:196(emphasis)
+msgid "pw_shell"
+msgstr ""
+
+#: newusers.8.xml:199(para)
 msgid ""
+"This field defines the shell of the user. No checks are performed on this "
+"field."
+msgstr ""
+
+#: newusers.8.xml:207(para)
+msgid ""
+"<command>newusers</command> first tries to create or change all the "
+"specified users, and then write these changes to the user or group "
+"databases. If an error occurs (except in the final writes to the databases), "
+"no changes are committed to the databases."
+msgstr ""
+
+#: newusers.8.xml:214(para)
+msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are updated at a single time."
 msgstr ""
 "Dieser Befehl ist für den Einsatz in großen Umgebungen vorgesehen, wo viele "
 "Konten gleichzeitig aktualisiert werden müssen."
 
-#: newusers.8.xml:99(para)
+#: newusers.8.xml:222(para)
 #, fuzzy
 #| msgid ""
 #| "The options which apply to the <command>usermod</command> command are:"
@@ -4350,66 +4944,76 @@
 "Die Optionen, die vom Befehl <command>usermod</command> unterstützt werden, "
 "sind:"
 
-#: newusers.8.xml:103(term) chpasswd.8.xml:66(term) chgpasswd.8.xml:66(term)
+#: newusers.8.xml:226(term) chpasswd.8.xml:95(term) chgpasswd.8.xml:95(term)
 #, fuzzy
 msgid "<option>-c</option>, <option>--crypt-method</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: newusers.8.xml:105(para) chpasswd.8.xml:68(para) chgpasswd.8.xml:68(para)
+#: newusers.8.xml:228(para) chpasswd.8.xml:97(para) chgpasswd.8.xml:97(para)
 msgid "Use the specified method to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:106(para) chpasswd.8.xml:69(para) chgpasswd.8.xml:69(para)
+#: newusers.8.xml:229(para) chpasswd.8.xml:101(para) chgpasswd.8.xml:101(para)
 msgid ""
 "The available methods are DES, MD5, NONE, and SHA256 or SHA512 if your libc "
 "support these methods."
 msgstr ""
 
-#: newusers.8.xml:132(term) chpasswd.8.xml:97(term) chgpasswd.8.xml:97(term)
+#: newusers.8.xml:243(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: newusers.8.xml:255(term) chpasswd.8.xml:129(term) chgpasswd.8.xml:129(term)
 #, fuzzy
 msgid "<option>-s</option>, <option>--sha-rounds</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: newusers.8.xml:134(para) chpasswd.8.xml:99(para) chgpasswd.8.xml:99(para)
+#: newusers.8.xml:257(para) chpasswd.8.xml:131(para) chgpasswd.8.xml:131(para)
 msgid "Use the specified number of rounds to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:137(para) chpasswd.8.xml:102(para) chgpasswd.8.xml:102(para)
+#: newusers.8.xml:260(para) chpasswd.8.xml:134(para) chgpasswd.8.xml:134(para)
 msgid ""
 "The value 0 means that the system will choose the default number of rounds "
 "for the crypt method (5000)."
 msgstr ""
 
-#: newusers.8.xml:141(para) chpasswd.8.xml:106(para) chgpasswd.8.xml:106(para)
+#: newusers.8.xml:264(para) chpasswd.8.xml:138(para) chgpasswd.8.xml:138(para)
 msgid ""
 "A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
 msgstr ""
 
-#: newusers.8.xml:145(para) chpasswd.8.xml:110(para) chgpasswd.8.xml:110(para)
+#: newusers.8.xml:268(para) chpasswd.8.xml:142(para) chgpasswd.8.xml:142(para)
 msgid "You can only use this option with the SHA256 or SHA512 crypt method."
 msgstr ""
 
-#: newusers.8.xml:149(para) chpasswd.8.xml:114(para) chgpasswd.8.xml:114(para)
+#: newusers.8.xml:272(para) chpasswd.8.xml:146(para) chgpasswd.8.xml:146(para)
 msgid ""
 "By default, the number of rounds is defined by the SHA_CRYPT_MIN_ROUNDS and "
 "SHA_CRYPT_MAX_ROUNDS variables in <filename>/etc/login.defs</filename>."
 msgstr ""
 
-#: newusers.8.xml:161(para)
+#: newusers.8.xml:284(para)
 msgid ""
 "The input file must be protected since it contains unencrypted passwords."
 msgstr ""
 "Die Eingabedatei muss geschützt werden, da sie unverschlüsselte Passwörter "
 "enthält."
 
-#: newusers.8.xml:165(para) chpasswd.8.xml:130(para)
+#: newusers.8.xml:288(para) chpasswd.8.xml:162(para)
 msgid ""
 "PAM is not used to update the passwords. Only <filename>/etc/passwd</"
 "filename> and <filename>/etc/shadow</filename> are updated, and the various "
 "checks or options provided by PAM modules are not used."
 msgstr ""
 
-#: newusers.8.xml:234(para)
+#: newusers.8.xml:357(para)
 msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -4423,22 +5027,22 @@
 "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: newgrp.1.xml:9(refentrytitle) newgrp.1.xml:14(refname)
-#: newgrp.1.xml:20(command) login.defs.5.xml:313(term)
+#: newgrp.1.xml:38(refentrytitle) newgrp.1.xml:43(refname)
+#: newgrp.1.xml:49(command)
 msgid "newgrp"
 msgstr "newgrp"
 
-#: newgrp.1.xml:15(refpurpose)
+#: newgrp.1.xml:44(refpurpose)
 msgid "log in to a new group"
 msgstr "als neue Gruppe anmelden"
 
-#: newgrp.1.xml:21(replaceable) grpck.8.xml:22(replaceable)
-#: grpck.8.xml:31(replaceable) groupdel.8.xml:22(replaceable)
-#: groupadd.8.xml:30(replaceable) gpasswd.1.xml:34(replaceable)
+#: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
+#: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
+#: groupadd.8.xml:56(replaceable) gpasswd.1.xml:63(replaceable)
 msgid "group"
 msgstr "Gruppe"
 
-#: newgrp.1.xml:27(para)
+#: newgrp.1.xml:56(para)
 msgid ""
 "The <command>newgrp</command> command is used to change the current group ID "
 "during a login session. If the optional <option>-</option> flag is given, "
@@ -4454,7 +5058,7 @@
 "unverändert."
 
 # SB: Übersetzung von "groupset"?
-#: newgrp.1.xml:35(para)
+#: newgrp.1.xml:64(para)
 msgid ""
 "<command>newgrp</command> changes the current real group ID to the named "
 "group, or to the default group listed in <filename>/etc/passwd</filename> if "
@@ -4479,7 +5083,7 @@
 "Passwort gefragt. Der Zugriff wird verweigert, wenn das Gruppenpasswort leer "
 "ist und der Benutzer nicht Gruppenmitglied ist."
 
-#: newgrp.1.xml:49(para)
+#: newgrp.1.xml:78(para)
 msgid ""
 "If there is an entry for this group in <filename>/etc/gshadow</filename>, "
 "then the list of members and the password of this group will be taken from "
@@ -4491,7 +5095,7 @@
 "Datei entnommen. Anderenfalls ist der Eintrag in <filename>/etc/group</"
 "filename> relevant."
 
-#: newgrp.1.xml:101(para)
+#: newgrp.1.xml:130(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -4516,18 +5120,18 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
-#: logoutd.8.xml:5(refentrytitle) logoutd.8.xml:10(refname)
-#: logoutd.8.xml:16(command)
+#: logoutd.8.xml:34(refentrytitle) logoutd.8.xml:39(refname)
+#: logoutd.8.xml:45(command)
 msgid "logoutd"
 msgstr "logoutd"
 
 # SB: Sollte das nicht mit einem kleinen "e" geschrieben werden?
-#: logoutd.8.xml:11(refpurpose)
+#: logoutd.8.xml:40(refpurpose)
 msgid "Enforce login time restrictions"
 msgstr "Richtet Beschränkung von Login-Zeiten ein"
 
 # SB: /etc/rc is not in Debian. Probably doesn't matter, since logoutd is not in Debian either.
-#: logoutd.8.xml:22(para)
+#: logoutd.8.xml:51(para)
 msgid ""
 "<command>logoutd</command> enforces the login time and port restrictions "
 "specified in <filename>/etc/porttime</filename>. <command>logoutd</command> "
@@ -4545,25 +5149,25 @@
 "ist. Alle Login-Sessions, die gegen die Beschränkungen in <filename>/etc/"
 "porttime</filename> verstoßen, werden beendet."
 
-#: logoutd.8.xml:44(filename) login.1.xml:283(filename)
+#: logoutd.8.xml:73(filename) login.1.xml:319(filename)
 msgid "/var/run/utmp"
 msgstr "/var/run/utmp"
 
-#: logoutd.8.xml:46(para) login.1.xml:285(para)
+#: logoutd.8.xml:75(para) login.1.xml:321(para)
 msgid "List of current login sessions."
 msgstr "Liste der aktuellen Login-Sitzungen."
 
-#: login.defs.5.xml:66(refentrytitle) login.defs.5.xml:71(refname)
+#: login.defs.5.xml:97(refentrytitle) login.defs.5.xml:102(refname)
 msgid "login.defs"
 msgstr "login.defs"
 
 # SB: Übersetzung von "suite configuration"?
-#: login.defs.5.xml:72(refpurpose)
+#: login.defs.5.xml:103(refpurpose)
 msgid "shadow password suite configuration"
 msgstr "Suite-Konfiguration für Shadow-Passwörter"
 
 # SB: dito
-#: login.defs.5.xml:77(para)
+#: login.defs.5.xml:108(para)
 msgid ""
 "The <filename>/etc/login.defs</filename> file defines the site-specific "
 "configuration for the shadow password suite. This file is required. Absence "
@@ -4575,7 +5179,7 @@
 "Wenn sie fehlt, wird das System dennoch laufen, es werden aber unerwünschte "
 "Ergebnisse auftauchen."
 
-#: login.defs.5.xml:84(para)
+#: login.defs.5.xml:115(para)
 msgid ""
 "This file is a readable text file, each line of the file describing one "
 "configuration parameter. The lines consist of a configuration name and "
@@ -4590,7 +5194,7 @@
 "Rautezeichen \"#\" eingeleitet. Die Raute muss das erste nicht leere Zeichen "
 "der Zeile sein."
 
-#: login.defs.5.xml:92(para)
+#: login.defs.5.xml:123(para)
 #, fuzzy
 msgid ""
 "Parameter values may be of four types: strings, booleans, numbers, and long "
@@ -4612,16 +5216,16 @@
 "maximale Größe der normalen und langen Zahlenparameter hängt von der "
 "Maschine ab."
 
-#: login.defs.5.xml:107(para)
+#: login.defs.5.xml:138(para)
 msgid "The following configuration items are provided:"
 msgstr "Die folgenden Konfigurationsmöglichkeiten werden angeboten:"
 
-#: login.defs.5.xml:2(term) chfn.1.xml:2(term)
+#: login.defs.5.xml:32(term) chfn.1.xml:32(term)
 #, fuzzy
 msgid "<option>CHFN_AUTH</option> (boolean)"
 msgstr "CHFN_AUTH (Boolesh)"
 
-#: login.defs.5.xml:4(para) chfn.1.xml:4(para)
+#: login.defs.5.xml:34(para) chfn.1.xml:34(para)
 #, fuzzy
 msgid ""
 "If <replaceable>yes</replaceable>, the <command>chfn</command> program will "
@@ -4632,12 +5236,12 @@
 "<command>chfn</command> und <command>chsh</command> Authentifizierung, bevor "
 "sie Veränderungen vornehmen, sofern sie nicht von Root ausgeführt werden."
 
-#: login.defs.5.xml:2(term) chfn.1.xml:2(term)
+#: login.defs.5.xml:32(term) chfn.1.xml:32(term)
 #, fuzzy
 msgid "<option>CHFN_RESTRICT</option> (string)"
 msgstr "CHFN_RESTRICT (Zeichenkette)"
 
-#: login.defs.5.xml:4(para) chfn.1.xml:4(para)
+#: login.defs.5.xml:34(para) chfn.1.xml:34(para)
 #, fuzzy
 msgid ""
 "This parameter specifies which values in the <emphasis remap=\"I\">gecos</"
@@ -4665,12 +5269,12 @@
 "Einschränkung erreicht man, wenn <filename>chfn</filename> nicht mit SUID-"
 "Rechten ausgestattet wird."
 
-#: login.defs.5.xml:2(term) chsh.1.xml:2(term)
+#: login.defs.5.xml:32(term) chsh.1.xml:32(term)
 #, fuzzy
 msgid "<option>CHSH_AUTH</option> (boolean)"
 msgstr "CHFN_AUTH (Boolesh)"
 
-#: login.defs.5.xml:4(para) chsh.1.xml:4(para)
+#: login.defs.5.xml:34(para) chsh.1.xml:34(para)
 #, fuzzy
 msgid ""
 "If <replaceable>yes</replaceable>, the <command>chsh</command> program will "
@@ -4681,12 +5285,12 @@
 "<command>chfn</command> und <command>chsh</command> Authentifizierung, bevor "
 "sie Veränderungen vornehmen, sofern sie nicht von Root ausgeführt werden."
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ERASECHAR</option> (number)"
 msgstr "UMASK (Zahl)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 #, fuzzy
 msgid ""
 "Terminal ERASE character (<replaceable>010</replaceable> = backspace, "
@@ -4695,61 +5299,61 @@
 "Der Gruppenname wird vom Namen <replaceable>GRUPPE</replaceable> auf "
 "<replaceable>NEUE_GRUPPE</replaceable> geändert."
 
-#: login.defs.5.xml:8(para) login.defs.5.xml:7(para) login.1.xml:8(para)
-#: login.1.xml:7(para)
+#: login.defs.5.xml:38(para) login.defs.5.xml:37(para) login.1.xml:38(para)
+#: login.1.xml:37(para)
 msgid ""
 "The value can be prefixed \"0\" for an octal value, or \"0x\" for an "
 "hexadecimal value."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FAIL_DELAY</option> (number)"
 msgstr "PASS_MIN_DAYS (Zahl)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Delay in seconds before being allowed another attempt after a login failure."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FAILLOG_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (Boolesh)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Enable logging and display of <filename>/var/log/faillog</filename> login "
 "failure info."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FAKE_SHELL</option> (string)"
 msgstr "MAIL_DIR (Zeichenkette)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, <command>login</command> will execute this shell instead of the "
 "users' shell specified in <filename>/etc/passwd</filename>."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FTMP_FILE</option> (string)"
 msgstr "MAIL_DIR (Zeichenkette)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, login failures will be logged in this file in a utmp format."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>HUSHLOGIN_FILE</option> (string)"
 msgstr "CHFN_RESTRICT (Zeichenkette)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, this file can inhibit all the usual chatter during the login "
 "sequence. If a full pathname is specified, then hushed mode will be enabled "
@@ -4758,106 +5362,106 @@
 "directory."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ISSUE_FILE</option> (string)"
 msgstr "MAIL_DIR (Zeichenkette)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "If defined, this file will be displayed before each login prompt."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>KILLCHAR</option> (number)"
 msgstr "GID_MAX (Zahl)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Terminal KILL character (<replaceable>025</replaceable> = CTRL/U)."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LASTLOG_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (Boolesh)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable logging and display of /var/log/lastlog login time info."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOG_OK_LOGINS</option> (boolean)"
 msgstr "CHFN_AUTH (Boolesh)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable logging of successful logins."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOG_UNKFAIL_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (Boolesh)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable display of unknown usernames when login failures are recorded."
 msgstr ""
 
-#: login.defs.5.xml:8(para) login.1.xml:8(para)
+#: login.defs.5.xml:38(para) login.1.xml:38(para)
 msgid ""
 "Note: logging unknown usernames may be a security issue if an user enter her "
 "password instead of her login name."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOGIN_RETRIES</option> (number)"
 msgstr "GID_MIN (Zahl)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Maximum number of login retries in case of bad password."
 msgstr ""
 
-#: login.defs.5.xml:7(para) login.1.xml:7(para)
+#: login.defs.5.xml:37(para) login.1.xml:37(para)
 msgid ""
 "This will most likely be overriden by PAM, since the default pam_unix module "
 "has it's own built in of 3 retries. However, this is a safe fallback in case "
 "you are using an authentication module that does not enforce PAM_MAXTRIES."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOGIN_TIMEOUT</option> (number)"
 msgstr "GID_MAX (Zahl)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Max time in seconds for login."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>MOTD_FILE</option> (string)"
 msgstr "MAIL_DIR (Zeichenkette)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, \":\" delimited list of \"message of the day\" files to be "
 "displayed upon login."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>NOLOGINS_FILE</option> (string)"
 msgstr "CHFN_RESTRICT (Zeichenkette)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, name of file whose presence will inhibit non-root logins. The "
 "contents of this file should be a message indicating why logins are "
 "inhibited."
 msgstr ""
 
-#: login.defs.5.xml:149(para)
+#: login.defs.5.xml:181(para)
 #, fuzzy
 msgid ""
 "<option>PASS_MAX_DAYS</option>, <option>PASS_MIN_DAYS</option> and "
@@ -4868,45 +5472,45 @@
 "des Kontos verwendet. Änderungen dieser Wert berühren bestehende Konten "
 "nicht."
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>PORTTIME_CHECKS_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (Boolesh)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable checking of time restrictions specified in /etc/porttime."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>TTYGROUP</option> (string)"
 msgstr "MAIL_DIR (Zeichenkette)"
 
-#: login.defs.5.xml:3(term) login.1.xml:3(term)
+#: login.defs.5.xml:33(term) login.1.xml:33(term)
 #, fuzzy
 msgid "<option>TTYPERM</option> (string)"
 msgstr "USERDEL_CMD (Zeichenkette)"
 
-#: login.defs.5.xml:5(para) login.1.xml:5(para)
+#: login.defs.5.xml:35(para) login.1.xml:35(para)
 msgid ""
 "The terminal permissions: the login tty will be owned by the "
 "<option>TTYGROUP</option> group, and the permissions will be set to "
 "<option>TTYPERM</option>."
 msgstr ""
 
-#: login.defs.5.xml:10(para) login.1.xml:10(para)
+#: login.defs.5.xml:40(para) login.1.xml:40(para)
 msgid ""
 "By default, the ownership of the terminal is set to the user's primary group "
 "and the permissions are set to <replaceable>0600</replaceable>."
 msgstr ""
 
-#: login.defs.5.xml:15(para) login.1.xml:15(para)
+#: login.defs.5.xml:45(para) login.1.xml:45(para)
 msgid ""
 "<option>TTYGROUP</option> can be either the name of a group or a numeric "
 "group identifier."
 msgstr ""
 
-#: login.defs.5.xml:19(para) login.1.xml:19(para)
+#: login.defs.5.xml:49(para) login.1.xml:49(para)
 msgid ""
 "If you have a <command>write</command> program which is \"setgid\" to a "
 "special group which owns the terminals, define TTYGROUP to the group number "
@@ -4914,32 +5518,32 @@
 "TTYPERM to either 622 or 600."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>TTYTYPE_FILE</option> (string)"
 msgstr "MAIL_DIR (Zeichenkette)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, file which maps tty line to TERM environment parameter. Each "
 "line of the file is in a format something like \"vt100 tty01\"."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ULIMIT</option> (number)"
 msgstr "UID_MIN (Zahl)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Default <command>ulimit</command> value."
 msgstr ""
 
-#: login.defs.5.xml:177(title)
+#: login.defs.5.xml:209(title)
 #, fuzzy
 msgid "CROSS REFERENCES"
 msgstr "QUERVERWEIS"
 
-#: login.defs.5.xml:178(para)
+#: login.defs.5.xml:210(para)
 #, fuzzy
 msgid ""
 "The following cross references show which programs in the shadow password "
@@ -4948,101 +5552,100 @@
 "Der folgende Querverweis zeigt, welche Programm aus der Shadow-Passwort-"
 "Suite welche Parameter verwenden."
 
-#: login.defs.5.xml:186(term) chfn.1.xml:12(refentrytitle)
-#: chfn.1.xml:17(refname) chfn.1.xml:23(command)
+#: login.defs.5.xml:218(term) chfn.1.xml:41(refentrytitle)
+#: chfn.1.xml:46(refname) chfn.1.xml:52(command)
 msgid "chfn"
 msgstr "chfn"
 
-#: login.defs.5.xml:188(para)
+#: login.defs.5.xml:220(para)
 msgid ""
 "<phrase condition=\"no_pam\">CHFN_AUTH</phrase> CHFN_RESTRICT <phrase "
 "condition=\"no_pam\">LOGIN_STRING</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:196(term) chgpasswd.8.xml:13(refentrytitle)
-#: chgpasswd.8.xml:18(refname) chgpasswd.8.xml:24(command)
+#: login.defs.5.xml:228(term) chgpasswd.8.xml:42(refentrytitle)
+#: chgpasswd.8.xml:47(refname) chgpasswd.8.xml:53(command)
 msgid "chgpasswd"
 msgstr "chgpasswd"
 
-#: login.defs.5.xml:198(para) login.defs.5.xml:228(para)
+#: login.defs.5.xml:230(para) login.defs.5.xml:260(para)
 msgid ""
 "ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB <phrase condition="
 "\"sha_crypt\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:206(term) chpasswd.8.xml:12(refentrytitle)
-#: chpasswd.8.xml:17(refname) chpasswd.8.xml:23(command)
+#: login.defs.5.xml:238(term) chpasswd.8.xml:41(refentrytitle)
+#: chpasswd.8.xml:46(refname) chpasswd.8.xml:52(command)
 msgid "chpasswd"
 msgstr "chpasswd"
 
-#: login.defs.5.xml:208(para)
+#: login.defs.5.xml:240(para)
 msgid ""
 "ENCRYPT_METHOD MD5_CRYPT_ENAB <phrase condition=\"sha_crypt"
 "\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:216(term) chsh.1.xml:11(refentrytitle)
-#: chsh.1.xml:16(refname) chsh.1.xml:22(command)
+#: login.defs.5.xml:248(term) chsh.1.xml:40(refentrytitle)
+#: chsh.1.xml:45(refname) chsh.1.xml:51(command)
 msgid "chsh"
 msgstr "chsh"
 
-#: login.defs.5.xml:218(para)
+#: login.defs.5.xml:250(para)
 #, fuzzy
 msgid "CHSH_AUTH LOGIN_STRING"
 msgstr "CHFN_AUTH CHFN_RESTRICT"
 
-#: login.defs.5.xml:226(term) gpasswd.1.xml:13(refentrytitle)
-#: gpasswd.1.xml:18(refname) gpasswd.1.xml:29(command)
+#: login.defs.5.xml:258(term) gpasswd.1.xml:42(refentrytitle)
+#: gpasswd.1.xml:47(refname) gpasswd.1.xml:58(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
-#: login.defs.5.xml:236(term) groupadd.8.xml:11(refentrytitle)
-#: groupadd.8.xml:16(refname) groupadd.8.xml:22(command)
+#: login.defs.5.xml:268(term) groupadd.8.xml:42(refentrytitle)
+#: groupadd.8.xml:47(refname) groupadd.8.xml:53(command)
 msgid "groupadd"
 msgstr "groupadd"
 
-#: login.defs.5.xml:238(para)
+#: login.defs.5.xml:270(para)
 #, fuzzy
 msgid "GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP SYS_GID_MAX SYS_GID_MIN"
 msgstr ""
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:245(term) groupdel.8.xml:9(refentrytitle)
-#: groupdel.8.xml:14(refname) groupdel.8.xml:20(command)
+#: login.defs.5.xml:277(term) groupdel.8.xml:38(refentrytitle)
+#: groupdel.8.xml:43(refname) groupdel.8.xml:49(command)
 msgid "groupdel"
 msgstr "groupdel"
 
-#: login.defs.5.xml:247(para) login.defs.5.xml:253(para)
-#: login.defs.5.xml:259(para) login.defs.5.xml:266(para)
-#: login.defs.5.xml:272(para) login.defs.5.xml:278(para)
-#: login.defs.5.xml:421(para)
+#: login.defs.5.xml:279(para) login.defs.5.xml:285(para)
+#: login.defs.5.xml:291(para) login.defs.5.xml:298(para)
+#: login.defs.5.xml:304(para) login.defs.5.xml:310(para)
 msgid "MAX_MEMBERS_PER_GROUP"
 msgstr ""
 
-#: login.defs.5.xml:251(term) groupmems.8.xml:9(refentrytitle)
-#: groupmems.8.xml:14(refname) groupmems.8.xml:20(command)
+#: login.defs.5.xml:283(term) groupmems.8.xml:38(refentrytitle)
+#: groupmems.8.xml:43(refname) groupmems.8.xml:49(command)
 msgid "groupmems"
 msgstr "groupmems"
 
-#: login.defs.5.xml:257(term) groupmod.8.xml:9(refentrytitle)
-#: groupmod.8.xml:14(refname) groupmod.8.xml:20(command)
+#: login.defs.5.xml:289(term) groupmod.8.xml:38(refentrytitle)
+#: groupmod.8.xml:43(refname) groupmod.8.xml:49(command)
 msgid "groupmod"
 msgstr "groupmod"
 
-#: login.defs.5.xml:264(term) grpck.8.xml:9(refentrytitle)
-#: grpck.8.xml:14(refname) grpck.8.xml:20(command) grpck.8.xml:29(command)
+#: login.defs.5.xml:296(term) grpck.8.xml:38(refentrytitle)
+#: grpck.8.xml:43(refname) grpck.8.xml:49(command) grpck.8.xml:58(command)
 msgid "grpck"
 msgstr "grpck"
 
 # SB: Translation of login.1 based on Josef Spillner's (josef at ggzgamingzone.org) from 2003. Mention somewhere else as well?
-#: login.defs.5.xml:284(term) login.1.xml:41(refentrytitle)
-#: login.1.xml:46(refname) login.1.xml:52(command) login.1.xml:59(command)
-#: login.1.xml:65(command)
+#: login.defs.5.xml:316(term) login.1.xml:70(refentrytitle)
+#: login.1.xml:75(refname) login.1.xml:81(command) login.1.xml:89(command)
+#: login.1.xml:96(command)
 msgid "login"
 msgstr "login"
 
-#: login.defs.5.xml:286(para)
+#: login.defs.5.xml:318(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENV_PATH ENV_SUPATH ENV_TZ ENVIRON_FILE</"
@@ -5057,11 +5660,17 @@
 "phrase> USERGROUPS_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:315(para)
+#: login.defs.5.xml:345(term)
+#, fuzzy
+#| msgid "newgrp"
+msgid "newgrp / sg"
+msgstr "newgrp"
+
+#: login.defs.5.xml:347(para)
 msgid "SYSLOG_SG_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:323(para)
+#: login.defs.5.xml:355(para)
 #, fuzzy
 msgid ""
 "ENCRYPT_METHOD GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB "
@@ -5072,18 +5681,18 @@
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:339(para)
+#: login.defs.5.xml:371(para)
 msgid ""
 "ENCRYPT_METHOD MD5_CRYPT_ENAB OBSCURE_CHECKS_ENAB PASS_ALWAYS_WARN "
 "PASS_CHANGE_TRIES PASS_MAX_LEN PASS_MIN_LEN <phrase condition=\"sha_crypt"
 "\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:350(para) login.defs.5.xml:358(para)
+#: login.defs.5.xml:382(para) login.defs.5.xml:390(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 
-#: login.defs.5.xml:365(para)
+#: login.defs.5.xml:397(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENVIRON_FILE</phrase> ENV_PATH "
@@ -5094,43 +5703,54 @@
 msgstr ""
 
 # SB: Translation of login.1 based on Josef Spillner's (josef at ggzgamingzone.org) from 2003. Mention somewhere else as well?
-#: login.defs.5.xml:380(term)
+#: login.defs.5.xml:412(term)
 #, fuzzy
 msgid "sulogin"
 msgstr "login"
 
-#: login.defs.5.xml:382(para)
+#: login.defs.5.xml:414(para)
 msgid "ENV_HZ <phrase condition=\"no_pam\">ENV_TZ</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:391(para)
+#: login.defs.5.xml:423(para)
 #, fuzzy
 msgid ""
-"GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS PASS_MIN_DAYS "
-"PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN UID_MAX "
-"UID_MIN UMASK"
+"CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS "
+"PASS_MIN_DAYS PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN "
+"UID_MAX UID_MIN UMASK"
 msgstr ""
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:404(para)
+#: login.defs.5.xml:436(para)
 msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:413(para)
+#: login.defs.5.xml:445(para)
 msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP"
 msgstr ""
 
-#: login.defs.5.xml:429(para)
+#: login.defs.5.xml:456(para)
+#, fuzzy
+#| msgid ""
+#| "Much of the functionality that used to be provided by the shadow password "
+#| "suite is now handled by PAM. Thus, <filename>/etc/login.defs</filename> "
+#| "is no longer used by programs such as: "
+#| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>. Please refer to the corresponding PAM configuration files "
+#| "instead."
 msgid ""
 "Much of the functionality that used to be provided by the shadow password "
 "suite is now handled by PAM. Thus, <filename>/etc/login.defs</filename> is "
-"no longer used by programs such as: <citerefentry><refentrytitle>login</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>. Please refer to the corresponding PAM "
-"configuration files instead."
+"no longer used by <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, or less used by "
+"<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, and <citerefentry><refentrytitle>su</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>. Please refer to the "
+"corresponding PAM configuration files instead."
 msgstr ""
 "Ein Großteil der Funktionen, die früher einmal durch die Shadow-Passwort-"
 "Suite angeboten wurde, wird heute durch PAM zur Verfügung gestellt. Daher "
@@ -5142,7 +5762,7 @@
 "citerefentry> verwendet. Sie sollten daher in den entsprechenden "
 "Konfigurationsdateien für PAM nachsehen."
 
-#: login.defs.5.xml:446(para)
+#: login.defs.5.xml:472(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5164,15 +5784,15 @@
 "citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: login.access.5.xml:5(refentrytitle) login.access.5.xml:10(refname)
+#: login.access.5.xml:35(refentrytitle) login.access.5.xml:40(refname)
 msgid "login.access"
 msgstr "login.access"
 
-#: login.access.5.xml:11(refpurpose)
+#: login.access.5.xml:41(refpurpose)
 msgid "login access control table"
 msgstr "Tabelle für die Zugangskontrolle zur Anmeldung"
 
-#: login.access.5.xml:16(para)
+#: login.access.5.xml:46(para)
 msgid ""
 "The <emphasis remap=\"I\">login.access</emphasis> file specifies (user, "
 "host) combinations and/or (user, tty) combinations for which a login will be "
@@ -5182,7 +5802,7 @@
 "von (Benutzer, Host) und (Benutzer, tty) fest, für die eine Anmeldung "
 "erlaubt oder abgelehnt wird."
 
-#: login.access.5.xml:22(para)
+#: login.access.5.xml:52(para)
 msgid ""
 "When someone logs in, the <emphasis remap=\"I\">login.access</emphasis> is "
 "scanned for the first entry that matches the (user, host) combination, or, "
@@ -5196,7 +5816,7 @@
 "zutrifft. Das Feld für die Erlaubnis bestimmt, ob die Anmeldung zugelassen "
 "oder abgelehnt wird."
 
-#: login.access.5.xml:30(para)
+#: login.access.5.xml:60(para)
 msgid ""
 "Each line of the login access control table has three fields separated by a "
 "\":\" character:"
@@ -5204,7 +5824,7 @@
 "Jede Zeile der Tabelle für die Zugangskontrolle enthält drei Felder, die "
 "jeweils durch einen Doppelpunkt getrennt sind:"
 
-#: login.access.5.xml:35(para)
+#: login.access.5.xml:65(para)
 msgid ""
 "<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I\">users</"
 "emphasis>:<emphasis remap=\"I\">origins</emphasis>"
@@ -5212,7 +5832,7 @@
 "<emphasis remap=\"I\">Erlaubnis</emphasis>:<emphasis remap=\"I\">Benutzer</"
 "emphasis>:<emphasis remap=\"I\">Herkunft</emphasis>"
 
-#: login.access.5.xml:39(para)
+#: login.access.5.xml:69(para)
 msgid ""
 "The first field should be a \"<emphasis>+</emphasis>\" (access granted) or "
 "\"<emphasis>-</emphasis>\" (access denied) character. The second field "
@@ -5237,7 +5857,7 @@
 "\"<literal>.</literal>\" enthalten). Falls Sie NIS einsetzen, können Sie in "
 "den Host- und Benutzerangaben auch @netgroupname verwenden."
 
-#: login.access.5.xml:53(para)
+#: login.access.5.xml:83(para)
 msgid ""
 "The <emphasis>EXCEPT</emphasis> operator makes it possible to write very "
 "compact rules."
@@ -5245,7 +5865,7 @@
 "Der Operator <emphasis>EXCEPT</emphasis> ermöglicht es, sehr kurze Regeln zu "
 "schreiben."
 
-#: login.access.5.xml:58(para)
+#: login.access.5.xml:88(para)
 msgid ""
 "The group file is searched only when a name does not match that of the "
 "logged-in user. Only groups are matched in which users are explicitly "
@@ -5256,40 +5876,37 @@
 "nur festgestellt, wenn darin der Benutzer ausdrücklich aufgeführt ist. Das "
 "Programm beachtet also nicht den Wert der Hauptgruppe des Benutzers."
 
-#: login.1.xml:47(refpurpose)
+#: login.1.xml:76(refpurpose)
 msgid "begin session on the system"
 msgstr "startet eine Sitzung auf dem System"
 
-#: login.1.xml:53(arg) login.1.xml:60(arg) login.1.xml:66(arg)
-#: login.1.xml:178(option) groupmems.8.xml:24(arg) groupmems.8.xml:65(option)
+#: login.1.xml:82(arg) login.1.xml:90(arg) login.1.xml:97(arg)
+#: login.1.xml:214(option) groupmems.8.xml:54(arg)
 msgid "-p"
 msgstr "-p"
 
-#: login.1.xml:55(replaceable) login.1.xml:62(replaceable)
-msgid "username"
-msgstr "Benutzername"
-
-#: login.1.xml:56(replaceable)
-msgid "ENV=VAR"
-msgstr "ENV=VAR"
-
-#: login.1.xml:61(replaceable) login.1.xml:67(replaceable)
+#: login.1.xml:83(replaceable) login.1.xml:91(replaceable)
+#: login.1.xml:98(replaceable)
 msgid "host"
 msgstr "Host"
 
-#: login.1.xml:61(arg) chfn.1.xml:27(arg)
+#: login.1.xml:83(arg) login.1.xml:91(arg) chfn.1.xml:56(arg)
 msgid "-h <placeholder-1/>"
 msgstr "-h <placeholder-1/>"
 
-#: login.1.xml:62(arg) chfn.1.xml:24(arg)
-msgid "-f <placeholder-1/>"
-msgstr "-f <placeholder-1/>"
+#: login.1.xml:86(replaceable)
+msgid "ENV=VAR"
+msgstr "ENV=VAR"
 
-#: login.1.xml:67(arg) chfn.1.xml:25(arg)
+#: login.1.xml:92(arg) login.1.xml:192(option) expiry.1.xml:54(arg)
+msgid "-f"
+msgstr "-f"
+
+#: login.1.xml:98(arg) chfn.1.xml:54(arg)
 msgid "-r <placeholder-1/>"
 msgstr "-r <placeholder-1/>"
 
-#: login.1.xml:73(para)
+#: login.1.xml:104(para)
 #, fuzzy
 #| msgid ""
 #| "The <command>login</command> program is used to establish a new session "
@@ -5323,7 +5940,7 @@
 "aktuelle Shell verlassen muss. Der Versuch, von einer Shell außer der Login-"
 "Shell <command>login</command> auszuführen, wird eine Fehlermeldung erzeugen."
 
-#: login.1.xml:87(para)
+#: login.1.xml:118(para)
 msgid ""
 "The user is then prompted for a password, where appropriate. Echoing is "
 "disabled to prevent revealing the password. Only a small number of password "
@@ -5335,7 +5952,7 @@
 "kleine Anzahl von Anmeldeversuchen zulässig, ehe <command>login</command> "
 "abbricht und die Kommunikation getrennt wird."
 
-#: login.1.xml:94(para)
+#: login.1.xml:125(para)
 msgid ""
 "If password aging has been enabled for your account, you may be prompted for "
 "a new password before proceeding. You will be forced to provide your old "
@@ -5350,7 +5967,7 @@
 "refentrytitle><manvolnum>1</manvolnum></citerefentry> finden sich weitere "
 "Informationen."
 
-#: login.1.xml:103(para)
+#: login.1.xml:134(para)
 msgid ""
 "After a successful login, you will be informed of any system messages and "
 "the presence of mail. You may turn off the printing of the system message "
@@ -5369,7 +5986,7 @@
 "\"<emphasis>Sie haben Mails.</emphasis>\" oder \"<emphasis>Keine Mails.</"
 "emphasis>\"."
 
-#: login.1.xml:114(para)
+#: login.1.xml:145(para)
 msgid ""
 "Your user and group ID will be set according to their values in the "
 "<filename>/etc/passwd</filename> file. The value for <envar>$HOME</envar>, "
@@ -5385,7 +6002,7 @@
 "gesetzt. Werte für ulimit, umask und nice können ebenfalls gemäß den Werten "
 "im GECOS-Feld gesetzt werden."
 
-#: login.1.xml:123(para)
+#: login.1.xml:154(para)
 msgid ""
 "On some installations, the environmental variable <envar>$TERM</envar> will "
 "be initialized to the terminal type on your tty line, as specified in "
@@ -5395,7 +6012,7 @@
 "$TERM</envar> entsprechend dem Terminaltyp Ihrer tty-Zeile, wie sie in "
 "<filename>/etc/ttytype</filename> angegeben ist, gesetzt."
 
-#: login.1.xml:129(para)
+#: login.1.xml:160(para)
 msgid ""
 "An initialization script for your command interpreter may also be executed. "
 "Please see the appropriate manual section for more information on this "
@@ -5405,7 +6022,7 @@
 "ausgeführt werden. Sehen Sie bitte in den entsprechenden Handbuchseiten für "
 "weitere Informationen darüber nach."
 
-#: login.1.xml:141(para) login.1.xml:212(para)
+#: login.1.xml:172(para) login.1.xml:248(para)
 msgid ""
 "The <command>login</command> program is NOT responsible for removing users "
 "from the utmp file. It is the responsibility of "
@@ -5427,31 +6044,31 @@
 "verwenden, weiterhin als angemeldet erscheinen, obwohl Sie die Subsitzung "
 "abgemeldet haben."
 
-#: login.1.xml:161(option) groupadd.8.xml:27(arg) expiry.1.xml:24(arg)
-msgid "-f"
-msgstr "-f"
-
-#: login.1.xml:164(para)
+#: login.1.xml:195(para)
 msgid "Do not perform authentication, user is preauthenticated."
 msgstr "Keine Authentifizierung durchführen, Benutzer ist bereits angemeldet."
 
-#: login.1.xml:170(option)
+#: login.1.xml:198(para)
+msgid "Note: In that case, <replaceable>username</replaceable> is mandatory."
+msgstr ""
+
+#: login.1.xml:206(option)
 msgid "-h"
 msgstr "-h"
 
-#: login.1.xml:173(para)
+#: login.1.xml:209(para)
 msgid "Name of the remote host for this login."
 msgstr "Name des entfernten Rechners für die Anmeldung."
 
-#: login.1.xml:181(para)
+#: login.1.xml:217(para)
 msgid "Preserve environment."
 msgstr "Behalte die Umgebungseinstellungen bei."
 
-#: login.1.xml:189(para)
+#: login.1.xml:225(para)
 msgid "Perform autologin protocol for rlogin."
 msgstr "Führe das Autologin-Protokoll für rlogin aus."
 
-#: login.1.xml:194(para)
+#: login.1.xml:230(para)
 msgid ""
 "The <option>-r</option>, <option>-h</option> and <option>-f</option> options "
 "are only used when <command>login</command> is invoked by root."
@@ -5460,7 +6077,7 @@
 "option> können nur verwendet werden, wenn <command>login</command> von Root "
 "ausgeführt wird."
 
-#: login.1.xml:203(para)
+#: login.1.xml:239(para)
 msgid ""
 "This version of <command>login</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -5469,7 +6086,7 @@
 "Kompilierung, davon sind eventuell nur einige auf bestimmten Systemen in "
 "Gebrauch."
 
-#: login.1.xml:208(para)
+#: login.1.xml:244(para)
 msgid ""
 "The location of files is subject to differences in system configuration."
 msgstr ""
@@ -5477,7 +6094,7 @@
 "abweichen."
 
 # SB: In English version it should be "mechanism".
-#: login.1.xml:224(para)
+#: login.1.xml:260(para)
 #, fuzzy
 msgid ""
 "As with any program, <command>login</command>'s appearance can be faked. If "
@@ -5494,47 +6111,47 @@
 "den Benutzern verwendet werden, um einen vertrauenswürdigen Pfad zu "
 "erstellen und somit diesem Angriff zu entgehen."
 
-#: login.1.xml:289(filename)
+#: login.1.xml:325(filename)
 msgid "/var/log/wtmp"
 msgstr "/var/log/wtmp"
 
-#: login.1.xml:291(para)
+#: login.1.xml:327(para)
 msgid "List of previous login sessions."
 msgstr "Liste der vorangegangenen Login-Sitzungen"
 
-#: login.1.xml:307(filename)
+#: login.1.xml:343(filename)
 msgid "/etc/motd"
 msgstr "/etc/motd"
 
-#: login.1.xml:309(para)
+#: login.1.xml:345(para)
 msgid "System message of the day file."
 msgstr "Datei mit der Systemmeldung des Tages."
 
-#: login.1.xml:313(filename)
+#: login.1.xml:349(filename)
 msgid "/etc/nologin"
 msgstr "/etc/nologin"
 
-#: login.1.xml:315(para)
+#: login.1.xml:351(para)
 msgid "Prevent non-root users from logging in."
 msgstr "Verhindert, dass sich Benutzer außer Root anmelden."
 
-#: login.1.xml:319(filename)
+#: login.1.xml:355(filename)
 msgid "/etc/ttytype"
 msgstr "/etc/ttytype"
 
-#: login.1.xml:321(para)
+#: login.1.xml:357(para)
 msgid "List of terminal types."
 msgstr "Liste der Terminaltypen."
 
-#: login.1.xml:325(filename)
+#: login.1.xml:361(filename)
 msgid "$HOME/.hushlogin"
 msgstr "$HOME/.hushlogin"
 
-#: login.1.xml:327(para)
+#: login.1.xml:363(para)
 msgid "Suppress printing of system messages."
 msgstr "Unterdrückt die Ausgabe von Systemnachrichten."
 
-#: login.1.xml:335(para)
+#: login.1.xml:371(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5564,15 +6181,15 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getty</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: limits.5.xml:5(refentrytitle) limits.5.xml:10(refname)
+#: limits.5.xml:35(refentrytitle) limits.5.xml:40(refname)
 msgid "limits"
 msgstr "limits"
 
-#: limits.5.xml:11(refpurpose)
+#: limits.5.xml:41(refpurpose)
 msgid "resource limits definition"
 msgstr "Festlegung von Resourcenbeschränkungen"
 
-#: limits.5.xml:17(para)
+#: limits.5.xml:47(para)
 msgid ""
 "The <emphasis remap=\"I\">limits</emphasis> file (<filename>/etc/limits</"
 "filename> by default or LIMITS_FILE defined <filename>config.h</filename>) "
@@ -5584,7 +6201,7 @@
 "filename> festgelegt wurde) bezeichnet die Ressourcen-Beschränkungen, die "
 "Sie auferlegen wollen."
 
-#: limits.5.xml:25(para)
+#: limits.5.xml:55(para)
 msgid ""
 "By default no quota is imposed on 'root'. In fact, there is no way to impose "
 "limits via this procedure to root-equiv accounts (accounts with UID 0)."
@@ -5593,16 +6210,16 @@
 "keine Möglichkeit, mit diesem Verfahren Root-Konten (Konten mit der UID 0) "
 "Beschränkungen aufzuerlegen."
 
-#: limits.5.xml:31(para)
+#: limits.5.xml:61(para)
 msgid "Each line describes a limit for a user in the form:"
 msgstr ""
 "Jede Zeile beschreibt eine Beschränkung für einen Benutzer in der Form:"
 
-#: limits.5.xml:34(emphasis)
+#: limits.5.xml:64(emphasis)
 msgid "user LIMITS_STRING"
 msgstr "Benutzer LIMITS_STRING"
 
-#: limits.5.xml:37(para)
+#: limits.5.xml:67(para)
 msgid ""
 "The <emphasis>LIMITS_STRING</emphasis> is a string of a concatenated list of "
 "resource limits. Each limit consists of a letter identifier followed by a "
@@ -5612,53 +6229,53 @@
 "Beschränkungen. Jede Beschränkung besteht aus einer Buchstabenkennung, der "
 "eine zahlenmäßige Beschränkung folgt."
 
-#: limits.5.xml:43(para)
+#: limits.5.xml:73(para)
 msgid "The valid identifiers are:"
 msgstr "Gültige Kennungen sind:"
 
-#: limits.5.xml:46(para)
+#: limits.5.xml:76(para)
 msgid "A: max address space (KB)"
 msgstr "A: maximaler Adressraum (KB)"
 
 # SB: Uebersetzung von "core file"?
-#: limits.5.xml:47(para)
+#: limits.5.xml:77(para)
 msgid "C: max core file size (KB)"
 msgstr "C: maximale Größe der Speicherabbild-Datei"
 
-#: limits.5.xml:48(para)
+#: limits.5.xml:78(para)
 msgid "D: max data size (KB)"
 msgstr "D: maximale Datengröße "
 
-#: limits.5.xml:49(para)
+#: limits.5.xml:79(para)
 msgid "F: maximum filesize (KB)"
 msgstr "F: maximale Dateigröße (KB)"
 
-#: limits.5.xml:50(para)
+#: limits.5.xml:80(para)
 msgid "M: max locked-in-memory address space (KB)"
 msgstr "M: maximaler gesperrter Adressbereich im Speicher (KB)"
 
-#: limits.5.xml:51(para)
+#: limits.5.xml:81(para)
 msgid "N: max number of open files"
 msgstr "N: maximale Anzahl offener Dateien"
 
 # SB: Ich habe keine Ahnung, was das bedeuten soll!
-#: limits.5.xml:52(para)
+#: limits.5.xml:82(para)
 msgid "R: max resident set size (KB)"
 msgstr "R: maximale residente Satzgröße"
 
-#: limits.5.xml:53(para)
+#: limits.5.xml:83(para)
 msgid "S: max stack size (KB)"
 msgstr "S: maximale Größe des Stapelverarbeitungsspeichers (KB)"
 
-#: limits.5.xml:54(para)
+#: limits.5.xml:84(para)
 msgid "T: max CPU time (MIN)"
 msgstr "T: maximale CPU-Zeit (Min)"
 
-#: limits.5.xml:55(para)
+#: limits.5.xml:85(para)
 msgid "U: max number of processes"
 msgstr "U: maximale Anzahl von Prozessen"
 
-#: limits.5.xml:56(para)
+#: limits.5.xml:86(para)
 msgid ""
 "K: file creation mask, set by <citerefentry><refentrytitle>umask</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
@@ -5667,11 +6284,11 @@
 "<citerefentry><refentrytitle>umask</refentrytitle><manvolnum>2</manvolnum></"
 "citerefentry> gesetzt."
 
-#: limits.5.xml:61(para)
+#: limits.5.xml:91(para)
 msgid "L: max number of logins for this user"
 msgstr "L: maximale Anzahl von Logins für diesen Benutzer"
 
-#: limits.5.xml:62(para)
+#: limits.5.xml:92(para)
 msgid ""
 "P: process priority, set by <citerefentry><refentrytitle>setpriority</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
@@ -5679,26 +6296,31 @@
 "P: Prozesspriorität, wird von <citerefentry><refentrytitle>setpriority</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry> gesetzt."
 
-#: limits.5.xml:67(para)
+#: limits.5.xml:97(para)
 msgid "I: max nice value (0..39 which translates to 20..-19)"
 msgstr ""
 
-#: limits.5.xml:69(para)
+#: limits.5.xml:99(para)
 msgid "O: max real time priority"
 msgstr ""
 
 # SB: "LIMITS_STRING" übersetzen?
-#: limits.5.xml:72(para)
+#: limits.5.xml:102(para)
+#, fuzzy
+#| msgid ""
+#| "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
+#| "<emphasis>LIMITS_STRING </emphasis>. For reading convenience, the "
+#| "following entries are equivalent:"
 msgid ""
 "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
-"<emphasis>LIMITS_STRING </emphasis>. For reading convenience, the following "
+"<emphasis>LIMITS_STRING</emphasis>. For reading convenience, the following "
 "entries are equivalent:"
 msgstr ""
 "Zum Beispiel ist <emphasis remap=\"I\">L2D2048N5</emphasis> eine gültige "
 "<emphasis>LIMITS_STRING </emphasis>. Um das Lesen zu erleichtern, werden "
 "folgende Einträge gleich behandelt:"
 
-#: limits.5.xml:78(programlisting)
+#: limits.5.xml:108(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -5711,7 +6333,7 @@
 "      Benutzername L2 D2048 N5\n"
 "    "
 
-#: limits.5.xml:83(para)
+#: limits.5.xml:113(para)
 msgid ""
 "Be aware that after <emphasis remap=\"I\">username</emphasis> the rest of "
 "the line is considered a limit string, thus comments are not allowed. A "
@@ -5723,7 +6345,7 @@
 "sind daher nicht zulässig. Eine ungültige Zeichenkette wird von "
 "<command>login</command> ignoriert."
 
-#: limits.5.xml:90(para)
+#: limits.5.xml:120(para)
 msgid ""
 "The default entry is denoted by username \"<emphasis>*</emphasis>\". If you "
 "have multiple <emphasis remap=\"I\">default</emphasis> entries in your "
@@ -5735,7 +6357,7 @@
 "Werte in Ihrer <emphasis>LIMITS_FILE</emphasis> bestimmen, wird nur der "
 "letzte beachtet."
 
-#: limits.5.xml:97(para)
+#: limits.5.xml:127(para)
 msgid ""
 "To completely disable limits for a user, a single dash \"<emphasis>-</"
 "emphasis>\" will do."
@@ -5744,7 +6366,7 @@
 "Beschränkungen für einen Benutzer zu entfernen."
 
 # SB: Well, there is PAM with /etc/security/limits.conf
-#: limits.5.xml:102(para)
+#: limits.5.xml:132(para)
 msgid ""
 "Also, please note that all limit settings are set PER LOGIN. They are not "
 "global, nor are they permanent. Perhaps global limits will come, but for now "
@@ -5754,11 +6376,11 @@
 "Sie sind nicht global und auch nicht dauerhaft. Vielleicht wird es einmal "
 "globale Beschränkungen geben, für jetzt muss dies aber reichen ;)"
 
-#: limits.5.xml:113(filename)
+#: limits.5.xml:143(filename)
 msgid "/etc/limits"
 msgstr "/etc/limits"
 
-#: limits.5.xml:121(para)
+#: limits.5.xml:151(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>setpriority</"
@@ -5772,16 +6394,16 @@
 "<citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</"
 "manvolnum></citerefentry>."
 
-#: lastlog.8.xml:5(refentrytitle) lastlog.8.xml:10(refname)
-#: lastlog.8.xml:16(command)
+#: lastlog.8.xml:35(refentrytitle) lastlog.8.xml:40(refname)
+#: lastlog.8.xml:46(command)
 msgid "lastlog"
 msgstr "lastlog"
 
-#: lastlog.8.xml:11(refpurpose)
+#: lastlog.8.xml:41(refpurpose)
 msgid "reports the most recent login of all users or of a given user"
 msgstr "berichtet die letzte Anmeldung für alle oder einen bestimmten Benutzer"
 
-#: lastlog.8.xml:25(para)
+#: lastlog.8.xml:55(para)
 msgid ""
 "<command>lastlog</command> formats and prints the contents of the last login "
 "log <filename>/var/log/lastlog</filename> file. The <emphasis>login-name</"
@@ -5797,32 +6419,32 @@
 "Reihenfolge, in der sie sich in <filename>/etc/passwd</filename> befinden, "
 "ausgegeben."
 
-#: lastlog.8.xml:37(para)
+#: lastlog.8.xml:67(para)
 msgid "The options which apply to the <command>lastlog</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>lastlog</command> unterstützt werden, "
 "sind:"
 
-#: lastlog.8.xml:42(term)
+#: lastlog.8.xml:72(term)
 msgid ""
 "<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-b</option>, <option>--before</option><replaceable>TAGE</replaceable>"
 
-#: lastlog.8.xml:46(para)
+#: lastlog.8.xml:76(para)
 msgid ""
 "Print only lastlog records older than <emphasis remap=\"I\">DAYS</emphasis>."
 msgstr ""
 "Gibt nur Lastlog-Einträge aus, die älter als <emphasis remap=\"I\">TAGE</"
 "emphasis> sind."
 
-#: lastlog.8.xml:60(term) faillog.8.xml:93(term)
+#: lastlog.8.xml:90(term) faillog.8.xml:142(term)
 msgid ""
 "<option>-t</option>, <option>--time</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>TAGE</replaceable>"
 
-#: lastlog.8.xml:65(para)
+#: lastlog.8.xml:95(para)
 msgid ""
 "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</"
 "emphasis>."
@@ -5830,7 +6452,7 @@
 "Gibt nur Lastlog-Einträge aus, die neuer als <emphasis remap=\"I\">TAGE</"
 "emphasis> sind."
 
-#: lastlog.8.xml:72(term)
+#: lastlog.8.xml:102(term) faillog.8.xml:153(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-K</option>, <option>--key</option><replaceable>KEY</"
@@ -5842,7 +6464,7 @@
 "<option>-K</option>, <option>--key</option><replaceable>SCHLÜSSEL</"
 "replaceable>=<replaceable>WERT</replaceable>"
 
-#: lastlog.8.xml:77(para)
+#: lastlog.8.xml:107(para)
 #, fuzzy
 #| msgid ""
 #| "Print the lastlog record for user with specified <emphasis remap=\"I"
@@ -5852,7 +6474,7 @@
 "Gibt nur die Lastlog-Einträge für den Benutzer aus, der mit <emphasis remap="
 "\"I\">NAME</emphasis> festgelegt wurde."
 
-#: lastlog.8.xml:80(para)
+#: lastlog.8.xml:110(para) faillog.8.xml:163(para)
 msgid ""
 "The users can be specified by a login name, a numerical user ID, or a "
 "<replaceable>RANGE</replaceable> of users. This <replaceable>RANGE</"
@@ -5861,7 +6483,7 @@
 "UID_MAX</replaceable>), or a min value (<replaceable>UID_MIN-</replaceable>)."
 msgstr ""
 
-#: lastlog.8.xml:92(para)
+#: lastlog.8.xml:122(para)
 msgid ""
 "If the user has never logged in the message <emphasis>** Never logged in**</"
 "emphasis> will be displayed instead of the port and time."
@@ -5870,13 +6492,19 @@
 "<emphasis>** Never logged in**</emphasis> anstatt von Port und Zeit "
 "angezeigt."
 
-#: lastlog.8.xml:99(title) groups.1.xml:36(title) chsh.1.xml:77(title)
-#: chage.1.xml:164(title)
+#: lastlog.8.xml:127(para)
+msgid ""
+"Only the entries for the current users of the system will be displayed. "
+"Other entries may exist for users that were deleted previously."
+msgstr ""
+
+#: lastlog.8.xml:135(title) groups.1.xml:65(title) chsh.1.xml:106(title)
+#: chage.1.xml:193(title)
 msgid "NOTE"
 msgstr "ANMERKUNGEN"
 
 # SB: Übersetzung von "rotate", "sparse file"? Plus, I don't get the high UID stuff.
-#: lastlog.8.xml:100(para)
+#: lastlog.8.xml:136(para)
 msgid ""
 "The <filename>lastlog</filename> file is a database which contains info on "
 "the last login of each user. You should not rotate it. It is a sparse file, "
@@ -5894,15 +6522,15 @@
 "<filename>passwd</filename> befinden). Die wirkliche Dateigröße lässt sich "
 "mit \"<command>ls -s</command>\" anzeigen."
 
-#: lastlog.8.xml:114(filename)
+#: lastlog.8.xml:150(filename)
 msgid "/var/log/lastlog"
 msgstr "/var/log/lastlog"
 
-#: lastlog.8.xml:116(para)
+#: lastlog.8.xml:152(para)
 msgid "Database times of previous user logins."
 msgstr "Datenbank mit Zeiten der letzten Anmeldung der Benutzer."
 
-#: lastlog.8.xml:124(para)
+#: lastlog.8.xml:160(para)
 msgid ""
 "Large gaps in UID numbers will cause the lastlog program to run longer with "
 "no output to the screen (i.e. if in lastlog database there is no entries for "
@@ -5915,15 +6543,15 @@
 "befinden, wird es scheinen, dass lastlog stehen geblieben ist, während es "
 "die Einträge mit der UID 171-799 verarbeitet."
 
-#: gshadow.5.xml:5(refentrytitle) gshadow.5.xml:10(refname)
+#: gshadow.5.xml:33(refentrytitle) gshadow.5.xml:38(refname)
 msgid "gshadow"
 msgstr "gshadow"
 
-#: gshadow.5.xml:11(refpurpose)
+#: gshadow.5.xml:39(refpurpose)
 msgid "shadowed group file"
 msgstr "Datei für Shadow-Gruppen"
 
-#: gshadow.5.xml:16(para)
+#: gshadow.5.xml:44(para)
 msgid ""
 "<filename>/etc/gshadow</filename> contains the shadowed information for "
 "group accounts. It contains lines with the following colon-separated fields:"
@@ -5932,19 +6560,19 @@
 "Shadow-Gruppen-System. Die darin enthaltenen Zeilen haben folgende Felder, "
 "die durch Doppelpunkt getrennt sind:"
 
-#: gshadow.5.xml:23(para)
+#: gshadow.5.xml:51(para)
 msgid "group name"
 msgstr "Gruppenname"
 
-#: gshadow.5.xml:29(para)
+#: gshadow.5.xml:57(para)
 msgid "comma-separated list of group administrators"
 msgstr "Liste der Administratoren der Gruppe, durch Kommas getrennt"
 
-#: gshadow.5.xml:32(para)
+#: gshadow.5.xml:60(para)
 msgid "comma-separated list of group members"
 msgstr "Liste der Mitglieder der Gruppe, durch Kommas getrennt"
 
-#: gshadow.5.xml:36(para)
+#: gshadow.5.xml:64(para)
 msgid ""
 "The group name and password fields must be filled. The encrypted password "
 "consists of characters from the 64-character alphabet a thru z, A thru Z, 0 "
@@ -5969,33 +6597,48 @@
 "refentrytitle><manvolnum>7</manvolnum></citerefentry> eine abweichende "
 "Regelung treffen."
 
-#: gshadow.5.xml:49(para)
+#: gshadow.5.xml:77(para)
 msgid ""
 "This information supersedes any password present in <filename>/etc/group</"
 "filename>."
 msgstr ""
 "Diese Angaben gehen den Passwörtern in <filename>/etc/group</filename> vor."
 
-#: gshadow.5.xml:80(para)
+#: gshadow.5.xml:108(para)
 #, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>group</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>grpconv</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</manvolnum></"
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: grpck.8.xml:15(refpurpose)
+#: grpck.8.xml:44(refpurpose)
 msgid "verify integrity of group files"
 msgstr "überprüft die Stimmigkeit der Gruppendateien"
 
-#: grpck.8.xml:41(para)
+#: grpck.8.xml:70(para)
 #, fuzzy
 #| msgid ""
 #| "The <command>grpck</command> command verifies the integrity of the system "
@@ -6019,15 +6662,15 @@
 "Der Benutzer wird aufgefordert, Einträge zu löschen, die falsch formatiert "
 "sind oder andere unbehebbare Fehler enthalten."
 
-#: grpck.8.xml:58(para)
+#: grpck.8.xml:87(para)
 msgid "a unique group name"
 msgstr "einen eindeutigen Gruppennamen"
 
-#: grpck.8.xml:61(para)
+#: grpck.8.xml:90(para)
 msgid "a valid list of members and administrators"
 msgstr "eine gültige Liste der Mitglieder und Administratoren"
 
-#: grpck.8.xml:65(para)
+#: grpck.8.xml:94(para)
 msgid ""
 "The checks for correct number of fields and unique group name are fatal. If "
 "the entry has the wrong number of fields, the user will be prompted to "
@@ -6047,7 +6690,7 @@
 "Fehlern wird eine Warnung abgegeben und der Benutzer aufgefordert, den "
 "Fehler mittels des Befehls <command>groupmod</command> zu beheben."
 
-#: grpck.8.xml:76(para)
+#: grpck.8.xml:105(para)
 msgid ""
 "The commands which operate on the <filename>/etc/group</filename> file are "
 "not able to alter corrupted or duplicated entries. <command>grpck</command> "
@@ -6058,7 +6701,7 @@
 "sollte <command>grpwck</command> verwendet werden, um den betreffenden "
 "Eintrag zu entfernen."
 
-#: grpck.8.xml:86(para)
+#: grpck.8.xml:115(para)
 #, fuzzy
 #| msgid "The options which apply to the <command>pwck</command> command are:"
 msgid "The options which apply to the <command>grpck</command> command are:"
@@ -6066,14 +6709,14 @@
 "Die Optionen, die vom Befehl <command>pwck</command> unterstützt werden, "
 "sind:"
 
-#: grpck.8.xml:93(para)
+#: grpck.8.xml:122(para)
 msgid ""
 "Execute the <command>grpck</command> command in read-only mode. This causes "
 "all questions regarding changes to be answered <emphasis>no</emphasis> "
 "without user intervention."
 msgstr ""
 
-#: grpck.8.xml:103(para)
+#: grpck.8.xml:132(para)
 #, fuzzy
 #| msgid ""
 #| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
@@ -6085,7 +6728,7 @@
 "Ordnet die Einträge in <filename>/etc/passwd</filename> und <filename>/etc/"
 "shadow</filename> nach der UID."
 
-#: grpck.8.xml:112(para)
+#: grpck.8.xml:141(para)
 #, fuzzy
 #| msgid ""
 #| "By default, <command>pwck</command> operates on the files <filename>/etc/"
@@ -6105,53 +6748,56 @@
 "kann andere Dateien mit den Parametern <emphasis remap=\"I\">passwd</"
 "emphasis> und <emphasis remap=\"I\">shadow</emphasis> auswählen."
 
-#: grpck.8.xml:162(para)
+#: grpck.8.xml:191(para)
 #, fuzzy
 #| msgid ""
-#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
-#| "citerefentry>, <citerefentry><refentrytitle>group</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>."
+#| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>login</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum>, </"
-"citerefentry><citerefentry><refentrytitle>passwd</"
+"citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
+"condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum>, </citerefentry><citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>groupmod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>shadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>group</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
+"<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gshadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: grpck.8.xml:201(para)
+#: grpck.8.xml:233(para)
 msgid "one or more bad group entries"
 msgstr "ein oder mehrere fehlerhafte Gruppeneinträge"
 
-#: grpck.8.xml:207(para)
+#: grpck.8.xml:239(para)
 msgid "can't open group files"
 msgstr "kann die Gruppendatei nicht öffnen"
 
-#: grpck.8.xml:213(para)
+#: grpck.8.xml:245(para)
 msgid "can't lock group files"
 msgstr "kann die Gruppendatei nicht sperren"
 
-#: grpck.8.xml:219(para)
+#: grpck.8.xml:251(para)
 msgid "can't update group files"
 msgstr "kann die Gruppendatei nicht aktualisieren"
 
-#: grpck.8.xml:183(para)
+#: grpck.8.xml:215(para)
 msgid ""
 "The <command>grpck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6159,21 +6805,20 @@
 "Der Befehl <command>grpck</command> gibt beim Beenden folgende Werte zurück: "
 "<placeholder-1/>"
 
-#: groups.1.xml:5(refentrytitle) groups.1.xml:10(refname)
-#: groups.1.xml:16(command)
+#: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
+#: groups.1.xml:45(command)
 msgid "groups"
 msgstr "groups"
 
-#: groups.1.xml:11(refpurpose)
+#: groups.1.xml:40(refpurpose)
 msgid "display current group names"
 msgstr "zeigt die aktuell verwendeten Gruppennamen an"
 
-#: groups.1.xml:18(replaceable) gpasswd.1.xml:94(replaceable)
-#: gpasswd.1.xml:107(replaceable) chfn.1.xml:29(replaceable)
+#: groups.1.xml:47(replaceable) chfn.1.xml:58(replaceable)
 msgid "user"
 msgstr "Benutzer"
 
-#: groups.1.xml:25(para)
+#: groups.1.xml:54(para)
 msgid ""
 "The <command>groups</command> command displays the current group names or ID "
 "values. If the value does not have a corresponding entry in <filename>/etc/"
@@ -6188,7 +6833,7 @@
 "bezeichneten <emphasis remap=\"I\">Benutzers</emphasis> angezeigt."
 
 # SB: Übersetzung von "concurrent group set", "real and effective group ID"? Plus, is should be "his current".
-#: groups.1.xml:37(para)
+#: groups.1.xml:66(para)
 msgid ""
 "Systems which do not support concurrent group sets will have the information "
 "from <filename>/etc/group</filename> reported. The user must use "
@@ -6200,7 +6845,7 @@
 "Benutzer seine Gruppen-ID ändern will, muss er <command>newgrp</command> "
 "oder <command>sg</command> verwenden."
 
-#: groups.1.xml:59(para)
+#: groups.1.xml:88(para)
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getgid</"
@@ -6216,15 +6861,15 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getuid</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 
-#: groupmod.8.xml:15(refpurpose)
+#: groupmod.8.xml:44(refpurpose)
 msgid "modify a group definition on the system"
 msgstr "verändert die Eigenschaften einer Gruppe auf dem System"
 
-#: groupmod.8.xml:24(replaceable)
+#: groupmod.8.xml:53(replaceable)
 msgid "GROUP"
 msgstr "GRUPPE"
 
-#: groupmod.8.xml:30(para)
+#: groupmod.8.xml:59(para)
 msgid ""
 "The <command>groupmod</command> command modifies the definition of the "
 "specified <replaceable>GROUP</replaceable> by modifying the appropriate "
@@ -6234,19 +6879,19 @@
 "angegebenen <replaceable>GRUPPE</replaceable>, indem die passenden Einträge "
 "in der Gruppendatenbank geändert werden."
 
-#: groupmod.8.xml:39(para)
+#: groupmod.8.xml:68(para)
 msgid "The options which apply to the <command>groupmod</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>groupmod</command> unterstützt werden, "
 "sind:"
 
-#: groupmod.8.xml:45(term) groupadd.8.xml:66(term)
+#: groupmod.8.xml:74(term) groupadd.8.xml:92(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 
-#: groupmod.8.xml:49(para)
+#: groupmod.8.xml:78(para)
 #, fuzzy
 msgid ""
 "The group ID of the given <replaceable>GROUP</replaceable> will be changed "
@@ -6264,7 +6909,7 @@
 "zwischen 0 und 999 für Systemgruppen reserviert. Alle Dateien, die der alten "
 "Gruppen-ID angehören, müssen von Hand der neuen Gruppen-ID zugewiesen werden."
 
-#: groupmod.8.xml:70(term)
+#: groupmod.8.xml:99(term)
 msgid ""
 "<option>-n</option>, <option>--new-name</option><replaceable>NEW_GROUP</"
 "replaceable>"
@@ -6272,7 +6917,7 @@
 "<option>-n</option>, <option>--new-name</option><replaceable>NEUE_GRUPPE</"
 "replaceable>"
 
-#: groupmod.8.xml:75(para)
+#: groupmod.8.xml:104(para)
 msgid ""
 "The name of the group will be changed from <replaceable>GROUP</replaceable> "
 "to <replaceable>NEW_GROUP</replaceable> name."
@@ -6280,7 +6925,7 @@
 "Der Gruppenname wird vom Namen <replaceable>GRUPPE</replaceable> auf "
 "<replaceable>NEUE_GRUPPE</replaceable> geändert."
 
-#: groupmod.8.xml:86(para)
+#: groupmod.8.xml:115(para)
 #, fuzzy
 msgid ""
 "When used with the <option>-g</option> option, allow to change the group "
@@ -6290,7 +6935,7 @@
 "Option der Wert der Gruppen-<replaceable>GID</replaceable> auf einen nicht "
 "eindeutigen Wert gesetzt werden."
 
-#: groupmod.8.xml:98(para) groupadd.8.xml:122(para)
+#: groupmod.8.xml:127(para) groupadd.8.xml:148(para)
 #, fuzzy
 #| msgid ""
 #| "The encrypted password, as returned by "
@@ -6305,11 +6950,11 @@
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> zurückgegeben wird. "
 "Standardmäßig ist das Konto abgeschaltet."
 
-#: groupmod.8.xml:176(para)
+#: groupmod.8.xml:205(para)
 msgid "group name already in use"
 msgstr "Gruppenname wird schon verwendet"
 
-#: groupmod.8.xml:140(para)
+#: groupmod.8.xml:169(para)
 msgid ""
 "The <command>groupmod</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6317,7 +6962,7 @@
 "Der Befehl <command>groupmod</command> gibt beim Beenden folgende Werte "
 "zurück: <placeholder-1/>"
 
-#: groupmod.8.xml:191(para)
+#: groupmod.8.xml:220(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6349,33 +6994,36 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: groupmems.8.xml:15(refpurpose)
+#: groupmems.8.xml:44(refpurpose)
 msgid "administer members of a user's primary group"
 msgstr "verwaltet die Mitglieder der Hauptgruppe eines Benutzers"
 
-#: groupmems.8.xml:22(replaceable) groupmems.8.xml:23(replaceable)
-#: groupmems.8.xml:53(replaceable) groupmems.8.xml:59(replaceable)
+#: groupmems.8.xml:51(replaceable) groupmems.8.xml:52(replaceable)
 msgid "user_name"
 msgstr "Benutzer_Name"
 
-#: groupmems.8.xml:22(arg)
+#: groupmems.8.xml:51(arg)
 msgid "-a <placeholder-1/>"
 msgstr "-a <placeholder-1/>"
 
-#: groupmems.8.xml:23(arg)
+#: groupmems.8.xml:52(arg)
 msgid "-d <placeholder-1/>"
 msgstr "-d <placeholder-1/>"
 
-#: groupmems.8.xml:25(replaceable) groupmems.8.xml:71(replaceable)
+#: groupmems.8.xml:53(replaceable)
 msgid "group_name"
 msgstr "Gruppen_Name"
 
-#: groupmems.8.xml:25(arg) groupadd.8.xml:24(arg)
+#: groupmems.8.xml:53(arg)
 msgid "-g <placeholder-1/>"
 msgstr "-g <placeholder-1/>"
 
+#: groupmems.8.xml:54(arg)
+msgid "-l"
+msgstr "-l"
+
 # SB: A few things: 1. Does groupmems allow to administer the user's membership or the membership of the user's primary group? 2. I don't understand "sake"? A typo? But of what? 3. I think we shouldn't have the notorious guest account here as an example.
-#: groupmems.8.xml:32(para)
+#: groupmems.8.xml:61(para)
 msgid ""
 "The <command>groupmems</command> command allows a user to administer his/her "
 "own group membership list without the requirement of superuser privileges. "
@@ -6389,7 +7037,7 @@
 "fritz/fritz)."
 
 # SB: Sounds more like my second thought.
-#: groupmems.8.xml:40(para)
+#: groupmems.8.xml:69(para)
 msgid ""
 "Only the superuser, as administrator, can use <command>groupmems</command> "
 "to alter the memberships of other groups."
@@ -6397,52 +7045,97 @@
 "Nur Root als Administrator kann mit <command>groupmems</command> die "
 "Mitgliederliste anderer Gruppen bearbeiten."
 
-#: groupmems.8.xml:47(para)
+#: groupmems.8.xml:76(para)
 msgid ""
 "The options which apply to the <command>groupmems</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>groupmems</command> unterstützt "
 "werden, sind:"
 
-#: groupmems.8.xml:53(option) gpasswd.1.xml:94(option)
-msgid "-a"
-msgstr "-a"
+#: groupmems.8.xml:82(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+msgid ""
+"<option>-a</option>, <option>--add</option><replaceable>user_name</"
+"replaceable>"
+msgstr ""
+"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: groupmems.8.xml:55(para)
-msgid "Add a new user to the group membership list."
+#: groupmems.8.xml:84(para)
+#, fuzzy
+#| msgid "Add a new user to the group membership list."
+msgid "Add an user to the group membership list."
 msgstr "Fügt einen neuen Benutzer der Mitgliederliste der Gruppe hinzu."
 
-#: groupmems.8.xml:59(option) gpasswd.1.xml:107(option)
-msgid "-d"
-msgstr "-d"
+#: groupmems.8.xml:85(para) groupmems.8.xml:101(para)
+#: groupmems.8.xml:126(para)
+msgid ""
+"If the <filename>/etc/gshadow</filename> file exist, and the group has no "
+"entry in the <filename>/etc/gshadow</filename> file, a new entry will be "
+"created."
+msgstr ""
 
-#: groupmems.8.xml:61(para)
+#: groupmems.8.xml:93(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-d</option>, <option>--delete</option><replaceable>user_name</"
+"replaceable>"
+msgstr ""
+"<option>-t</option>, <option>--time</option><replaceable>TAGE</replaceable>"
+
+#: groupmems.8.xml:95(para)
 msgid "Delete a user from the group membership list."
 msgstr "Löscht einen Benutzer aus der Mitgliederliste der Gruppe."
 
-#: groupmems.8.xml:67(para)
-msgid "Purge all users from the group membership list."
-msgstr "Löscht alle Benutzer aus der Mitgliederliste der Gruppe."
+#: groupmems.8.xml:96(para)
+msgid ""
+"If the <filename>/etc/gshadow</filename> file exist, the user will be "
+"removed from the list of members and administrators of the group."
+msgstr ""
 
-#: groupmems.8.xml:71(option)
-msgid "-g"
-msgstr "-g"
+#: groupmems.8.xml:109(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
+msgid ""
+"<option>-g</option>, <option>--group</option><replaceable>group_name</"
+"replaceable>"
+msgstr ""
+"<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 
-#: groupmems.8.xml:73(para)
+#: groupmems.8.xml:111(para)
 msgid "The superuser can specify which group membership list to modify."
 msgstr ""
 "Root kann eine Gruppen bestimmen, deren Mitgliederliste er bearbeiten will."
 
-#: groupmems.8.xml:81(para)
+#: groupmems.8.xml:117(term) chage.1.xml:128(term)
+msgid "<option>-l</option>, <option>--list</option>"
+msgstr "<option>-l</option>, <option>--list</option>"
+
+#: groupmems.8.xml:119(para)
 msgid "List the group membership list."
 msgstr "Gibt die Mitgliederliste aus."
 
-#: groupmems.8.xml:88(title)
+#: groupmems.8.xml:123(term)
+#, fuzzy
+#| msgid "<option>-e</option>, <option>--expire</option>"
+msgid "<option>-p</option>, <option>--purge</option>"
+msgstr "<option>-e</option>, <option>--expire</option>"
+
+#: groupmems.8.xml:125(para)
+msgid "Purge all users from the group membership list."
+msgstr "Löscht alle Benutzer aus der Mitgliederliste der Gruppe."
+
+#: groupmems.8.xml:137(title)
 msgid "SETUP"
 msgstr "INSTALLATION"
 
 # SB: "own group membership list" - same as above
-#: groupmems.8.xml:89(para)
+#: groupmems.8.xml:138(para)
 msgid ""
 "The <command>groupmems</command> executable should be in mode <literal>2770</"
 "literal> as user <emphasis>root</emphasis> and in group <emphasis>groups</"
@@ -6457,7 +7150,7 @@
 "ermöglichen, mit <command>groupmems</command> die Mitgliederliste ihrer "
 "eigenen Gruppe zu verwalten."
 
-#: groupmems.8.xml:98(programlisting)
+#: groupmems.8.xml:147(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -6475,11 +7168,11 @@
 "    "
 
 # type: Plain text
-#: groupmems.8.xml:130(para)
+#: groupmems.8.xml:179(para)
 msgid "secure group account information"
 msgstr "Verschlüsselte Informationen zu den Gruppenkonten"
 
-#: groupmems.8.xml:138(para)
+#: groupmems.8.xml:187(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6507,11 +7200,11 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: groupdel.8.xml:15(refpurpose)
+#: groupdel.8.xml:44(refpurpose)
 msgid "delete a group"
 msgstr "löscht eine Gruppe"
 
-#: groupdel.8.xml:29(para)
+#: groupdel.8.xml:58(para)
 msgid ""
 "The <command>groupdel</command> command modifies the system account files, "
 "deleting all entries that refer to <emphasis remap=\"I\">group</emphasis>. "
@@ -6521,7 +7214,7 @@
 "Systems und löscht darin alle Einträge, die auf die <emphasis remap=\"I"
 "\">Gruppe</emphasis> verweisen. Die bezeichnete Gruppe muss existieren."
 
-#: groupdel.8.xml:34(para)
+#: groupdel.8.xml:63(para)
 msgid ""
 "You must manually check all file systems to insure that no files remain with "
 "the named group as the file group ID."
@@ -6529,7 +7222,7 @@
 "Sie sollten von Hand alle Systemdateien überprüfen, um sicherzustellen, dass "
 "keine Dateien, die der gelöschten Gruppe angehören, vorhanden sind."
 
-#: groupdel.8.xml:41(para)
+#: groupdel.8.xml:70(para)
 msgid ""
 "You may not remove the primary group of any existing user. You must remove "
 "the user before you remove the group."
@@ -6537,11 +7230,11 @@
 "Sie können nicht die Hauptgruppe eines Benutzers entfernen. Dazu müssten Sie "
 "zunächst den betreffenden Benutzer löschen."
 
-#: groupdel.8.xml:102(para)
+#: groupdel.8.xml:131(para)
 msgid "can't remove user's primary group"
 msgstr "kann die Hauptgruppe eines Benutzers nicht entfernen"
 
-#: groupdel.8.xml:78(para)
+#: groupdel.8.xml:107(para)
 msgid ""
 "The <command>groupdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6549,7 +7242,7 @@
 "Der Befehl <command>groupdel</command> gibt beim Beenden folgende Werte "
 "zurück: <placeholder-1/>"
 
-#: groupdel.8.xml:117(para)
+#: groupdel.8.xml:146(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6581,31 +7274,11 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>"
 
-#: groupadd.8.xml:17(refpurpose)
+#: groupadd.8.xml:48(refpurpose)
 msgid "create a new group"
 msgstr "erstellt eine neue Gruppe"
 
-#: groupadd.8.xml:24(replaceable)
-msgid "GID"
-msgstr "GID"
-
-#: groupadd.8.xml:25(arg)
-msgid "-o"
-msgstr "-o"
-
-#: groupadd.8.xml:28(replaceable)
-msgid "KEY"
-msgstr "SCHLÜSSEL"
-
-#: groupadd.8.xml:28(replaceable)
-msgid "VALUE"
-msgstr "WERT"
-
-#: groupadd.8.xml:28(arg)
-msgid "-K <placeholder-1/>=<placeholder-2/>"
-msgstr "-K <placeholder-1/>=<placeholder-2/>"
-
-#: groupadd.8.xml:37(para)
+#: groupadd.8.xml:63(para)
 #, fuzzy
 msgid ""
 "The <command>groupadd</command> command creates a new group account using "
@@ -6617,13 +7290,13 @@
 "oder die Standardwerte des Systems. Soweit es notwendig ist, wird die neue "
 "Gruppe den Systemdateien hinzugefügt."
 
-#: groupadd.8.xml:46(para)
+#: groupadd.8.xml:72(para)
 msgid "The options which apply to the <command>groupadd</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>groupadd</command> unterstützt werden, "
 "sind:"
 
-#: groupadd.8.xml:56(para)
+#: groupadd.8.xml:82(para)
 #, fuzzy
 msgid ""
 "This option causes the command to simply exit with success status if the "
@@ -6637,7 +7310,7 @@
 "angegebene GID schon vergeben ist, wird eine anderen (eindeutige) GID "
 "gewählt (d.h. <option>-g</option> wird nicht beachtet)."
 
-#: groupadd.8.xml:70(para)
+#: groupadd.8.xml:96(para)
 msgid ""
 "The numerical value of the group's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. The "
@@ -6651,7 +7324,7 @@
 "größer als jeder andere Wert einer Gruppe verwendet. Typischerweise sind "
 "Werte zwischen 0 und 999 für Systemkonten reserviert."
 
-#: groupadd.8.xml:90(para)
+#: groupadd.8.xml:116(para)
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (GID_MIN, GID_MAX "
 "and others). Multiple <option>-K</option> options can be specified."
@@ -6659,7 +7332,7 @@
 "Überschreibt die Standardwerte von <filename>/etc/login.defs</filename> "
 "(GID_MIN, GID_MAX und weitere). Diese Option kann mehrfach verwendet werden."
 
-#: groupadd.8.xml:95(para)
+#: groupadd.8.xml:121(para)
 msgid ""
 "Example: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>100</replaceable><option> -K </"
@@ -6669,7 +7342,7 @@
 "replaceable>=<replaceable>100</replaceable><option> -K </"
 "option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 
-#: groupadd.8.xml:99(para)
+#: groupadd.8.xml:125(para)
 msgid ""
 "Note: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</"
@@ -6679,18 +7352,18 @@
 "replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</"
 "replaceable>=<replaceable>499</replaceable> funktioniert noch nicht."
 
-#: groupadd.8.xml:111(para)
+#: groupadd.8.xml:137(para)
 #, fuzzy
 msgid "This option permits to add a group with a non-unique GID."
 msgstr "Erlaubt es, eine Gruppe mit einer nicht eindeutigen GID zu erstellen."
 
-#: groupadd.8.xml:134(para)
+#: groupadd.8.xml:160(para)
 #, fuzzy
 #| msgid "create a new group"
 msgid "Create a system group."
 msgstr "erstellt eine neue Gruppe"
 
-#: groupadd.8.xml:137(para)
+#: groupadd.8.xml:163(para)
 msgid ""
 "The numeric identifiers of new system groups are choosen in the "
 "<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
@@ -6698,21 +7371,28 @@
 "<option>GID_MAX</option>."
 msgstr ""
 
-#: groupadd.8.xml:188(para)
+#: groupadd.8.xml:214(para)
+#, fuzzy
+#| msgid ""
+#| "Groupnames must begin with a lower case letter or an underscore, and only "
+#| "lower case letters, underscores, dashes, and dollar signs may follow. In "
+#| "regular expression terms: [a-z_][a-z0-9_-]*[$]"
 msgid ""
 "Groupnames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
-"regular expression terms: [a-z_][a-z0-9_-]*[$]"
+"regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 "Gruppennamen müssen mit einem Kleinbuchstaben oder einem Unterstrich "
 "beginnen. Sie dürfen nur Kleinbuchstaben, Unterstriche, Gedankenstriche oder "
 "Dollarzeichen enthalten. Als regulärer Ausdruck: [a-z_][a-z0-9_-]*[$]"
 
-#: groupadd.8.xml:193(para)
-msgid "Groupnames may only be up to 16 characters long."
+#: groupadd.8.xml:219(para)
+#, fuzzy
+#| msgid "Groupnames may only be up to 16 characters long."
+msgid "Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long."
 msgstr "Gruppennamen dürfen nur bis zu 16 Zeichen lang sein."
 
-#: groupadd.8.xml:196(para)
+#: groupadd.8.xml:222(para)
 #, fuzzy
 msgid ""
 "You may not add a NIS or LDAP group. This must be performed on the "
@@ -6721,7 +7401,7 @@
 "Sie dürfen einen Benutzer nicht einer NIS-Gruppe hinzufügen. Dies muss auf "
 "dem NIS-Server durchgeführt werden."
 
-#: groupadd.8.xml:200(para)
+#: groupadd.8.xml:226(para)
 #, fuzzy
 msgid ""
 "If the groupname already exists in an external group database such as NIS or "
@@ -6730,15 +7410,15 @@
 "Falls der Gruppenname bereits in einer externen Datenbank (wie etwa NIS) "
 "vergeben ist, wird <command>groupadd</command> die Gruppe nicht erstellen."
 
-#: groupadd.8.xml:233(para)
+#: groupadd.8.xml:259(para)
 msgid "GID not unique (when <option>-o</option> not used)"
 msgstr "GID nicht eindeutig (wenn <option>-o</option> nicht angegeben wird)"
 
-#: groupadd.8.xml:239(para)
+#: groupadd.8.xml:265(para)
 msgid "group name not unique"
 msgstr "Gruppenname nicht eindeutig"
 
-#: groupadd.8.xml:209(para)
+#: groupadd.8.xml:235(para)
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6746,7 +7426,7 @@
 "Der Befehl <command>groupadd</command> gibt beim Beenden folgende Werte "
 "zurück: <placeholder-1/>"
 
-#: groupadd.8.xml:254(para)
+#: groupadd.8.xml:280(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6780,26 +7460,26 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:21(phrase)
+#: gpasswd.1.xml:50(phrase)
 #, fuzzy
 msgid "and <placeholder-1/> files"
 msgstr "-a <placeholder-1/>"
 
-#: gpasswd.1.xml:23(phrase)
+#: gpasswd.1.xml:52(phrase)
 msgid "file"
 msgstr ""
 
-#: gpasswd.1.xml:19(refpurpose)
+#: gpasswd.1.xml:48(refpurpose)
 #, fuzzy
 msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
 msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
-#: gpasswd.1.xml:31(replaceable)
+#: gpasswd.1.xml:60(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "Optionen"
 
-#: gpasswd.1.xml:41(para)
+#: gpasswd.1.xml:70(para)
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
 "group</filename><phrase condition=\"gshadow\">, and <filename>/etc/gshadow</"
@@ -6807,7 +7487,7 @@
 "\">administrators,</phrase> members and a password."
 msgstr ""
 
-#: gpasswd.1.xml:49(para)
+#: gpasswd.1.xml:78(para)
 #, fuzzy
 msgid ""
 "System administrator can use the <option>-A</option> option to define group "
@@ -6822,7 +7502,7 @@
 "festlegen. Mit der Option <option>-M</option> legt er die Mitglieder fest. "
 "Er besitzt alle Rechte, die Administratoren und Mitglieder haben können."
 
-#: gpasswd.1.xml:54(para)
+#: gpasswd.1.xml:83(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -6830,7 +7510,7 @@
 "of the <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:61(para)
+#: gpasswd.1.xml:90(para)
 #, fuzzy
 msgid ""
 "If a password is set the members can still "
@@ -6844,11 +7524,11 @@
 "refentrytitle><manvolnum>1</manvolnum></citerefentry> ausführen. Alle "
 "anderen Benutzer benötigen dazu das Passwort."
 
-#: gpasswd.1.xml:69(title)
+#: gpasswd.1.xml:98(title)
 msgid "Notes about group passwords"
 msgstr "Hinweise zu Gruppenpasswörtern"
 
-#: gpasswd.1.xml:70(para)
+#: gpasswd.1.xml:99(para)
 msgid ""
 "Group passwords are an inherent security problem since more than one person "
 "is permitted to know the password. However, groups are a useful tool for "
@@ -6858,7 +7538,7 @@
 "Personen das Passwort kennen. Dennoch sind sie eine sinnvolle Einrichtung, "
 "um die Zusammenarbeit zwischen Benutzern zu erleichtern."
 
-#: gpasswd.1.xml:81(para)
+#: gpasswd.1.xml:110(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
@@ -6868,77 +7548,114 @@
 "option> können nur verwendet werden, wenn <command>login</command> von Root "
 "ausgeführt wird."
 
-#: gpasswd.1.xml:85(para)
+#: gpasswd.1.xml:114(para)
 msgid "The options cannot be combined."
 msgstr ""
 
-#: gpasswd.1.xml:88(para)
+#: gpasswd.1.xml:117(para)
 #, fuzzy
 msgid "The options which apply to the <command>gpasswd</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>passwd</command> unterstützt werden, "
 "sind:"
 
-#: gpasswd.1.xml:97(para)
+#: gpasswd.1.xml:122(term)
 #, fuzzy
+#| msgid ""
+#| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgid ""
+"<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
+msgstr ""
+"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+
+#: gpasswd.1.xml:126(para)
+#, fuzzy
+msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
 "replaceable>."
 msgstr ""
 "Der Gruppenname wird vom Namen <replaceable>GRUPPE</replaceable> auf "
 "<replaceable>NEUE_GRUPPE</replaceable> geändert."
 
-#: gpasswd.1.xml:110(para)
+#: gpasswd.1.xml:135(term)
 #, fuzzy
+#| msgid ""
+#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
+#| "replaceable>"
 msgid ""
+"<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
+msgstr ""
+"<option>-t</option>, <option>--time</option><replaceable>TAGE</replaceable>"
+
+#: gpasswd.1.xml:139(para)
+#, fuzzy
+msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
 "<replaceable>group</replaceable>."
 msgstr ""
 "Der Gruppenname wird vom Namen <replaceable>GRUPPE</replaceable> auf "
 "<replaceable>NEUE_GRUPPE</replaceable> geändert."
 
-#: gpasswd.1.xml:123(para)
+#: gpasswd.1.xml:148(term)
+#, fuzzy
+#| msgid "<option>-r</option>, <option>--remove</option>"
+msgid "<option>-r</option>, <option>--remove-password</option>"
+msgstr "<option>-r</option>, <option>--remove</option>"
+
+#: gpasswd.1.xml:152(para)
 msgid ""
 "Remove the password from the named <replaceable>group</replaceable>. Only "
 "group members will be allowed to use <command>newgrp</command> to join the "
 "named <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:135(option)
+#: gpasswd.1.xml:163(term)
 #, fuzzy
-msgid "-R"
-msgstr "-"
+#| msgid "<option>-r</option>, <option>--reset</option>"
+msgid "<option>-R</option>, <option>--restrict</option>"
+msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: gpasswd.1.xml:138(para)
+#: gpasswd.1.xml:167(para)
 msgid ""
 "Restrict the access to the named <replaceable>group</replaceable>. Only "
 "group members will be allowed to use <command>newgrp</command> to join the "
 "named <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:149(term)
+#: gpasswd.1.xml:178(term)
 #, fuzzy
-msgid "<option>-A</option><replaceable>user</replaceable>,..."
+#| msgid ""
+#| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-A</option>, <option>--administrators</option><replaceable>user</"
+"replaceable>,..."
 msgstr ""
-"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+"<option>-m</option>, <option>--mindays</option><replaceable>MIN_TAGE</"
+"replaceable>"
 
-#: gpasswd.1.xml:153(para)
+#: gpasswd.1.xml:182(para)
 #, fuzzy
 msgid "Set the list of administrative users."
 msgstr "Liste der Administratoren der Gruppe, durch Kommas getrennt"
 
-#: gpasswd.1.xml:161(term)
+#: gpasswd.1.xml:190(term)
 #, fuzzy
-msgid "<option>-M</option><replaceable>user</replaceable>,..."
+#| msgid ""
+#| "<option>-b</option>, <option>--before</option><replaceable>DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-M</option>, <option>--members</option><replaceable>user</"
+"replaceable>,..."
 msgstr ""
-"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+"<option>-b</option>, <option>--before</option><replaceable>TAGE</replaceable>"
 
-#: gpasswd.1.xml:165(para)
+#: gpasswd.1.xml:194(para)
 #, fuzzy
 msgid "Set the list of group members."
 msgstr "Liste der Mitglieder der Gruppe, durch Kommas getrennt"
 
-#: gpasswd.1.xml:175(para)
+#: gpasswd.1.xml:204(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -6947,7 +7664,7 @@
 "server."
 msgstr ""
 
-#: gpasswd.1.xml:220(para)
+#: gpasswd.1.xml:249(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
@@ -6974,19 +7691,19 @@
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: faillog.8.xml:5(refentrytitle) faillog.8.xml:10(refname)
-#: faillog.8.xml:16(command) faillog.5.xml:5(refentrytitle)
-#: faillog.5.xml:10(refname) faillog.5.xml:53(refentrytitle)
+#: faillog.8.xml:34(refentrytitle) faillog.8.xml:39(refname)
+#: faillog.8.xml:45(command) faillog.5.xml:34(refentrytitle)
+#: faillog.5.xml:39(refname) faillog.5.xml:82(refentrytitle)
 msgid "faillog"
 msgstr "faillog"
 
-#: faillog.8.xml:11(refpurpose)
+#: faillog.8.xml:40(refpurpose)
 msgid "display faillog records or set login failure limits"
 msgstr ""
 "zeigt Aufzeichnungen der fehlgeschlagenen Anmeldungen an oder richtet "
 "Beschränkungen für fehlgeschlagene Anmeldungen ein"
 
-#: faillog.8.xml:25(para)
+#: faillog.8.xml:54(para)
 msgid ""
 "<command>faillog</command> formats the contents of the failure log from "
 "<filename>/var/log/faillog</filename> database. It also can be used for "
@@ -7001,17 +7718,19 @@
 "ohne Optionen ausgeführt wird, wird nur die Liste der fehlgeschlagenen "
 "Anmeldungen aller Benutzer angezeigt, deren Anmeldung jemals gescheitert ist."
 
-#: faillog.8.xml:36(para)
+#: faillog.8.xml:65(para)
 msgid "The options which apply to the <command>faillog</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>faillog</command> unterstützt werden, "
 "sind:"
 
-#: faillog.8.xml:44(para)
-msgid "Display faillog records for all users."
-msgstr "Zeigt die fehlgeschlagene Anmeldung aller Benutzer an."
+#: faillog.8.xml:73(para)
+msgid ""
+"Display (or act on) faillog records for all users having an entry in the "
+"<filename>faillog</filename> database."
+msgstr ""
 
-#: faillog.8.xml:54(term)
+#: faillog.8.xml:86(term)
 msgid ""
 "<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
 "replaceable>"
@@ -7019,42 +7738,56 @@
 "<option>-l</option>, <option>--lock-time</option><replaceable>SEK</"
 "replaceable>"
 
-#: faillog.8.xml:59(para)
+#: faillog.8.xml:91(para)
 msgid ""
 "Lock account to <replaceable>SEC</replaceable> seconds after failed login."
 msgstr ""
 "Sperrt nach einer fehlgeschlagenen Anmeldung das Konto für <replaceable>SEK</"
 "replaceable> Sekunden."
 
-#: faillog.8.xml:66(term)
+#: faillog.8.xml:95(para) faillog.8.xml:121(para) faillog.8.xml:135(para)
 msgid ""
+"Write access to <filename>/var/log/faillog</filename> is required for this "
+"option."
+msgstr ""
+
+#: faillog.8.xml:102(term)
+msgid ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 
-#: faillog.8.xml:71(para)
+#: faillog.8.xml:107(para)
 msgid ""
 "Set maximum number of login failures after the account is disabled to "
-"<replaceable>MAX</replaceable>. Selecting <replaceable>MAX</replaceable> "
-"value of 0 has the effect of not placing a limit on the number of failed "
-"logins. The maximum failure count should always be 0 for <emphasis>root</"
-"emphasis> to prevent a denial of services attack against the system."
+"<replaceable>MAX</replaceable>."
 msgstr ""
-"Setzt die maximale Anzahl von Login-Versuchen auf <replaceable>MAX</"
-"replaceable>, ehe das Konto abgeschaltet wird. Ein Wert von Null führt dazu, "
-"dass keine Beschränkung dieser Art besteht. Für <emphasis>Root</emphasis> "
-"sollte der Wert Null betragen, um einen Denial-of-Service-Angriff zu "
-"verhindern."
 
-#: faillog.8.xml:82(term)
+#: faillog.8.xml:111(para)
+msgid ""
+"Selecting a <replaceable>MAX</replaceable> value of 0 has the effect of not "
+"placing a limit on the number of failed logins."
+msgstr ""
+
+#: faillog.8.xml:116(para)
+msgid ""
+"The maximum failure count should always be 0 for <emphasis>root</emphasis> "
+"to prevent a denial of services attack against the system."
+msgstr ""
+
+#: faillog.8.xml:128(term)
 msgid "<option>-r</option>, <option>--reset</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: faillog.8.xml:84(para)
+#: faillog.8.xml:130(para)
+#, fuzzy
+#| msgid ""
+#| "Reset the counters of login failures or one record if used with the "
+#| "<option>-u</option><replaceable>LOGIN</replaceable> option. Write access "
+#| "to <filename>/var/log/faillog</filename> is required for this option."
 msgid ""
 "Reset the counters of login failures or one record if used with the <option>-"
-"u</option><replaceable>LOGIN</replaceable> option. Write access to "
-"<filename>/var/log/faillog</filename> is required for this option."
+"u</option><replaceable>LOGIN</replaceable> option."
 msgstr ""
 "Setzt den Zähler der fehlgeschlagene Anmeldungen aller Konten zurück. Mit "
 "der Option <option>-u</option><replaceable>KONTONAME</replaceable> wird nur "
@@ -7062,26 +7795,28 @@
 "Schreibzugriff auf <filename>/var/log/faillog</filename> notwendig."
 
 # SB: Something is wrong here. IMO, "-u" overrides "-t".
-#: faillog.8.xml:97(para)
+#: faillog.8.xml:146(para)
+#, fuzzy
+#| msgid ""
+#| "Display faillog records more recent than <replaceable>DAYS</replaceable>. "
+#| "The <option>-t</option> flag overrides the use of <option>-u</option>."
 msgid ""
-"Display faillog records more recent than <replaceable>DAYS</replaceable>. "
-"The <option>-t</option> flag overrides the use of <option>-u</option>."
+"Display faillog records more recent than <replaceable>DAYS</replaceable>."
 msgstr ""
 "Zeigt die Einträge der fehlgeschlagenen Anmeldungen an, die aktueller als "
 "<replaceable>TAGE</replaceable> sind. Die Option <option>-t</option> geht "
 "der Option <option>-u</option> vor."
 
-#: faillog.8.xml:105(term)
+#: faillog.8.xml:158(para)
+#, fuzzy
+#| msgid ""
+#| "Display faillog record or maintains failure counters and limits (if used "
+#| "with <option>-l</option>, <option>-m</option> or <option>-r</option> "
+#| "options) only for user with <replaceable>LOGIN</replaceable>."
 msgid ""
-"<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>"
-msgstr ""
-"<option>-u</option>, <option>--user</option><replaceable>NAME</replaceable>"
-
-#: faillog.8.xml:109(para)
-msgid ""
 "Display faillog record or maintains failure counters and limits (if used "
 "with <option>-l</option>, <option>-m</option> or <option>-r</option> "
-"options) only for user with <replaceable>LOGIN</replaceable>."
+"options) only for the specified user(s)."
 msgstr ""
 "Zeigt Aufzeichnungen der fehlgeschlagenen Anmeldungen des Benutzers mit dem "
 "angegebenen <replaceable>KONTONAMEN</replaceable> an oder, wenn sie mit "
@@ -7089,8 +7824,32 @@
 "wird, verwaltet Zähler und Beschränkungen für fehlgeschlagene Anmeldungen "
 "dieses Benutzers."
 
-#: faillog.8.xml:122(para)
+#: faillog.8.xml:176(para)
+#, fuzzy
+#| msgid ""
+#| "The <option>-r</option>, <option>-h</option> and <option>-f</option> "
+#| "options are only used when <command>login</command> is invoked by root."
 msgid ""
+"When none of the <option>-l</option>, <option>-m</option>, or <option>-r</"
+"option> options are used, <command>faillog</command> displays the faillog "
+"record of the specified user(s)."
+msgstr ""
+" Die Optionen <option>-r</option>, <option>-h</option> und <option>-f</"
+"option> können nur verwendet werden, wenn <command>login</command> von Root "
+"ausgeführt wird."
+
+#: faillog.8.xml:181(para)
+msgid ""
+"NOTE: in display mode, only the records of users which currently exist in "
+"the system are displayed. In the other modes (when the <option>-l</option>, "
+"<option>-m</option>, or <option>-r</option> options are used), the records "
+"of the user, or the range of users, or all the users that may have an entry "
+"in the faillog database will be changed. This is useful to reset records of "
+"users that have been deleted or set a policy in advance for a range of users."
+msgstr ""
+
+#: faillog.8.xml:194(para)
+msgid ""
 "<command>faillog</command> only prints out users with no successful login "
 "since the last failure. To print out a user who has had a successful login "
 "since their last failure, you must explicitly request the user with the "
@@ -7103,26 +7862,26 @@
 "<option>-u</option> angegeben werden oder alle Benutzer mit <option>-a</"
 "option> angezeigt werden."
 
-#: faillog.8.xml:135(filename) faillog.5.xml:41(filename)
+#: faillog.8.xml:207(filename) faillog.5.xml:70(filename)
 msgid "/var/log/faillog"
 msgstr "/var/log/faillog"
 
-#: faillog.8.xml:137(para) faillog.5.xml:43(para)
+#: faillog.8.xml:209(para) faillog.5.xml:72(para)
 msgid "Failure logging file."
 msgstr "Datei mit fehlgeschlagenen Anmeldungen."
 
-#: faillog.8.xml:145(para)
+#: faillog.8.xml:217(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
-#: faillog.5.xml:11(refpurpose)
+#: faillog.5.xml:40(refpurpose)
 msgid "login failure logging file"
 msgstr "Datei mit fehlgeschlagenen Anmeldungen"
 
-#: faillog.5.xml:16(para)
+#: faillog.5.xml:45(para)
 msgid ""
 "<filename>/var/log/faillog</filename> maintains a count of login failures "
 "and the limits for each account. The file is fixed length record, indexed by "
@@ -7142,11 +7901,11 @@
 "Anmeldung und die Dauer in Sekunden, für die das Konto nach einem Fehlschlag "
 "gesperrt ist."
 
-#: faillog.5.xml:26(para)
+#: faillog.5.xml:55(para)
 msgid "The structure of the file is:"
 msgstr "Die Datei ist so aufgebaut:"
 
-#: faillog.5.xml:27(programlisting)
+#: faillog.5.xml:56(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -7167,16 +7926,16 @@
 "\tlong    fail_locktime;\n"
 "};"
 
-#: expiry.1.xml:11(refentrytitle) expiry.1.xml:16(refname)
-#: expiry.1.xml:22(command)
+#: expiry.1.xml:41(refentrytitle) expiry.1.xml:46(refname)
+#: expiry.1.xml:52(command)
 msgid "expiry"
 msgstr "expiry"
 
-#: expiry.1.xml:17(refpurpose)
+#: expiry.1.xml:47(refpurpose)
 msgid "check and enforce password expiration policy"
 msgstr "überprüft die Regeln für den Verfall des Passworts und setzt diese um"
 
-#: expiry.1.xml:30(para)
+#: expiry.1.xml:60(para)
 msgid ""
 "The <command>expiry</command> command checks (<option>-c</option>) the "
 "current password expiration and forces (<option>-f</option>) changes when "
@@ -7187,7 +7946,7 @@
 "<option>-f</option> werden die notwendigen Veränderungen umgesetzt. Er kann "
 "von normalen Benutzern aufgerufen werden."
 
-#: expiry.1.xml:57(para) chage.1.xml:233(para)
+#: expiry.1.xml:87(para) chage.1.xml:262(para)
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -7198,11 +7957,11 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 # SB: Translation of chsh.1 based on Josef Spillner's (josef at ggzgamingzone.org) from 2003. Mention somewhere else as well?
-#: chsh.1.xml:17(refpurpose)
+#: chsh.1.xml:46(refpurpose)
 msgid "change login shell"
 msgstr "ändert die Login-Shell"
 
-#: chsh.1.xml:34(para)
+#: chsh.1.xml:63(para)
 msgid ""
 "The <command>chsh</command> command changes the user login shell. This "
 "determines the name of the user's initial login command. A normal user may "
@@ -7213,13 +7972,13 @@
 "bei der Anmeldung ausgeführt wird. Ein normaler Benutzer kann nur die Login-"
 "Shell seines eigenen  Kontos ändern, während Root dies für alle Konten darf."
 
-#: chsh.1.xml:45(para)
+#: chsh.1.xml:74(para)
 msgid "The options which apply to the <command>chsh</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>chsh</command> unterstützt werden, "
 "sind:"
 
-#: chsh.1.xml:67(para)
+#: chsh.1.xml:96(para)
 msgid ""
 "If the <option>-s</option> option is not selected, <command>chsh</command> "
 "operates in an interactive fashion, prompting the user with the current "
@@ -7234,7 +7993,7 @@
 "leeren Zeile beibehalten wird. Die aktuelle Shell wird zwischen einem Paar "
 "von <emphasis>[ ]</emphasis> angezeigt."
 
-#: chsh.1.xml:78(para)
+#: chsh.1.xml:107(para)
 msgid ""
 "The only restriction placed on the login shell is that the command name must "
 "be listed in <filename>/etc/shells</filename>, unless the invoker is the "
@@ -7253,15 +8012,15 @@
 "seiner ursprünglichen Login-Shell zurückwechseln kann, falls er "
 "versehentlich eine beschränkte Shell als Login-Shell auswählt."
 
-#: chsh.1.xml:113(filename)
+#: chsh.1.xml:142(filename)
 msgid "/etc/shells"
 msgstr "/etc/shells"
 
-#: chsh.1.xml:115(para)
+#: chsh.1.xml:144(para)
 msgid "List of valid login shells."
 msgstr "Liste der möglichen Login-Shells."
 
-#: chsh.1.xml:129(para)
+#: chsh.1.xml:158(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -7275,11 +8034,11 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chpasswd.8.xml:18(refpurpose)
+#: chpasswd.8.xml:47(refpurpose)
 msgid "update passwords in batch mode"
 msgstr "aktualisiert Passwörter im Batch-Modus"
 
-#: chpasswd.8.xml:32(para)
+#: chpasswd.8.xml:61(para)
 msgid ""
 "The <command>chpasswd</command> command reads a list of user name and "
 "password pairs from standard input and uses this information to update a "
@@ -7289,7 +8048,7 @@
 "Passwort-Paaren von der Standardeingabe. Damit werden Benutzerdaten "
 "aktualisiert. Jede Zeile muss folgendes Format haben:"
 
-#: chpasswd.8.xml:37(para)
+#: chpasswd.8.xml:66(para)
 msgid ""
 "<emphasis remap=\"I\">user_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -7297,7 +8056,7 @@
 "<emphasis remap=\"I\">Benutzername</emphasis>:<emphasis remap=\"I"
 "\">Passwort</emphasis>"
 
-#: chpasswd.8.xml:41(para)
+#: chpasswd.8.xml:70(para)
 #, fuzzy
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
@@ -7308,7 +8067,7 @@
 "Standardalgorithmus zur Verschlüsselung ist DES. Soweit vorhanden, wird auch "
 "das Alter des Passworts aktualisiert."
 
-#: chpasswd.8.xml:46(para) chgpasswd.8.xml:46(para)
+#: chpasswd.8.xml:75(para) chgpasswd.8.xml:75(para)
 msgid ""
 "The default encryption algorithm can be defined for the system with the "
 "ENCRYPT_METHOD variable of <filename>/etc/login.defs</filename>, and can be "
@@ -7316,7 +8075,7 @@
 "option> options."
 msgstr ""
 
-#: chpasswd.8.xml:52(para) chgpasswd.8.xml:52(para)
+#: chpasswd.8.xml:81(para) chgpasswd.8.xml:81(para)
 msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are created at a single time."
@@ -7324,25 +8083,29 @@
 "Dieser Befehl ist für den Einsatz in großen Umgebungen vorgesehen, wo viele "
 "Konten gleichzeitig erstellt werden müssen."
 
-#: chpasswd.8.xml:60(para)
+#: chpasswd.8.xml:89(para)
 msgid "The options which apply to the <command>chpasswd</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>chpasswd</command> unterstützt werden, "
 "sind:"
 
-#: chpasswd.8.xml:76(term) chgpasswd.8.xml:76(term)
+#: chpasswd.8.xml:98(para) chgpasswd.8.xml:98(para)
+msgid "The available methods are DES, MD5, and NONE."
+msgstr ""
+
+#: chpasswd.8.xml:108(term) chgpasswd.8.xml:108(term)
 msgid "<option>-e</option>, <option>--encrypted</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: chpasswd.8.xml:78(para) chgpasswd.8.xml:78(para)
+#: chpasswd.8.xml:110(para) chgpasswd.8.xml:110(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr "Passwörter werden verschlüsselt angegeben."
 
-#: chpasswd.8.xml:88(term) chgpasswd.8.xml:88(term)
+#: chpasswd.8.xml:120(term) chgpasswd.8.xml:120(term)
 msgid "<option>-m</option>, <option>--md5</option>"
 msgstr "<option>-m</option>, <option>--md5</option>"
 
-#: chpasswd.8.xml:90(para) chgpasswd.8.xml:90(para)
+#: chpasswd.8.xml:122(para) chgpasswd.8.xml:122(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
@@ -7350,7 +8113,7 @@
 "Verwendet zur Verschlüsselung MD5 anstelle von DES, wenn die Passwörter "
 "unverschlüsselt angegeben werden."
 
-#: chpasswd.8.xml:126(para) chgpasswd.8.xml:126(para)
+#: chpasswd.8.xml:158(para) chgpasswd.8.xml:158(para)
 msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
@@ -7358,7 +8121,7 @@
 "Achten Sie darauf, dass die Rechte und Umask korrekt vergeben sind, um zu "
 "verhindern, dass andere Benutzer unverschlüsselte Dateien lesen können."
 
-#: chpasswd.8.xml:178(para)
+#: chpasswd.8.xml:210(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
@@ -7375,11 +8138,11 @@
 "citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: chgpasswd.8.xml:19(refpurpose)
+#: chgpasswd.8.xml:48(refpurpose)
 msgid "update group passwords in batch mode"
 msgstr "aktualisiert Gruppenpasswörter im Batch-Modus"
 
-#: chgpasswd.8.xml:33(para)
+#: chgpasswd.8.xml:62(para)
 msgid ""
 "The <command>chgpasswd</command> command reads a list of group name and "
 "password pairs from standard input and uses this information to update a set "
@@ -7389,7 +8152,7 @@
 "Passwort-Paaren von der Standardeingabe. Damit werden Gruppendaten "
 "aktualisiert. Jede Zeile muss folgendes Format haben:"
 
-#: chgpasswd.8.xml:38(para)
+#: chgpasswd.8.xml:67(para)
 msgid ""
 "<emphasis remap=\"I\">group_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -7397,7 +8160,7 @@
 "<emphasis remap=\"I\">Gruppenname</emphasis>:<emphasis remap=\"I\">Passwort</"
 "emphasis>"
 
-#: chgpasswd.8.xml:42(para)
+#: chgpasswd.8.xml:71(para)
 #, fuzzy
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
@@ -7406,14 +8169,14 @@
 "Das Passwort muss standardmäßig im Klartext angegeben werden. Die "
 "Standardalgorithmus zur Verschlüsselung ist DES."
 
-#: chgpasswd.8.xml:60(para)
+#: chgpasswd.8.xml:89(para)
 msgid ""
 "The options which apply to the <command>chgpasswd</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>chgpasswd</command> unterstützt "
 "werden, sind:"
 
-#: chgpasswd.8.xml:173(para)
+#: chgpasswd.8.xml:205(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
@@ -7430,39 +8193,43 @@
 
 # SB: Translation of chfn.1 based on Josef Spillner's (josef at ggzgamingzone.org) from 2003. Mention somewhere else as well?
 # Übersetzung von "real user name"?
-#: chfn.1.xml:18(refpurpose)
+#: chfn.1.xml:47(refpurpose)
 msgid "change real user name and information"
 msgstr "ändert den Benutzernamen und sonstige Informationen"
 
-#: chfn.1.xml:24(replaceable)
+#: chfn.1.xml:53(replaceable)
 msgid "full_name"
 msgstr "Voller_Name"
 
-#: chfn.1.xml:25(replaceable)
+#: chfn.1.xml:53(arg)
+msgid "-f <placeholder-1/>"
+msgstr "-f <placeholder-1/>"
+
+#: chfn.1.xml:54(replaceable)
 msgid "room_no"
 msgstr "Zimmer_Nr"
 
-#: chfn.1.xml:26(replaceable)
+#: chfn.1.xml:55(replaceable)
 msgid "work_ph"
 msgstr "Tel_Arbeit"
 
-#: chfn.1.xml:26(arg)
+#: chfn.1.xml:55(arg)
 msgid "-w <placeholder-1/>"
 msgstr "-w <placeholder-1/>"
 
-#: chfn.1.xml:27(replaceable)
+#: chfn.1.xml:56(replaceable)
 msgid "home_ph"
 msgstr "Tel_Privat"
 
-#: chfn.1.xml:28(replaceable)
+#: chfn.1.xml:57(replaceable)
 msgid "other"
 msgstr "sonstiges"
 
-#: chfn.1.xml:28(arg)
+#: chfn.1.xml:57(arg)
 msgid "-o <placeholder-1/>"
 msgstr "-o <placeholder-1/>"
 
-#: chfn.1.xml:35(para)
+#: chfn.1.xml:64(para)
 msgid ""
 "The <command>chfn</command> command changes user fullname, office number, "
 "office extension, and home phone number information for a user's account. "
@@ -7486,7 +8253,7 @@
 "verändern. Außerdem darf nur Root mittels der Option <option>-o</option> die "
 "undefinierten Teile des GECOS-Feldes ändern."
 
-#: chfn.1.xml:49(para)
+#: chfn.1.xml:78(para)
 msgid ""
 "These fields must not contain any colons. Except for the <emphasis remap=\"I"
 "\">other</emphasis> field, they should not contain any comma or equal sign. "
@@ -7495,7 +8262,7 @@
 "field is used to store accounting information used by other applications."
 msgstr ""
 
-#: chfn.1.xml:58(para)
+#: chfn.1.xml:87(para)
 msgid ""
 "If none of the options are selected, <command>chfn</command> operates in an "
 "interactive fashion, prompting the user with the current values for all of "
@@ -7512,7 +8279,7 @@
 "emphasis> angezeigt. Ohne Optionen fragt <command>chfn</command> nach einem "
 "Benutzerkonto."
 
-#: chfn.1.xml:103(para)
+#: chfn.1.xml:132(para)
 msgid ""
 "<citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -7526,16 +8293,16 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chage.1.xml:5(refentrytitle) chage.1.xml:10(refname)
-#: chage.1.xml:15(command)
+#: chage.1.xml:34(refentrytitle) chage.1.xml:39(refname)
+#: chage.1.xml:44(command)
 msgid "chage"
 msgstr "chage"
 
-#: chage.1.xml:11(refpurpose)
+#: chage.1.xml:40(refpurpose)
 msgid "change user password expiry information"
 msgstr "ändert die Information zum Passwortverfall"
 
-#: chage.1.xml:27(para)
+#: chage.1.xml:56(para)
 msgid ""
 "The <command>chage</command> command changes the number of days between "
 "password changes and the date of the last password change. This information "
@@ -7546,13 +8313,13 @@
 "Information bestimmt das System, wann ein Benutzer sein Passwort verändern "
 "muss."
 
-#: chage.1.xml:37(para)
+#: chage.1.xml:66(para)
 msgid "The options which apply to the <command>chage</command> command are:"
 msgstr ""
 "Die Optionen, die vom Befehl <command>chage</command> unterstützt werden, "
 "sind:"
 
-#: chage.1.xml:42(term)
+#: chage.1.xml:71(term)
 msgid ""
 "<option>-d</option>, <option>--lastday</option><replaceable>LAST_DAY</"
 "replaceable>"
@@ -7561,7 +8328,7 @@
 "replaceable>"
 
 # SB: So I could also do DD.MM.YYYY or MM.DD.YYYY? How does system know which format I chose?
-#: chage.1.xml:46(para)
+#: chage.1.xml:75(para)
 msgid ""
 "Set the number of days since January 1st, 1970 when the password was last "
 "changed. The date may also be expressed in the format YYYY-MM-DD (or the "
@@ -7572,7 +8339,7 @@
 "JJJJ-MM-TT (oder in dem Format, dass in Ihrer Region weiter verbreitet ist) "
 "angegeben werden."
 
-#: chage.1.xml:54(term)
+#: chage.1.xml:83(term)
 msgid ""
 "<option>-E</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -7580,7 +8347,7 @@
 "<option>-E</option>, <option>--expiredate</"
 "option><replaceable>VERFALLSDATUM</replaceable>"
 
-#: chage.1.xml:58(para)
+#: chage.1.xml:87(para)
 msgid ""
 "Set the date or number of days since January 1, 1970 on which the user's "
 "account will no longer be accessible. The date may also be expressed in the "
@@ -7595,7 +8362,7 @@
 "muss sich mit dem Systemadministrator in Verbindung setzen, ehe er sich "
 "wieder am System anmelden kann."
 
-#: chage.1.xml:66(para)
+#: chage.1.xml:95(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>EXPIRE_DATE</replaceable> will remove an account expiration "
@@ -7604,7 +8371,7 @@
 "Wenn <emphasis remap=\"I\">-1</emphasis> als <replaceable>VERFALLSDATUM</"
 "replaceable> angegeben wird, wird das Verfallsdatum für das Konto entfernt."
 
-#: chage.1.xml:80(term)
+#: chage.1.xml:109(term)
 msgid ""
 "<option>-I</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -7612,7 +8379,7 @@
 "<option>-I</option>, <option>--inactive</option><replaceable>INAKTIV</"
 "replaceable>"
 
-#: chage.1.xml:84(para)
+#: chage.1.xml:113(para)
 msgid ""
 "Set the number of days of inactivity after a password has expired before the "
 "account is locked. The <replaceable>INACTIVE</replaceable> option is the "
@@ -7626,7 +8393,7 @@
 "mit dem Systemadministrator in Verbindung setzen, ehe er sich wieder am "
 "System anmelden kann."
 
-#: chage.1.xml:91(para)
+#: chage.1.xml:120(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>INACTIVE</replaceable> will remove an account's inactivity."
@@ -7634,15 +8401,11 @@
 "Wenn <emphasis remap=\"I\">-1</emphasis> als <replaceable>INAKTIV</"
 "replaceable> angegeben wird, wird die Inaktivität für das Konto entfernt."
 
-#: chage.1.xml:99(term)
-msgid "<option>-l</option>, <option>--list</option>"
-msgstr "<option>-l</option>, <option>--list</option>"
-
-#: chage.1.xml:103(para)
+#: chage.1.xml:132(para)
 msgid "Show account aging information."
 msgstr "Zeigt Informationen zum Kontoalterung."
 
-#: chage.1.xml:121(term)
+#: chage.1.xml:150(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -7650,7 +8413,7 @@
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_TAGE</"
 "replaceable>"
 
-#: chage.1.xml:125(para)
+#: chage.1.xml:154(para)
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
 "<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
@@ -7666,7 +8429,7 @@
 "option> werden die Benutzer vor dem drohenden Verfall ihres Passworts "
 "gewarnt."
 
-#: chage.1.xml:134(para)
+#: chage.1.xml:163(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as "
 "<replaceable>MAX_DAYS</replaceable> will remove checking a password's "
@@ -7675,7 +8438,7 @@
 "Wenn <emphasis remap=\"I\">-1</emphasis> als <replaceable>MAX_TAGE</"
 "replaceable> angegeben wird, wird der Passwortverfall entfernt."
 
-#: chage.1.xml:142(term)
+#: chage.1.xml:171(term)
 msgid ""
 "<option>-W</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -7683,7 +8446,7 @@
 "<option>-W</option>, <option>--warndays</option><replaceable>WARN_TAGE</"
 "replaceable>"
 
-#: chage.1.xml:146(para)
+#: chage.1.xml:175(para)
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
@@ -7695,7 +8458,7 @@
 "replaceable> bezeichnet die Anzahl der Tage, für die ein Benutzer vor "
 "Verfall seines Passworts gewarnt wird."
 
-#: chage.1.xml:155(para)
+#: chage.1.xml:184(para)
 msgid ""
 "If none of the options are selected, <command>chage</command> operates in an "
 "interactive fashion, prompting the user with the current values for all of "
@@ -7710,7 +8473,7 @@
 "aktuelle Wert wird zwischen einem Paar von <emphasis remap=\"B\">[ ]</"
 "emphasis> angezeigt."
 
-#: chage.1.xml:165(para)
+#: chage.1.xml:194(para)
 msgid ""
 "The <command>chage</command> program requires a shadow password file to be "
 "available."
@@ -7718,7 +8481,7 @@
 "Für das Programm <command>chage</command> ist es notwendig, dass eine Shadow-"
 "Passwort-Datei vorhanden ist."
 
-#: chage.1.xml:169(para)
+#: chage.1.xml:198(para)
 msgid ""
 "The <command>chage</command> command is restricted to the root user, except "
 "for the <option>-l</option> option, which may be used by an unprivileged "
@@ -7728,15 +8491,15 @@
 "Alle anderen Benutzer können nur die Option <option>-l</option> verwenden, "
 "um die Verfallsdaten für ihr Konto einzusehen."
 
-#: chage.1.xml:222(replaceable)
+#: chage.1.xml:251(replaceable)
 msgid "15"
 msgstr "15"
 
-#: chage.1.xml:224(para)
+#: chage.1.xml:253(para)
 msgid "can't find the shadow password file"
 msgstr "kann keine Shadow-Passwort-Datei finden"
 
-#: chage.1.xml:200(para)
+#: chage.1.xml:229(para)
 msgid ""
 "The <command>chage</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -7750,6 +8513,270 @@
 msgstr "Simon Brandmair (sbrandmair at gmx.net), 2005, 2007."
 
 #~ msgid ""
+#~ "The group name or number of the user's initial login group. The group "
+#~ "name must exist. A group number must refer to an already existing group. "
+#~ "The default group number is 1 or whatever is specified in <filename>/etc/"
+#~ "default/useradd</filename>."
+#~ msgstr ""
+#~ "Der Gruppenname oder die Zahl der Login-Gruppe des Benutzers. Der "
+#~ "Gruppenname muss existieren. Eine Gruppenzahl muss auf eine existierende "
+#~ "Gruppe verweisen. Die Standardgruppenzahl ist 1 oder ergibt sich aus "
+#~ "<filename>/etc/default/useradd</filename>."
+
+#~ msgid ""
+#~ "The group name or ID for a new user's initial group. The named group must "
+#~ "exist, and a numerical group ID must have an existing entry."
+#~ msgstr ""
+#~ "Der Name oder die Zahl der Login-Gruppe eines neuen Benutzers. Der "
+#~ "Gruppenname muss existieren. Die Gruppenzahl muss auf eine bereits "
+#~ "bestehende Gruppe verweisen."
+
+#~ msgid "days since Jan 1, 1970 that password was last changed"
+#~ msgstr ""
+#~ "Anzahl der Tage gerechnet ab dem 1. Januar 1970, seitdem das Passwort das "
+#~ "letzte Mal geändert wurde"
+
+#~ msgid "days after which password must be changed"
+#~ msgstr "Anzahl der Tage, nach denen das Passwort geändert werden muss"
+
+#~ msgid "days before password is to expire that user is warned"
+#~ msgstr ""
+#~ "Anzahl der Tage ehe das Passwort verfällt, an denen der Benutzer gewarnt "
+#~ "wird"
+
+#~ msgid "days after password expires that account is disabled"
+#~ msgstr ""
+#~ "Anzahl der Tage nach dem Verfall des Passwort bis das Konto abgeschaltet "
+#~ "wird"
+
+#~ msgid "days since Jan 1, 1970 that account is disabled"
+#~ msgstr ""
+#~ "Anzahl Tage gerechnet ab dem 1. Januar 1970, für die das Konto "
+#~ "abgeschaltet ist"
+
+#, fuzzy
+#~ msgid ""
+#~ "The password field must be filled. The encrypted password consists of 13 "
+#~ "to 24 characters from the 64 character alphabet a thru z, A thru Z, 0 "
+#~ "thru 9, \\. and /. Optionally it can start with a \"$\" character. This "
+#~ "means the encrypted password was generated using another (not DES) "
+#~ "algorithm. For example if it starts with \"$1$\" it means the MD5-based "
+#~ "algorithm was used."
+#~ msgstr ""
+#~ "Das Passwortfeld darf nicht leer sein. Ein verschlüsseltes Passwort "
+#~ "besteht aus 13 bis 24 Zeichen, die aus dem Alphabet mit 64 Zeichen "
+#~ "stammen (a bis z, A bis Z, 0 bis 9, \\. und /). Außerdem kann es mit dem "
+#~ "Zeichen \"$\" beginnen. Das bedeutet, dass das Passwort mit einem anderen "
+#~ "Algorithmus (nicht DES) erzeugt wurde. So bedeutet z.B. \"$1$\", dass "
+#~ "eine Algorithmus verwendet wurde, der auf MD5 basiert."
+
+#~ msgid ""
+#~ "The date of the last password change is given as the number of days since "
+#~ "Jan 1, 1970. The password may not be changed again until the proper "
+#~ "number of days have passed, and must be changed after the maximum number "
+#~ "of days. If the minimum number of days required is greater than the "
+#~ "maximum number of day allowed, this password may not be changed by the "
+#~ "user."
+#~ msgstr ""
+#~ "Das Datum, an dem das Passwort das letzte Mal geändert wurde, wird als "
+#~ "Anzahl der Tage seit dem 1. Januar 1970 angegeben. Es ist möglich, dass "
+#~ "das Passwort vor einer bestimmten Anzahl von Tagen nicht geändert werden "
+#~ "darf oder dass es nach einer bestimmten Anzahl geändert werden muss. Fall "
+#~ "die Mindestanzahl der Tage größer ist als die Höchstanzahl, so kann der "
+#~ "Benutzer sein Passwort nicht ändern."
+
+#~ msgid ""
+#~ "An account is considered to be inactive and is disabled if the password "
+#~ "is not changed within the specified number of days after the password "
+#~ "expires. An account will also be disabled on the specified day regardless "
+#~ "of other password expiration information."
+#~ msgstr ""
+#~ "Ein Konto wird als inaktive angesehen und abgeschaltet, wenn das Passwort "
+#~ "nicht innerhalb der angegebenen Anzahl von Tagen geändert wird, nachdem "
+#~ "das Passwort abgelaufen ist. Unabhängig von anderen Informationen über "
+#~ "den Verfall des Passworts, wird ein Konto auch am angegeben Tag "
+#~ "abgeschaltet."
+
+#~ msgid ""
+#~ "This information supersedes any password or password age information "
+#~ "present in <filename>/etc/passwd</filename>."
+#~ msgstr ""
+#~ "Diese Angaben ersetzen alle Angaben zu Passwörtern und deren Verfall in "
+#~ "<filename>/etc/passwd</filename>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>getpwnam</"
+#~ "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>getpwnam</"
+#~ "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "This field must contain the name (or number) of a group. The user will be "
+#~ "added as a member to this group. When a non-existent group name or number "
+#~ "is specified, a new group will be created. In the case of a non-existent "
+#~ "group number, both the name and the number of the new group will be this "
+#~ "number."
+#~ msgstr ""
+#~ "Dieses Feld muss den Namen (oder die Nummer) einer Gruppe enthalten. Der "
+#~ "Benutzer wird dieser Gruppe hinzugefügt. Wenn ein nicht existierender "
+#~ "Gruppenname oder -nummer angegeben wird, wird eine neue Gruppe erstellt. "
+#~ "Falls eine nicht existierende Gruppennummer angegeben wird, wird diese "
+#~ "Nummer auch der Name der neuen Gruppe sein. "
+
+#~ msgid ""
+#~ "This field will be checked for existence as a directory, and a new "
+#~ "directory with this name will be created if it does not already exist. "
+#~ "The ownership of the directory will be set to be that of the user being "
+#~ "created or updated."
+#~ msgstr ""
+#~ "Dieses Feld wird darauf überprüft, ob es als Verzeichnis existiert. Wenn "
+#~ "es es nicht gibt, wird ein neues Verzeichnis unter diesem Namen erstellt. "
+#~ "Der Eigentümer des Verzeichnisses wird der Benutzer sein, der erstellt "
+#~ "oder aktualisiert wird."
+
+#, fuzzy
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>."
+
+#~ msgid "-a"
+#~ msgstr "-a"
+
+#~ msgid "-d"
+#~ msgstr "-d"
+
+#~ msgid "-g"
+#~ msgstr "-g"
+
+#~ msgid "GID"
+#~ msgstr "GID"
+
+#~ msgid "-o"
+#~ msgstr "-o"
+
+#~ msgid "KEY"
+#~ msgstr "SCHLÜSSEL"
+
+#~ msgid "VALUE"
+#~ msgstr "WERT"
+
+#~ msgid "-K <placeholder-1/>=<placeholder-2/>"
+#~ msgstr "-K <placeholder-1/>=<placeholder-2/>"
+
+#, fuzzy
+#~ msgid "-R"
+#~ msgstr "-"
+
+#, fuzzy
+#~ msgid "<option>-A</option><replaceable>user</replaceable>,..."
+#~ msgstr ""
+#~ "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+
+#, fuzzy
+#~ msgid "<option>-M</option><replaceable>user</replaceable>,..."
+#~ msgstr ""
+#~ "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+
+#~ msgid "Display faillog records for all users."
+#~ msgstr "Zeigt die fehlgeschlagene Anmeldung aller Benutzer an."
+
+#~ msgid ""
+#~ "Set maximum number of login failures after the account is disabled to "
+#~ "<replaceable>MAX</replaceable>. Selecting <replaceable>MAX</replaceable> "
+#~ "value of 0 has the effect of not placing a limit on the number of failed "
+#~ "logins. The maximum failure count should always be 0 for <emphasis>root</"
+#~ "emphasis> to prevent a denial of services attack against the system."
+#~ msgstr ""
+#~ "Setzt die maximale Anzahl von Login-Versuchen auf <replaceable>MAX</"
+#~ "replaceable>, ehe das Konto abgeschaltet wird. Ein Wert von Null führt "
+#~ "dazu, dass keine Beschränkung dieser Art besteht. Für <emphasis>Root</"
+#~ "emphasis> sollte der Wert Null betragen, um einen Denial-of-Service-"
+#~ "Angriff zu verhindern."
+
+#~ msgid ""
+#~ "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
+#~ "replaceable>"
+#~ msgstr ""
+#~ "<option>-u</option>, <option>--user</option><replaceable>NAME</"
+#~ "replaceable>"
+
+#~ msgid ""
 #~ "The user's home directory will be created if it does not exist. The files "
 #~ "contained in <replaceable>SKEL_DIR</replaceable> will be copied to the "
 #~ "home directory if the <option>-k</option> option is used, otherwise the "
@@ -7891,27 +8918,6 @@
 #~ msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 #~ msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 
-#~ msgid ""
-#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>login</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
-#~ msgstr ""
-#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>login</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
-
 #~ msgid "administer the <placeholder-1/> file"
 #~ msgstr "verwaltet die Datei <placeholder-1/>"
 

Modified: upstream/trunk/man/po/fr.po
===================================================================
--- upstream/trunk/man/po/fr.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/man/po/fr.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -16,7 +16,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow-man-pages 4.0.18\n"
-"POT-Creation-Date: 2008-05-24 21:02+0200\n"
+"POT-Creation-Date: 2009-04-06 00:48+0200\n"
 "PO-Revision-Date: 2009-03-14 14:06+0100\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon at wanadoo.fr>\n"
 "Language-Team: Debian French Team <debian-l10n-french at lists.debian.org>\n"
@@ -27,74 +27,73 @@
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: vipw.8.xml:9(refentrytitle) vipw.8.xml:14(refname) vipw.8.xml:23(command)
-#: login.defs.5.xml:419(term)
+#: vipw.8.xml:38(refentrytitle) vipw.8.xml:43(refname) vipw.8.xml:52(command)
 msgid "vipw"
 msgstr "vipw"
 
-#: vipw.8.xml:10(manvolnum) usermod.8.xml:11(manvolnum)
-#: userdel.8.xml:13(manvolnum) userdel.8.xml:170(replaceable)
-#: useradd.8.xml:20(manvolnum) pwconv.8.xml:13(manvolnum)
-#: pwck.8.xml:12(manvolnum) nologin.8.xml:6(manvolnum)
-#: newusers.8.xml:22(manvolnum) logoutd.8.xml:6(manvolnum)
-#: lastlog.8.xml:6(manvolnum) grpck.8.xml:10(manvolnum)
-#: groupmod.8.xml:10(manvolnum) groupmems.8.xml:10(manvolnum)
-#: groupdel.8.xml:10(manvolnum) groupdel.8.xml:100(replaceable)
-#: groupadd.8.xml:12(manvolnum) faillog.8.xml:6(manvolnum)
-#: faillog.5.xml:53(manvolnum) chpasswd.8.xml:13(manvolnum)
-#: chgpasswd.8.xml:14(manvolnum)
+#: vipw.8.xml:39(manvolnum) usermod.8.xml:40(manvolnum)
+#: userdel.8.xml:42(manvolnum) userdel.8.xml:199(replaceable)
+#: useradd.8.xml:50(manvolnum) pwconv.8.xml:43(manvolnum)
+#: pwck.8.xml:41(manvolnum) nologin.8.xml:35(manvolnum)
+#: newusers.8.xml:51(manvolnum) logoutd.8.xml:35(manvolnum)
+#: lastlog.8.xml:36(manvolnum) grpck.8.xml:39(manvolnum)
+#: groupmod.8.xml:39(manvolnum) groupmems.8.xml:39(manvolnum)
+#: groupdel.8.xml:39(manvolnum) groupdel.8.xml:129(replaceable)
+#: groupadd.8.xml:43(manvolnum) faillog.8.xml:35(manvolnum)
+#: faillog.5.xml:82(manvolnum) chpasswd.8.xml:42(manvolnum)
+#: chgpasswd.8.xml:43(manvolnum)
 msgid "8"
 msgstr "8"
 
-#: vipw.8.xml:11(refmiscinfo) usermod.8.xml:12(refmiscinfo)
-#: userdel.8.xml:14(refmiscinfo) useradd.8.xml:21(refmiscinfo)
-#: pwconv.8.xml:14(refmiscinfo) pwck.8.xml:13(refmiscinfo)
-#: nologin.8.xml:7(refmiscinfo) newusers.8.xml:23(refmiscinfo)
-#: logoutd.8.xml:7(refmiscinfo) lastlog.8.xml:7(refmiscinfo)
-#: grpck.8.xml:11(refmiscinfo) groupmod.8.xml:11(refmiscinfo)
-#: groupmems.8.xml:11(refmiscinfo) groupdel.8.xml:11(refmiscinfo)
-#: groupadd.8.xml:13(refmiscinfo) faillog.8.xml:7(refmiscinfo)
-#: chpasswd.8.xml:14(refmiscinfo) chgpasswd.8.xml:15(refmiscinfo)
+#: vipw.8.xml:40(refmiscinfo) usermod.8.xml:41(refmiscinfo)
+#: userdel.8.xml:43(refmiscinfo) useradd.8.xml:51(refmiscinfo)
+#: pwconv.8.xml:44(refmiscinfo) pwck.8.xml:42(refmiscinfo)
+#: nologin.8.xml:36(refmiscinfo) newusers.8.xml:52(refmiscinfo)
+#: logoutd.8.xml:36(refmiscinfo) lastlog.8.xml:37(refmiscinfo)
+#: grpck.8.xml:40(refmiscinfo) groupmod.8.xml:40(refmiscinfo)
+#: groupmems.8.xml:40(refmiscinfo) groupdel.8.xml:40(refmiscinfo)
+#: groupadd.8.xml:44(refmiscinfo) faillog.8.xml:36(refmiscinfo)
+#: chpasswd.8.xml:43(refmiscinfo) chgpasswd.8.xml:44(refmiscinfo)
 msgid "System Management Commands"
 msgstr "Commandes de gestion du système"
 
-#: vipw.8.xml:15(refname) vipw.8.xml:29(command)
+#: vipw.8.xml:44(refname) vipw.8.xml:58(command)
 msgid "vigr"
 msgstr "vigr"
 
-#: vipw.8.xml:16(refpurpose)
+#: vipw.8.xml:45(refpurpose)
 msgid "edit the password, group, shadow-password or shadow-group file"
 msgstr "éditer les fichiers passwd, group, shadow ou gshadow"
 
-#: vipw.8.xml:25(replaceable) vipw.8.xml:31(replaceable)
-#: usermod.8.xml:23(replaceable) userdel.8.xml:23(arg)
-#: useradd.8.xml:31(replaceable) useradd.8.xml:43(replaceable)
-#: su.1.xml:37(replaceable) passwd.1.xml:28(replaceable)
-#: lastlog.8.xml:18(replaceable) groupmod.8.xml:22(replaceable)
-#: faillog.8.xml:18(replaceable) chsh.1.xml:24(replaceable)
-#: chpasswd.8.xml:25(replaceable) chgpasswd.8.xml:26(replaceable)
-#: chage.1.xml:17(replaceable)
+#: vipw.8.xml:54(replaceable) vipw.8.xml:60(replaceable)
+#: usermod.8.xml:52(replaceable) userdel.8.xml:52(arg)
+#: useradd.8.xml:61(replaceable) useradd.8.xml:73(replaceable)
+#: su.1.xml:66(replaceable) passwd.1.xml:57(replaceable)
+#: lastlog.8.xml:48(replaceable) groupmod.8.xml:51(replaceable)
+#: groupadd.8.xml:55(replaceable) faillog.8.xml:47(replaceable)
+#: chsh.1.xml:53(replaceable) chpasswd.8.xml:54(replaceable)
+#: chgpasswd.8.xml:55(replaceable) chage.1.xml:46(replaceable)
 msgid "options"
 msgstr "options"
 
-#: vipw.8.xml:37(title) usermod.8.xml:30(title) userdel.8.xml:31(title)
-#: useradd.8.xml:49(title) suauth.5.xml:21(title) su.1.xml:48(title)
-#: sg.1.xml:30(title) shadow.5.xml:15(title) shadow.3.xml:64(title)
-#: shadow.3.xml:120(title) pwconv.8.xml:40(title) pwck.8.xml:52(title)
-#: porttime.5.xml:15(title) passwd.5.xml:15(title) passwd.1.xml:37(title)
-#: nologin.8.xml:21(title) newusers.8.xml:40(title) newgrp.1.xml:26(title)
-#: logoutd.8.xml:21(title) login.defs.5.xml:76(title)
-#: login.access.5.xml:15(title) login.1.xml:72(title) limits.5.xml:16(title)
-#: lastlog.8.xml:24(title) gshadow.5.xml:15(title) grpck.8.xml:40(title)
-#: groups.1.xml:24(title) groupmod.8.xml:29(title) groupmems.8.xml:31(title)
-#: groupdel.8.xml:28(title) groupadd.8.xml:36(title) gpasswd.1.xml:40(title)
-#: faillog.8.xml:24(title) faillog.5.xml:15(title) expiry.1.xml:29(title)
-#: chsh.1.xml:33(title) chpasswd.8.xml:31(title) chgpasswd.8.xml:32(title)
-#: chfn.1.xml:34(title) chage.1.xml:26(title)
+#: vipw.8.xml:66(title) usermod.8.xml:59(title) userdel.8.xml:60(title)
+#: useradd.8.xml:79(title) suauth.5.xml:50(title) su.1.xml:77(title)
+#: sg.1.xml:59(title) shadow.5.xml:44(title) shadow.3.xml:93(title)
+#: shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:81(title)
+#: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
+#: nologin.8.xml:50(title) newusers.8.xml:69(title) newgrp.1.xml:55(title)
+#: logoutd.8.xml:50(title) login.defs.5.xml:107(title)
+#: login.access.5.xml:45(title) login.1.xml:103(title) limits.5.xml:46(title)
+#: lastlog.8.xml:54(title) gshadow.5.xml:43(title) grpck.8.xml:69(title)
+#: groups.1.xml:53(title) groupmod.8.xml:58(title) groupmems.8.xml:60(title)
+#: groupdel.8.xml:57(title) groupadd.8.xml:62(title) gpasswd.1.xml:69(title)
+#: faillog.8.xml:53(title) faillog.5.xml:44(title) expiry.1.xml:59(title)
+#: chsh.1.xml:62(title) chpasswd.8.xml:60(title) chgpasswd.8.xml:61(title)
+#: chfn.1.xml:63(title) chage.1.xml:55(title)
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
 
-#: vipw.8.xml:38(para)
+#: vipw.8.xml:67(para)
 #, fuzzy
 msgid ""
 "The <command>vipw</command> and <command>vigr</command> commands edits the "
@@ -120,17 +119,17 @@
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: vipw.8.xml:55(title) usermod.8.xml:38(title) userdel.8.xml:40(title)
-#: useradd.8.xml:62(title) su.1.xml:94(title) pwck.8.xml:104(title)
-#: passwd.1.xml:123(title) newusers.8.xml:98(title) login.1.xml:157(title)
-#: lastlog.8.xml:36(title) grpck.8.xml:85(title) groupmod.8.xml:38(title)
-#: groupmems.8.xml:46(title) groupadd.8.xml:45(title) gpasswd.1.xml:80(title)
-#: faillog.8.xml:35(title) chsh.1.xml:44(title) chpasswd.8.xml:59(title)
-#: chgpasswd.8.xml:59(title) chage.1.xml:36(title)
+#: vipw.8.xml:84(title) usermod.8.xml:67(title) userdel.8.xml:69(title)
+#: useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:133(title)
+#: passwd.1.xml:151(title) newusers.8.xml:221(title) login.1.xml:188(title)
+#: lastlog.8.xml:66(title) grpck.8.xml:114(title) groupmod.8.xml:67(title)
+#: groupmems.8.xml:75(title) groupadd.8.xml:71(title) gpasswd.1.xml:109(title)
+#: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:88(title)
+#: chgpasswd.8.xml:88(title) chage.1.xml:65(title)
 msgid "OPTIONS"
 msgstr "OPTIONS"
 
-#: vipw.8.xml:56(para)
+#: vipw.8.xml:85(para)
 msgid ""
 "The options which apply to the <command>vipw</command> and <command>vigr</"
 "command> commands are:"
@@ -138,249 +137,166 @@
 "Les options applicables aux commandes <command>vipw</command> et "
 "<command>vigr</command> sont :"
 
-#: vipw.8.xml:62(term)
+#: vipw.8.xml:91(term)
 msgid "<option>-g</option>, <option>--group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: vipw.8.xml:64(para)
+#: vipw.8.xml:93(para)
 msgid "Edit group database."
 msgstr "Éditer la base de données de groupes."
 
-#: vipw.8.xml:68(term) userdel.8.xml:70(term) useradd.8.xml:179(term)
-#: passwd.1.xml:163(term) lastlog.8.xml:52(term) groupmod.8.xml:64(term)
-#: groupadd.8.xml:80(term) faillog.8.xml:48(term) chsh.1.xml:50(term)
-#: chpasswd.8.xml:82(term) chgpasswd.8.xml:82(term) chage.1.xml:74(term)
+#: vipw.8.xml:97(term) userdel.8.xml:99(term) useradd.8.xml:247(term)
+#: passwd.1.xml:191(term) lastlog.8.xml:82(term) groupmod.8.xml:93(term)
+#: groupadd.8.xml:106(term) faillog.8.xml:80(term) chsh.1.xml:79(term)
+#: chpasswd.8.xml:114(term) chgpasswd.8.xml:114(term) chage.1.xml:103(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr "<option>-h</option>, <option>--help</option>"
 
-#: vipw.8.xml:70(para) userdel.8.xml:72(para) useradd.8.xml:181(para)
-#: passwd.1.xml:165(para) lastlog.8.xml:56(para) groupmod.8.xml:66(para)
-#: groupadd.8.xml:82(para) faillog.8.xml:50(para) chsh.1.xml:52(para)
-#: chpasswd.8.xml:84(para) chgpasswd.8.xml:84(para) chage.1.xml:76(para)
+#: vipw.8.xml:99(para) userdel.8.xml:101(para) useradd.8.xml:249(para)
+#: passwd.1.xml:193(para) lastlog.8.xml:86(para) groupmod.8.xml:95(para)
+#: groupadd.8.xml:108(para) faillog.8.xml:82(para) chsh.1.xml:81(para)
+#: chpasswd.8.xml:116(para) chgpasswd.8.xml:116(para) chage.1.xml:105(para)
 msgid "Display help message and exit."
 msgstr "Afficher un message d'aide et quitter."
 
-#: vipw.8.xml:74(term)
+#: vipw.8.xml:103(term)
 msgid "<option>-p</option>, <option>--passwd</option>"
 msgstr "<option>-p</option>, <option>--passwd</option>"
 
-#: vipw.8.xml:76(para)
+#: vipw.8.xml:105(para)
 msgid "Edit passwd database."
 msgstr "Éditer la base de données de mots de passe."
 
-#: vipw.8.xml:80(term) passwd.1.xml:218(term)
+#: vipw.8.xml:109(term) passwd.1.xml:258(term)
 msgid "<option>-q</option>, <option>--quiet</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:82(para) passwd.1.xml:222(para)
+#: vipw.8.xml:111(para) passwd.1.xml:262(para)
 msgid "Quiet mode."
 msgstr "Mode silencieux."
 
-#: vipw.8.xml:86(term)
+#: vipw.8.xml:115(term)
 msgid "<option>-s</option>, <option>--shadow</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: vipw.8.xml:88(para)
+#: vipw.8.xml:117(para)
 msgid "Edit shadow or gshadow database."
 msgstr "Éditer les bases de données shadow ou gshadow."
 
-#: vipw.8.xml:95(title) usermod.8.xml:265(title) userdel.8.xml:96(title)
-#: useradd.8.xml:471(title) su.1.xml:196(title) sg.1.xml:47(title)
-#: pwconv.8.xml:116(title) pwck.8.xml:153(title) passwd.1.xml:307(title)
-#: newusers.8.xml:174(title) newgrp.1.xml:58(title) login.1.xml:236(title)
-#: grpck.8.xml:125(title) groupmod.8.xml:109(title) groupmems.8.xml:107(title)
-#: groupdel.8.xml:47(title) groupadd.8.xml:149(title) gpasswd.1.xml:186(title)
-#: chsh.1.xml:91(title) chpasswd.8.xml:139(title) chgpasswd.8.xml:133(title)
-#: chfn.1.xml:70(title)
-msgid "CONFIGURATION"
-msgstr ""
-
-#: vipw.8.xml:96(para) usermod.8.xml:266(para) userdel.8.xml:97(para)
-#: useradd.8.xml:472(para) su.1.xml:197(para) sg.1.xml:48(para)
-#: pwck.8.xml:154(para) passwd.1.xml:308(para) newusers.8.xml:175(para)
-#: newgrp.1.xml:59(para) login.1.xml:237(para) grpck.8.xml:126(para)
-#: groupmod.8.xml:110(para) groupmems.8.xml:108(para) groupdel.8.xml:48(para)
-#: groupadd.8.xml:150(para) gpasswd.1.xml:187(para) chsh.1.xml:92(para)
-#: chpasswd.8.xml:140(para) chgpasswd.8.xml:134(para) chfn.1.xml:71(para)
-msgid ""
-"The following configuration variables in <filename>/etc/login.defs</"
-"filename> change the behavior of this tool:"
-msgstr ""
-
-#: vipw.8.xml:2(term) usermod.8.xml:2(term) userdel.8.xml:2(term)
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) newusers.8.xml:2(term)
-#: login.defs.5.xml:2(term) grpck.8.xml:2(term) groupmod.8.xml:2(term)
-#: groupmems.8.xml:2(term) groupdel.8.xml:2(term) groupadd.8.xml:2(term)
-#: gpasswd.1.xml:2(term) chgpasswd.8.xml:2(term)
-msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
-msgstr ""
-
-#: vipw.8.xml:4(para) usermod.8.xml:4(para) userdel.8.xml:4(para)
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) newusers.8.xml:4(para)
-#: login.defs.5.xml:4(para) grpck.8.xml:4(para) groupmod.8.xml:4(para)
-#: groupmems.8.xml:4(para) groupdel.8.xml:4(para) groupadd.8.xml:4(para)
-#: gpasswd.1.xml:4(para) chgpasswd.8.xml:4(para)
-msgid ""
-"Maximum members per group entry. When the maximum is reached, a new group "
-"entry (line) is started in <filename>/etc/group</filename> (with the same "
-"name, same password, and same GID)."
-msgstr ""
-
-#: vipw.8.xml:9(para) usermod.8.xml:9(para) userdel.8.xml:9(para)
-#: useradd.8.xml:9(para) pwconv.8.xml:9(para) newusers.8.xml:9(para)
-#: login.defs.5.xml:9(para) grpck.8.xml:9(para) groupmod.8.xml:9(para)
-#: groupmems.8.xml:9(para) groupdel.8.xml:9(para) groupadd.8.xml:9(para)
-#: gpasswd.1.xml:9(para) chgpasswd.8.xml:9(para)
-msgid ""
-"The default value is 0, meaning that there are no limits in the number of "
-"members in a group."
-msgstr ""
-
-#. Note: on HP, split groups have the same ID, but different
-#.                names.
-#: vipw.8.xml:15(para) usermod.8.xml:15(para) userdel.8.xml:15(para)
-#: useradd.8.xml:15(para) pwconv.8.xml:15(para) newusers.8.xml:15(para)
-#: login.defs.5.xml:15(para) grpck.8.xml:15(para) groupmod.8.xml:15(para)
-#: groupmems.8.xml:15(para) groupdel.8.xml:15(para) groupadd.8.xml:15(para)
-#: gpasswd.1.xml:15(para) chgpasswd.8.xml:15(para)
-msgid ""
-"This feature (split group) permits to limit the length of lines in the group "
-"file. This is useful to make sure that lines for NIS groups are not larger "
-"than 1024 characters."
-msgstr ""
-
-#: vipw.8.xml:20(para) usermod.8.xml:20(para) userdel.8.xml:20(para)
-#: useradd.8.xml:20(para) pwconv.8.xml:20(para) newusers.8.xml:20(para)
-#: login.defs.5.xml:20(para) grpck.8.xml:20(para) groupmod.8.xml:20(para)
-#: groupmems.8.xml:20(para) groupdel.8.xml:20(para) groupadd.8.xml:20(para)
-#: gpasswd.1.xml:20(para) chgpasswd.8.xml:20(para)
-msgid "If you need to enforce such limit, you can use 25."
-msgstr ""
-
-#: vipw.8.xml:23(para) usermod.8.xml:23(para) userdel.8.xml:23(para)
-#: useradd.8.xml:23(para) pwconv.8.xml:23(para) newusers.8.xml:23(para)
-#: login.defs.5.xml:23(para) grpck.8.xml:23(para) groupmod.8.xml:23(para)
-#: groupmems.8.xml:23(para) groupdel.8.xml:23(para) groupadd.8.xml:23(para)
-#: gpasswd.1.xml:23(para) chgpasswd.8.xml:23(para)
-msgid ""
-"Note: split groups may not be supported by all tools (even in the Shadow "
-"toolsuite. You should not use this variable unless you really need it."
-msgstr ""
-
-#: vipw.8.xml:107(title) usermod.8.xml:278(title) userdel.8.xml:111(title)
-#: useradd.8.xml:493(title) suauth.5.xml:139(title) su.1.xml:224(title)
-#: sg.1.xml:59(title) shadow.5.xml:105(title) shadow.3.xml:172(title)
-#: pwconv.8.xml:138(title) pwck.8.xml:167(title) porttime.5.xml:76(title)
-#: passwd.5.xml:87(title) passwd.1.xml:325(title) newusers.8.xml:197(title)
-#: newgrp.1.xml:70(title) logoutd.8.xml:35(title) login.access.5.xml:66(title)
-#: login.1.xml:280(title) limits.5.xml:110(title) lastlog.8.xml:111(title)
-#: gshadow.5.xml:61(title) grpck.8.xml:137(title) groups.1.xml:46(title)
-#: groupmod.8.xml:121(title) groupmems.8.xml:119(title)
-#: groupdel.8.xml:59(title) groupadd.8.xml:163(title) gpasswd.1.xml:201(title)
-#: faillog.8.xml:132(title) faillog.5.xml:38(title) expiry.1.xml:38(title)
-#: chsh.1.xml:104(title) chpasswd.8.xml:153(title) chgpasswd.8.xml:148(title)
-#: chfn.1.xml:84(title) chage.1.xml:177(title)
+#: vipw.8.xml:124(title) usermod.8.xml:322(title) userdel.8.xml:140(title)
+#: useradd.8.xml:619(title) suauth.5.xml:168(title) su.1.xml:253(title)
+#: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
+#: pwconv.8.xml:168(title) pwck.8.xml:196(title) porttime.5.xml:105(title)
+#: passwd.5.xml:116(title) passwd.1.xml:367(title) newusers.8.xml:320(title)
+#: newgrp.1.xml:99(title) logoutd.8.xml:64(title) login.access.5.xml:96(title)
+#: login.1.xml:316(title) limits.5.xml:140(title) lastlog.8.xml:147(title)
+#: gshadow.5.xml:89(title) grpck.8.xml:166(title) groups.1.xml:75(title)
+#: groupmod.8.xml:150(title) groupmems.8.xml:168(title)
+#: groupdel.8.xml:88(title) groupadd.8.xml:189(title) gpasswd.1.xml:230(title)
+#: faillog.8.xml:204(title) faillog.5.xml:67(title) expiry.1.xml:68(title)
+#: chsh.1.xml:133(title) chpasswd.8.xml:185(title) chgpasswd.8.xml:180(title)
+#: chfn.1.xml:113(title) chage.1.xml:206(title)
 msgid "FILES"
 msgstr "FICHIERS"
 
-#: vipw.8.xml:110(filename) usermod.8.xml:281(filename)
-#: userdel.8.xml:114(filename) useradd.8.xml:508(filename)
-#: sg.1.xml:74(filename) pwck.8.xml:170(filename) newusers.8.xml:212(filename)
-#: newgrp.1.xml:85(filename) gshadow.5.xml:64(filename)
-#: grpck.8.xml:140(filename) groups.1.xml:49(filename)
-#: groupmod.8.xml:124(filename) groupmems.8.xml:122(filename)
-#: groupdel.8.xml:62(filename) groupadd.8.xml:166(filename)
-#: gpasswd.1.xml:20(filename) gpasswd.1.xml:204(filename)
-#: chgpasswd.8.xml:151(filename)
+#: vipw.8.xml:127(filename) usermod.8.xml:325(filename)
+#: userdel.8.xml:143(filename) useradd.8.xml:634(filename)
+#: sg.1.xml:103(filename) pwck.8.xml:199(filename)
+#: newusers.8.xml:335(filename) newgrp.1.xml:114(filename)
+#: gshadow.5.xml:92(filename) grpck.8.xml:169(filename)
+#: groups.1.xml:78(filename) groupmod.8.xml:153(filename)
+#: groupmems.8.xml:171(filename) groupdel.8.xml:91(filename)
+#: groupadd.8.xml:192(filename) gpasswd.1.xml:49(filename)
+#: gpasswd.1.xml:233(filename) chgpasswd.8.xml:183(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
-#: vipw.8.xml:112(para) usermod.8.xml:283(para) userdel.8.xml:116(para)
-#: useradd.8.xml:510(para) sg.1.xml:76(para) pwck.8.xml:172(para)
-#: newusers.8.xml:214(para) newgrp.1.xml:87(para) gshadow.5.xml:66(para)
-#: grpck.8.xml:142(para) groups.1.xml:51(para) groupmod.8.xml:126(para)
-#: groupmems.8.xml:124(para) groupdel.8.xml:64(para) groupadd.8.xml:168(para)
-#: gpasswd.1.xml:206(para) chgpasswd.8.xml:153(para)
+#: vipw.8.xml:129(para) usermod.8.xml:327(para) userdel.8.xml:145(para)
+#: useradd.8.xml:636(para) sg.1.xml:105(para) pwck.8.xml:201(para)
+#: newusers.8.xml:337(para) newgrp.1.xml:116(para) gshadow.5.xml:94(para)
+#: grpck.8.xml:171(para) groups.1.xml:80(para) groupmod.8.xml:155(para)
+#: groupmems.8.xml:173(para) groupdel.8.xml:93(para) groupadd.8.xml:194(para)
+#: gpasswd.1.xml:235(para) chgpasswd.8.xml:185(para)
 msgid "Group account information."
 msgstr "Informations sur les groupes."
 
-#: vipw.8.xml:116(filename) useradd.8.xml:514(filename) sg.1.xml:80(filename)
-#: newusers.8.xml:218(filename) newgrp.1.xml:91(filename)
-#: gshadow.5.xml:70(filename) grpck.8.xml:146(filename)
-#: groupmod.8.xml:130(filename) groupmems.8.xml:128(filename)
-#: groupdel.8.xml:68(filename) groupadd.8.xml:172(filename)
-#: gpasswd.1.xml:21(filename) gpasswd.1.xml:210(filename)
-#: chgpasswd.8.xml:157(filename)
+#: vipw.8.xml:133(filename) useradd.8.xml:640(filename) sg.1.xml:109(filename)
+#: newusers.8.xml:341(filename) newgrp.1.xml:120(filename)
+#: gshadow.5.xml:98(filename) grpck.8.xml:175(filename)
+#: groupmod.8.xml:159(filename) groupmems.8.xml:177(filename)
+#: groupdel.8.xml:97(filename) groupadd.8.xml:198(filename)
+#: gpasswd.1.xml:50(filename) gpasswd.1.xml:239(filename)
+#: chgpasswd.8.xml:189(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
-#: vipw.8.xml:118(para) useradd.8.xml:516(para) sg.1.xml:82(para)
-#: newusers.8.xml:220(para) newgrp.1.xml:93(para) gshadow.5.xml:72(para)
-#: grpck.8.xml:148(para) groupmod.8.xml:132(para) groupdel.8.xml:70(para)
-#: groupadd.8.xml:174(para) gpasswd.1.xml:212(para) chgpasswd.8.xml:159(para)
+#: vipw.8.xml:135(para) useradd.8.xml:642(para) sg.1.xml:111(para)
+#: newusers.8.xml:343(para) newgrp.1.xml:122(para) gshadow.5.xml:100(para)
+#: grpck.8.xml:177(para) groupmod.8.xml:161(para) groupdel.8.xml:99(para)
+#: groupadd.8.xml:200(para) gpasswd.1.xml:241(para) chgpasswd.8.xml:191(para)
 msgid "Secure group account information."
 msgstr "Informations sécurisées sur les groupes."
 
-#: vipw.8.xml:122(filename) usermod.8.xml:287(filename)
-#: userdel.8.xml:126(filename) useradd.8.xml:496(filename)
-#: su.1.xml:227(filename) sg.1.xml:62(filename) shadow.5.xml:108(filename)
-#: pwck.8.xml:176(filename) passwd.5.xml:90(filename)
-#: passwd.1.xml:328(filename) newusers.8.xml:200(filename)
-#: newgrp.1.xml:73(filename) login.1.xml:295(filename)
-#: grpck.8.xml:152(filename) expiry.1.xml:41(filename)
-#: chsh.1.xml:107(filename) chpasswd.8.xml:156(filename)
-#: chfn.1.xml:93(filename) chage.1.xml:181(filename)
+#: vipw.8.xml:139(filename) usermod.8.xml:331(filename)
+#: userdel.8.xml:155(filename) useradd.8.xml:622(filename)
+#: su.1.xml:256(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
+#: pwck.8.xml:205(filename) passwd.5.xml:119(filename)
+#: passwd.1.xml:370(filename) newusers.8.xml:323(filename)
+#: newgrp.1.xml:102(filename) login.1.xml:331(filename)
+#: grpck.8.xml:181(filename) expiry.1.xml:71(filename)
+#: chsh.1.xml:136(filename) chpasswd.8.xml:188(filename)
+#: chfn.1.xml:122(filename) chage.1.xml:210(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
-#: vipw.8.xml:124(para) usermod.8.xml:289(para) userdel.8.xml:128(para)
-#: useradd.8.xml:498(para) su.1.xml:229(para) sg.1.xml:64(para)
-#: shadow.5.xml:110(para) pwck.8.xml:178(para) passwd.5.xml:92(para)
-#: passwd.1.xml:330(para) newusers.8.xml:202(para) newgrp.1.xml:75(para)
-#: login.1.xml:297(para) grpck.8.xml:154(para) expiry.1.xml:43(para)
-#: chsh.1.xml:109(para) chpasswd.8.xml:158(para) chfn.1.xml:95(para)
-#: chage.1.xml:184(para)
+#: vipw.8.xml:141(para) usermod.8.xml:333(para) userdel.8.xml:157(para)
+#: useradd.8.xml:624(para) su.1.xml:258(para) sg.1.xml:93(para)
+#: shadow.5.xml:235(para) pwck.8.xml:207(para) passwd.5.xml:121(para)
+#: passwd.1.xml:372(para) newusers.8.xml:325(para) newgrp.1.xml:104(para)
+#: login.1.xml:333(para) grpck.8.xml:183(para) expiry.1.xml:73(para)
+#: chsh.1.xml:138(para) chpasswd.8.xml:190(para) chfn.1.xml:124(para)
+#: chage.1.xml:213(para)
 msgid "User account information."
 msgstr "Informations sur les comptes des utilisateurs."
 
-#: vipw.8.xml:128(filename) usermod.8.xml:293(filename)
-#: userdel.8.xml:132(filename) useradd.8.xml:502(filename)
-#: su.1.xml:233(filename) sg.1.xml:68(filename) shadow.5.xml:114(filename)
-#: shadow.3.xml:175(filename) pwck.8.xml:182(filename)
-#: passwd.5.xml:96(filename) passwd.1.xml:334(filename)
-#: newusers.8.xml:206(filename) newgrp.1.xml:79(filename)
-#: login.1.xml:301(filename) expiry.1.xml:47(filename)
-#: chpasswd.8.xml:162(filename) chage.1.xml:189(filename)
+#: vipw.8.xml:145(filename) usermod.8.xml:337(filename)
+#: userdel.8.xml:161(filename) useradd.8.xml:628(filename)
+#: su.1.xml:262(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
+#: shadow.3.xml:204(filename) pwck.8.xml:211(filename)
+#: passwd.5.xml:125(filename) passwd.1.xml:376(filename)
+#: newusers.8.xml:329(filename) newgrp.1.xml:108(filename)
+#: login.1.xml:337(filename) expiry.1.xml:77(filename)
+#: chpasswd.8.xml:194(filename) chage.1.xml:218(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
-#: vipw.8.xml:130(para) usermod.8.xml:295(para) userdel.8.xml:134(para)
-#: useradd.8.xml:504(para) su.1.xml:235(para) sg.1.xml:70(para)
-#: shadow.5.xml:116(para) shadow.3.xml:177(para) pwck.8.xml:184(para)
-#: passwd.1.xml:336(para) newusers.8.xml:208(para) newgrp.1.xml:81(para)
-#: login.1.xml:303(para) expiry.1.xml:49(para) chpasswd.8.xml:164(para)
-#: chage.1.xml:192(para)
+#: vipw.8.xml:147(para) usermod.8.xml:339(para) userdel.8.xml:163(para)
+#: useradd.8.xml:630(para) su.1.xml:264(para) sg.1.xml:99(para)
+#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:213(para)
+#: passwd.1.xml:378(para) newusers.8.xml:331(para) newgrp.1.xml:110(para)
+#: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:196(para)
+#: chage.1.xml:221(para)
 msgid "Secure user account information."
 msgstr "Informations sécurisées sur les comptes utilisateurs."
 
-#: vipw.8.xml:137(title) usermod.8.xml:302(title) userdel.8.xml:213(title)
-#: useradd.8.xml:610(title) suauth.5.xml:168(title) su.1.xml:242(title)
-#: sg.1.xml:89(title) shadow.5.xml:123(title) shadow.3.xml:184(title)
-#: pwconv.8.xml:150(title) pwck.8.xml:191(title) porttime.5.xml:88(title)
-#: passwd.5.xml:105(title) passwd.1.xml:394(title) nologin.8.xml:35(title)
-#: newusers.8.xml:233(title) newgrp.1.xml:100(title)
-#: login.defs.5.xml:445(title) login.access.5.xml:78(title)
-#: login.1.xml:334(title) limits.5.xml:120(title) gshadow.5.xml:79(title)
-#: grpck.8.xml:161(title) groups.1.xml:58(title) groupmod.8.xml:190(title)
-#: groupmems.8.xml:137(title) groupdel.8.xml:116(title)
-#: groupadd.8.xml:253(title) gpasswd.1.xml:219(title) faillog.8.xml:144(title)
-#: faillog.5.xml:50(title) expiry.1.xml:56(title) chsh.1.xml:128(title)
-#: chpasswd.8.xml:177(title) chgpasswd.8.xml:172(title) chfn.1.xml:102(title)
-#: chage.1.xml:232(title)
+#: vipw.8.xml:154(title) usermod.8.xml:346(title) userdel.8.xml:242(title)
+#: useradd.8.xml:736(title) suauth.5.xml:197(title) su.1.xml:271(title)
+#: sg.1.xml:118(title) shadow.5.xml:248(title) shadow.3.xml:213(title)
+#: pwconv.8.xml:180(title) pwck.8.xml:220(title) porttime.5.xml:117(title)
+#: passwd.5.xml:134(title) passwd.1.xml:436(title) nologin.8.xml:64(title)
+#: newusers.8.xml:356(title) newgrp.1.xml:129(title)
+#: login.defs.5.xml:471(title) login.access.5.xml:108(title)
+#: login.1.xml:370(title) limits.5.xml:150(title) gshadow.5.xml:107(title)
+#: grpck.8.xml:190(title) groups.1.xml:87(title) groupmod.8.xml:219(title)
+#: groupmems.8.xml:186(title) groupdel.8.xml:145(title)
+#: groupadd.8.xml:279(title) gpasswd.1.xml:248(title) faillog.8.xml:216(title)
+#: faillog.5.xml:79(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
+#: chpasswd.8.xml:209(title) chgpasswd.8.xml:204(title) chfn.1.xml:131(title)
+#: chage.1.xml:261(title)
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
-#: vipw.8.xml:138(para)
+#: vipw.8.xml:155(para)
 msgid ""
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>group</"
@@ -400,23 +316,22 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: usermod.8.xml:10(refentrytitle) usermod.8.xml:15(refname)
-#: usermod.8.xml:21(command) login.defs.5.xml:411(term)
+#: usermod.8.xml:39(refentrytitle) usermod.8.xml:44(refname)
+#: usermod.8.xml:50(command) login.defs.5.xml:443(term)
 msgid "usermod"
 msgstr "usermod"
 
-#: usermod.8.xml:16(refpurpose)
+#: usermod.8.xml:45(refpurpose)
 msgid "modify a user account"
 msgstr "Modifier un compte utilisateur"
 
-#: usermod.8.xml:25(replaceable) userdel.8.xml:25(replaceable)
-#: useradd.8.xml:33(replaceable) su.1.xml:41(replaceable)
-#: passwd.1.xml:31(replaceable) chsh.1.xml:27(replaceable)
-#: chage.1.xml:20(replaceable)
+#: usermod.8.xml:54(replaceable) userdel.8.xml:54(replaceable)
+#: useradd.8.xml:63(replaceable) passwd.1.xml:60(replaceable)
+#: chsh.1.xml:56(replaceable) chage.1.xml:49(replaceable)
 msgid "LOGIN"
 msgstr "LOGIN"
 
-#: usermod.8.xml:31(para)
+#: usermod.8.xml:60(para)
 msgid ""
 "The <command>usermod</command> command modifies the system account files to "
 "reflect the changes that are specified on the command line."
@@ -425,16 +340,16 @@
 "des comptes du système selon les modifications qui ont été indiquées sur la "
 "ligne de commande."
 
-#: usermod.8.xml:39(para)
+#: usermod.8.xml:68(para)
 msgid "The options which apply to the <command>usermod</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>usermod</command> sont :"
 
-#: usermod.8.xml:45(term)
+#: usermod.8.xml:74(term)
 msgid "<option>-a</option>, <option>--append</option>"
 msgstr "<option>-a</option>, <option>--append</option>"
 
-#: usermod.8.xml:49(para)
+#: usermod.8.xml:78(para)
 msgid ""
 "Add the user to the supplemental group(s). Use only with <option>-G</option> "
 "option."
@@ -442,7 +357,7 @@
 "Ajouter l'utilisateur aux groupes supplémentaires. N'utilisez cette option "
 "qu'avec l'option <option>-G</option>."
 
-#: usermod.8.xml:56(term) useradd.8.xml:83(term)
+#: usermod.8.xml:85(term) useradd.8.xml:125(term)
 msgid ""
 "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
 "replaceable>"
@@ -450,7 +365,7 @@
 "<option>-c</option>, <option>--comment</option> <replaceable>COMMENTAIRE</"
 "replaceable>"
 
-#: usermod.8.xml:61(para)
+#: usermod.8.xml:90(para)
 msgid ""
 "The new value of the user's password file comment field. It is normally "
 "modified using the <citerefentry><refentrytitle>chfn</"
@@ -461,7 +376,7 @@
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: usermod.8.xml:70(term) useradd.8.xml:96(term)
+#: usermod.8.xml:99(term) useradd.8.xml:138(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
@@ -469,17 +384,28 @@
 "<option>-d</option>, <option>--home</option> <replaceable>RÉP_PERSO</"
 "replaceable>"
 
-#: usermod.8.xml:75(para)
+#: usermod.8.xml:104(para)
+#, fuzzy
+#| msgid "user home directory"
+msgid "The user's new login directory."
+msgstr "le répertoire personnel de l'utilisateur"
+
+#: usermod.8.xml:107(para)
+#, fuzzy
+#| msgid ""
+#| "The user's new login directory. If the <option>-m</option> option is "
+#| "given the contents of the current home directory will be moved to the new "
+#| "home directory, which is created if it does not already exist."
 msgid ""
-"The user's new login directory. If the <option>-m</option> option is given "
-"the contents of the current home directory will be moved to the new home "
-"directory, which is created if it does not already exist."
+"If the <option>-m</option> option is given the contents of the current home "
+"directory will be moved to the new home directory, which is created if it "
+"does not already exist."
 msgstr ""
 "Le nouveau répertoire de connexion de l'utilisateur. Si l'option <option>-m</"
 "option> est fournie, le contenu du répertoire personnel actuel sera déplacé "
 "dans le nouveau répertoire personnel, qui sera créé si nécessaire."
 
-#: usermod.8.xml:84(term) useradd.8.xml:123(term) useradd.8.xml:394(term)
+#: usermod.8.xml:116(term) useradd.8.xml:165(term) useradd.8.xml:494(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -487,7 +413,7 @@
 "<option>-e</option>, <option>--expiredate</option> "
 "<replaceable>DATE_FIN_VALIDITÉ</replaceable>"
 
-#: usermod.8.xml:89(para) useradd.8.xml:128(para)
+#: usermod.8.xml:121(para) useradd.8.xml:170(para)
 msgid ""
 "The date on which the user account will be disabled. The date is specified "
 "in the format <emphasis remap=\"I\">YYYY-MM-DD</emphasis>."
@@ -495,7 +421,7 @@
 "Date à laquelle le compte utilisateur sera désactivé. La date est indiquée "
 "dans le format <emphasis remap=\"I\">AAAA-MM-JJ</emphasis>."
 
-#: usermod.8.xml:96(term) useradd.8.xml:135(term) useradd.8.xml:403(term)
+#: usermod.8.xml:128(term) useradd.8.xml:183(term) useradd.8.xml:507(term)
 msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -503,24 +429,41 @@
 "<option>-f</option>, <option>--inactive</option> "
 "<replaceable>DURÉE_INACTIVITÉ</replaceable>"
 
-#: usermod.8.xml:101(para) useradd.8.xml:140(para)
+#: usermod.8.xml:133(para)
+#, fuzzy
+#| msgid ""
+#| "The number of days after a password has expired before the account will "
+#| "be disabled."
 msgid ""
 "The number of days after a password expires until the account is permanently "
-"disabled. A value of 0 disables the account as soon as the password has "
-"expired, and a value of -1 disables the feature. The default value is -1."
+"disabled."
 msgstr ""
+"Nombre de jours après la fin de validité d'un mot de passe avant que le "
+"compte ne soit désactivé."
+
+#: usermod.8.xml:137(para)
+#, fuzzy
+#| msgid ""
+#| "The number of days after a password expires until the account is "
+#| "permanently disabled. A value of 0 disables the account as soon as the "
+#| "password has expired, and a value of -1 disables the feature. The default "
+#| "value is -1."
+msgid ""
+"A value of 0 disables the account as soon as the password has expired, and a "
+"value of -1 disables the feature. The default value is -1."
+msgstr ""
 "Nombre de jours suivant la fin de validité d'un mot de passe après lequel le "
 "compte est définitivement désactivé. Une valeur de 0 désactive le compte dès "
 "que le mot de passe a dépassé sa fin de validité, et une valeur de -1 "
 "désactive cette fonctionnalité. La valeur par défaut est de -1."
 
-#: usermod.8.xml:110(term) useradd.8.xml:149(term) useradd.8.xml:415(term)
+#: usermod.8.xml:145(term) useradd.8.xml:203(term) useradd.8.xml:523(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option> <replaceable>GROUPE</replaceable>"
 
-#: usermod.8.xml:115(para)
+#: usermod.8.xml:150(para)
 msgid ""
 "The group name or number of the user's new initial login group. The group "
 "name must exist. A group number must refer to an already existing group. The "
@@ -530,7 +473,7 @@
 "l'utilisateur. Le nom du groupe doit exister. Un numéro de groupe doit se "
 "référer à un groupe déjà existant. Le numéro de groupe par défaut est de 1."
 
-#: usermod.8.xml:123(term) useradd.8.xml:163(term)
+#: usermod.8.xml:158(term) useradd.8.xml:231(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -540,18 +483,35 @@
 "replaceable>[<emphasis remap=\"I\">,GROUPE2,...</emphasis>[<emphasis remap="
 "\"I\">,GROUPEN</emphasis>]]]"
 
-#: usermod.8.xml:128(para)
+#: usermod.8.xml:163(para)
 #, fuzzy
+#| msgid ""
+#| "A list of supplementary groups which the user is also a member of. Each "
+#| "group is separated from the next by a comma, with no intervening "
+#| "whitespace. The groups are subject to the same restrictions as the group "
+#| "given with the <option>-g</option> option. The default is for the user to "
+#| "belong only to the initial group."
 msgid ""
 "A list of supplementary groups which the user is also a member of. Each "
 "group is separated from the next by a comma, with no intervening whitespace. "
 "The groups are subject to the same restrictions as the group given with the "
-"<option>-g</option> option. If the user is currently a member of a group "
-"which is not listed, the user will be removed from the group. This behaviour "
-"can be changed via the <option>-a</option> option, which appends the user to "
-"the current supplementary group list."
+"<option>-g</option> option."
 msgstr ""
 "Liste de groupes supplémentaires auxquels appartient également "
+"l'utilisateur. Chaque groupe est séparé du suivant par une virgule, sans "
+"espace entre eux. Les groupes sont soumis aux mêmes restrictions que celles "
+"de l'option <option>-g</option>. Le comportement par défaut pour "
+"l'utilisateur est de n'appartenir qu'au groupe initial."
+
+#: usermod.8.xml:170(para)
+#, fuzzy
+msgid ""
+"If the user is currently a member of a group which is not listed, the user "
+"will be removed from the group. This behaviour can be changed via the "
+"<option>-a</option> option, which appends the user to the current "
+"supplementary group list."
+msgstr ""
+"Liste de groupes supplémentaires auxquels appartient également "
 "l'utilisateur. Les groupes sont séparés par une virgule, sans espace entre "
 "eux. Les groupes sont soumis aux mêmes restrictions que celles données avec "
 "l'option <option>-g</option>. Si l'utilisateur fait actuellement partie d'un "
@@ -559,7 +519,7 @@
 "comportement peut être modifié par l'option <option>-a</option>, qui permet "
 "d'ajouter l'utilisateur à la liste actuelle des groupes supplémentaires."
 
-#: usermod.8.xml:141(term)
+#: usermod.8.xml:179(term)
 msgid ""
 "<option>-l</option>, <option>--login</option><replaceable>NEW_LOGIN</"
 "replaceable>"
@@ -568,24 +528,24 @@
 "replaceable>"
 
 # NOTE: relaceable
-#: usermod.8.xml:146(para)
+#: usermod.8.xml:184(para)
 #, fuzzy
 msgid ""
-"The name of the user will be changed from <emphasis remap=\"I\">LOGIN</"
-"emphasis> to <emphasis remap=\"I\">NEW_LOGIN</emphasis>. Nothing else is "
-"changed. In particular, the user's home directory name should probably be "
-"changed manually to reflect the new login name."
+"The name of the user will be changed from <replaceable>LOGIN</replaceable> "
+"to <replaceable>NEW_LOGIN</replaceable>. Nothing else is changed. In "
+"particular, the user's home directory name should probably be changed "
+"manually to reflect the new login name."
 msgstr ""
 "Le nom de l'utilisateur passera de <replaceable>LOGIN</replaceable> à "
 "<replaceable>NOUVEAU_LOGIN</replaceable>. Rien d'autre ne sera modifié. En "
 "particulier, le nom du répertoire personnel de l'utilisateur devra "
 "probablement être changé pour refléter le nouveau nom de connexion."
 
-#: usermod.8.xml:156(term)
+#: usermod.8.xml:194(term)
 msgid "<option>-L</option>, <option>--lock</option>"
 msgstr "<option>-L</option>, <option>--lock</option>"
 
-#: usermod.8.xml:160(para)
+#: usermod.8.xml:198(para)
 msgid ""
 "Lock a user's password. This puts a '!' in front of the encrypted password, "
 "effectively disabling the password. You can't use this option with <option>-"
@@ -596,19 +556,19 @@
 "pouvez pas utiliser cette option avec <option>-p</option> ou <option>-U</"
 "option>."
 
-#: usermod.8.xml:166(para)
+#: usermod.8.xml:204(para)
 msgid ""
 "Note: if you wish to lock the account (not only access with a password), you "
 "should also set the <replaceable>EXPIRE_DATE</replaceable> to "
 "<replaceable>1</replaceable>."
 msgstr ""
 
-#: usermod.8.xml:175(term) useradd.8.xml:282(term) groupmod.8.xml:82(term)
-#: groupadd.8.xml:107(term)
+#: usermod.8.xml:213(term) useradd.8.xml:364(term) groupmod.8.xml:111(term)
+#: groupadd.8.xml:133(term)
 msgid "<option>-o</option>, <option>--non-unique</option>"
 msgstr "<option>-o</option>, <option>--non-unique</option>"
 
-#: usermod.8.xml:179(para)
+#: usermod.8.xml:217(para)
 msgid ""
 "When used with the <option>-u</option> option, this option allows to change "
 "the user ID to a non-unique value."
@@ -616,8 +576,8 @@
 "En combinaison avec l'option <option>-u</option>, cette option permet de "
 "changer l'identifiant utilisateur vers une valeur déjà utilisée."
 
-#: usermod.8.xml:186(term) useradd.8.xml:290(term) groupmod.8.xml:93(term)
-#: groupadd.8.xml:117(term)
+#: usermod.8.xml:224(term) useradd.8.xml:376(term) groupmod.8.xml:122(term)
+#: groupadd.8.xml:143(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
@@ -625,7 +585,7 @@
 "<option>-p</option>, <option>--password</option> <replaceable>MOT_DE_PASSE</"
 "replaceable>"
 
-#: usermod.8.xml:191(para)
+#: usermod.8.xml:229(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
@@ -633,15 +593,15 @@
 "Mot de passe chiffré, comme renvoyé par <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
 
-#: usermod.8.xml:199(term) useradd.8.xml:322(term) useradd.8.xml:428(term)
-#: su.1.xml:128(term) chsh.1.xml:56(term)
+#: usermod.8.xml:237(term) useradd.8.xml:416(term) useradd.8.xml:544(term)
+#: su.1.xml:157(term) chsh.1.xml:85(term)
 msgid ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
 "<option>-s</option>, <option>--shell</option> <replaceable>INTERPRÉTEUR</"
 "replaceable>"
 
-#: usermod.8.xml:204(para) chsh.1.xml:60(para)
+#: usermod.8.xml:242(para) chsh.1.xml:89(para)
 msgid ""
 "The name of the user's new login shell. Setting this field to blank causes "
 "the system to select the default login shell."
@@ -650,21 +610,53 @@
 "l'utilisateur. Si ce champ est vide, le système sélectionnera l'interpréteur "
 "de commandes initial par défaut."
 
-#: usermod.8.xml:211(term) useradd.8.xml:335(term)
+#: usermod.8.xml:249(term) useradd.8.xml:431(term)
 msgid ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 "<option>-u</option>, <option>--uid</option> <replaceable>UID</replaceable>"
 
-#: usermod.8.xml:216(para)
+#: usermod.8.xml:254(para)
+msgid "The new numerical value of the user's ID."
+msgstr ""
+
+#: usermod.8.xml:257(para)
+#, fuzzy
+#| msgid ""
+#| "The numerical value of the user's ID. This value must be unique, unless "
+#| "the <option>-o</option> option is used. The value must be non-negative. "
+#| "The default is to use the smallest ID value greater than 999 and greater "
+#| "than every other user. Values between 0 and 999 are typically reserved "
+#| "for system accounts."
 msgid ""
-"The numerical value of the user's ID. This value must be unique, unless the "
-"<option>-o</option> option is used. The value must be non-negative. Values "
-"between 0 and 999 are typically reserved for system accounts. Any files "
-"which the user owns and which are located in the directory tree rooted at "
-"the user's home directory will have the file user ID changed automatically. "
-"Files outside of the user's home directory must be altered manually."
+"This value must be unique, unless the <option>-o</option> option is used. "
+"The value must be non-negative. Values between 0 and 999 are typically "
+"reserved for system accounts."
 msgstr ""
+"La valeur numérique de l'identifiant de l'utilisateur. Cette valeur doit "
+"être unique, à moins que l'option <option>-o</option> ne soit utilisée. La "
+"valeur ne doit pas être négative. Le comportement par défaut est d'utiliser "
+"la plus petite valeur d'identifiant plus grande que 999, et plus grande que "
+"celle des identifiants de tous les autres utilisateurs. Les valeurs "
+"comprises entre 0 et 999 sont généralement réservées pour les comptes "
+"systèmes."
+
+#: usermod.8.xml:263(para)
+#, fuzzy
+#| msgid ""
+#| "The numerical value of the user's ID. This value must be unique, unless "
+#| "the <option>-o</option> option is used. The value must be non-negative. "
+#| "Values between 0 and 999 are typically reserved for system accounts. Any "
+#| "files which the user owns and which are located in the directory tree "
+#| "rooted at the user's home directory will have the file user ID changed "
+#| "automatically. Files outside of the user's home directory must be altered "
+#| "manually."
+msgid ""
+"Any files which the user owns and which are located in the directory tree "
+"rooted at the user's home directory will have the file user ID changed "
+"automatically. Files outside of the user's home directory must be altered "
+"manually."
+msgstr ""
 "Valeur numérique de l'identifiant de l'utilisateur. Cette valeur doit être "
 "unique, à moins que l'option <option>-o</option> ne soit utilisée. La valeur "
 "ne doit pas être négative. Les valeurs comprises entre 0 et 999 sont "
@@ -674,11 +666,11 @@
 "même les fichiers situés à l'extérieur du répertoire personnel de "
 "l'utilisateur."
 
-#: usermod.8.xml:229(term)
+#: usermod.8.xml:273(term)
 msgid "<option>-U</option>, <option>--unlock</option>"
 msgstr "<option>-U</option>, <option>--unlock</option>"
 
-#: usermod.8.xml:233(para)
+#: usermod.8.xml:277(para)
 msgid ""
 "Unlock a user's password. This removes the '!' in front of the encrypted "
 "password. You can't use this option with <option>-p</option> or <option>-L</"
@@ -688,7 +680,7 @@
 "devant le mot de passe chiffré. Vous ne pouvez pas utiliser cette option "
 "avec <option>-p</option> ou <option>-L</option>."
 
-#: usermod.8.xml:238(para)
+#: usermod.8.xml:282(para)
 msgid ""
 "Note: if you wish to unlock the account (not only access with a password), "
 "you should also set the <replaceable>EXPIRE_DATE</replaceable> (for example "
@@ -696,18 +688,27 @@
 "replaceable> value from <filename>/etc/default/useradd</filename>)."
 msgstr ""
 
-#: usermod.8.xml:252(title) userdel.8.xml:192(title) useradd.8.xml:451(title)
-#: su.1.xml:188(title) shadow.3.xml:164(title) passwd.1.xml:296(title)
-#: newusers.8.xml:160(title) login.1.xml:202(title) lastlog.8.xml:123(title)
-#: groupdel.8.xml:40(title) groupadd.8.xml:187(title) gpasswd.1.xml:174(title)
-#: faillog.8.xml:121(title) chpasswd.8.xml:125(title)
-#: chgpasswd.8.xml:125(title)
+#: usermod.8.xml:296(title) userdel.8.xml:221(title) useradd.8.xml:573(title)
+#: su.1.xml:217(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
+#: newusers.8.xml:283(title) login.1.xml:238(title) lastlog.8.xml:159(title)
+#: groupdel.8.xml:69(title) groupadd.8.xml:213(title) gpasswd.1.xml:203(title)
+#: faillog.8.xml:193(title) chpasswd.8.xml:157(title)
+#: chgpasswd.8.xml:157(title)
 msgid "CAVEATS"
 msgstr "AVERTISSEMENTS"
 
-#: usermod.8.xml:253(para)
+#: usermod.8.xml:297(para)
+#, fuzzy
+#| msgid ""
+#| "<command>usermod</command> will not allow you to change the name of a "
+#| "user who is logged in. You must make certain that the named user is not "
+#| "executing any processes when this command is being executed if the user's "
+#| "numerical user ID is being changed. You must change the owner of any "
+#| "<command>crontab</command> files manually. You must change the owner of "
+#| "any <command>at</command> jobs manually. You must make any changes "
+#| "involving NIS on the NIS server."
 msgid ""
-"<command>usermod</command> will not allow you to change the name of a user "
+"<command>usermod</command> will not allow you to change the name of an user "
 "who is logged in. You must make certain that the named user is not executing "
 "any processes when this command is being executed if the user's numerical "
 "user ID is being changed. You must change the owner of any <command>crontab</"
@@ -724,14 +725,37 @@
 "Vous devez effectuer toutes les modifications impliquant NIS sur le serveur "
 "NIS."
 
-#: usermod.8.xml:2(term) userdel.8.xml:2(term) useradd.8.xml:2(term)
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: usermod.8.xml:309(title) userdel.8.xml:125(title) useradd.8.xml:596(title)
+#: su.1.xml:225(title) sg.1.xml:76(title) pwconv.8.xml:146(title)
+#: pwck.8.xml:182(title) passwd.1.xml:349(title) newusers.8.xml:297(title)
+#: newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:154(title)
+#: groupmod.8.xml:138(title) groupmems.8.xml:156(title)
+#: groupdel.8.xml:76(title) groupadd.8.xml:175(title) gpasswd.1.xml:215(title)
+#: chsh.1.xml:120(title) chpasswd.8.xml:171(title) chgpasswd.8.xml:165(title)
+#: chfn.1.xml:99(title)
+msgid "CONFIGURATION"
+msgstr ""
+
+#: usermod.8.xml:310(para) userdel.8.xml:126(para) useradd.8.xml:597(para)
+#: su.1.xml:226(para) sg.1.xml:77(para) pwck.8.xml:183(para)
+#: passwd.1.xml:350(para) newusers.8.xml:298(para) newgrp.1.xml:88(para)
+#: login.1.xml:273(para) grpck.8.xml:155(para) groupmod.8.xml:139(para)
+#: groupmems.8.xml:157(para) groupdel.8.xml:77(para) groupadd.8.xml:176(para)
+#: gpasswd.1.xml:216(para) chsh.1.xml:121(para) chpasswd.8.xml:172(para)
+#: chgpasswd.8.xml:166(para) chfn.1.xml:100(para)
+msgid ""
+"The following configuration variables in <filename>/etc/login.defs</"
+"filename> change the behavior of this tool:"
+msgstr ""
+
+#: usermod.8.xml:32(term) userdel.8.xml:32(term) useradd.8.xml:32(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>MAIL_DIR</option> (string)"
 msgstr "MAIL_DIR (chaîne)"
 
-#: usermod.8.xml:4(para) userdel.8.xml:4(para) useradd.8.xml:4(para)
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: usermod.8.xml:34(para) userdel.8.xml:34(para) useradd.8.xml:34(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "The mail spool directory. This is needed to manipulate the mailbox when its "
 "corresponding user account is modified or deleted. If not specified, a "
@@ -742,30 +766,30 @@
 "utilisateur est modifié ou supprimé. S'il n'est pas spécifié, une valeur par "
 "défaut définie à la compilation est utilisée."
 
-#: usermod.8.xml:11(term) userdel.8.xml:11(term) useradd.8.xml:11(term)
-#: su.1.xml:11(term) login.defs.5.xml:11(term) login.1.xml:11(term)
+#: usermod.8.xml:41(term) userdel.8.xml:41(term) useradd.8.xml:41(term)
+#: su.1.xml:41(term) login.defs.5.xml:41(term) login.1.xml:41(term)
 #, fuzzy
 msgid "<option>MAIL_FILE</option> (string)"
 msgstr "MAIL_DIR (chaîne)"
 
-#: usermod.8.xml:13(para) userdel.8.xml:13(para) useradd.8.xml:13(para)
-#: su.1.xml:13(para) login.defs.5.xml:13(para) login.1.xml:13(para)
+#: usermod.8.xml:43(para) userdel.8.xml:43(para) useradd.8.xml:43(para)
+#: su.1.xml:43(para) login.defs.5.xml:43(para) login.1.xml:43(para)
 msgid ""
 "Defines the location of the users mail spool files relatively to their home "
 "directory."
 msgstr ""
 
 #. FIXME: MAIL_FILE not used in useradd
-#: usermod.8.xml:20(para) userdel.8.xml:20(para) useradd.8.xml:20(para)
-#: su.1.xml:20(para) login.defs.5.xml:20(para) login.1.xml:20(para)
+#: usermod.8.xml:50(para) userdel.8.xml:50(para) useradd.8.xml:50(para)
+#: su.1.xml:50(para) login.defs.5.xml:50(para) login.1.xml:50(para)
 msgid ""
 "The <option>MAIL_DIR</option> and <option>MAIL_FILE</option> variables are "
 "used by <command>useradd</command>, <command>usermod</command>, and "
 "<command>userdel</command> to create, move, or delete the user's mail spool."
 msgstr ""
 
-#: usermod.8.xml:26(para) userdel.8.xml:26(para) useradd.8.xml:26(para)
-#: su.1.xml:26(para) login.defs.5.xml:26(para) login.1.xml:26(para)
+#: usermod.8.xml:56(para) userdel.8.xml:56(para) useradd.8.xml:56(para)
+#: su.1.xml:56(para) login.defs.5.xml:56(para) login.1.xml:56(para)
 #, fuzzy
 msgid ""
 "If <option>MAIL_CHECK_ENAB</option> is set to <replaceable>yes</"
@@ -776,8 +800,68 @@
 "commandes indiqué par la variable d'environnement <envar>$SHELL</envar> sera "
 "utilisé."
 
-#: usermod.8.xml:303(para)
+#: usermod.8.xml:30(term) userdel.8.xml:30(term) useradd.8.xml:30(term)
+#: pwconv.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: grpck.8.xml:30(term) groupmod.8.xml:30(term) groupmems.8.xml:30(term)
+#: groupdel.8.xml:30(term) groupadd.8.xml:30(term) gpasswd.1.xml:30(term)
+#: chgpasswd.8.xml:30(term)
+msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
+msgstr ""
+
+#: usermod.8.xml:32(para) userdel.8.xml:32(para) useradd.8.xml:32(para)
+#: pwconv.8.xml:32(para) newusers.8.xml:32(para) login.defs.5.xml:32(para)
+#: grpck.8.xml:32(para) groupmod.8.xml:32(para) groupmems.8.xml:32(para)
+#: groupdel.8.xml:32(para) groupadd.8.xml:32(para) gpasswd.1.xml:32(para)
+#: chgpasswd.8.xml:32(para)
 msgid ""
+"Maximum members per group entry. When the maximum is reached, a new group "
+"entry (line) is started in <filename>/etc/group</filename> (with the same "
+"name, same password, and same GID)."
+msgstr ""
+
+#: usermod.8.xml:37(para) userdel.8.xml:37(para) useradd.8.xml:37(para)
+#: pwconv.8.xml:37(para) newusers.8.xml:37(para) login.defs.5.xml:37(para)
+#: grpck.8.xml:37(para) groupmod.8.xml:37(para) groupmems.8.xml:37(para)
+#: groupdel.8.xml:37(para) groupadd.8.xml:37(para) gpasswd.1.xml:37(para)
+#: chgpasswd.8.xml:37(para)
+msgid ""
+"The default value is 0, meaning that there are no limits in the number of "
+"members in a group."
+msgstr ""
+
+#. Note: on HP, split groups have the same ID, but different
+#.                names.
+#: usermod.8.xml:43(para) userdel.8.xml:43(para) useradd.8.xml:43(para)
+#: pwconv.8.xml:43(para) newusers.8.xml:43(para) login.defs.5.xml:43(para)
+#: grpck.8.xml:43(para) groupmod.8.xml:43(para) groupmems.8.xml:43(para)
+#: groupdel.8.xml:43(para) groupadd.8.xml:43(para) gpasswd.1.xml:43(para)
+#: chgpasswd.8.xml:43(para)
+msgid ""
+"This feature (split group) permits to limit the length of lines in the group "
+"file. This is useful to make sure that lines for NIS groups are not larger "
+"than 1024 characters."
+msgstr ""
+
+#: usermod.8.xml:48(para) userdel.8.xml:48(para) useradd.8.xml:48(para)
+#: pwconv.8.xml:48(para) newusers.8.xml:48(para) login.defs.5.xml:48(para)
+#: grpck.8.xml:48(para) groupmod.8.xml:48(para) groupmems.8.xml:48(para)
+#: groupdel.8.xml:48(para) groupadd.8.xml:48(para) gpasswd.1.xml:48(para)
+#: chgpasswd.8.xml:48(para)
+msgid "If you need to enforce such limit, you can use 25."
+msgstr ""
+
+#: usermod.8.xml:51(para) userdel.8.xml:51(para) useradd.8.xml:51(para)
+#: pwconv.8.xml:51(para) newusers.8.xml:51(para) login.defs.5.xml:51(para)
+#: grpck.8.xml:51(para) groupmod.8.xml:51(para) groupmems.8.xml:51(para)
+#: groupdel.8.xml:51(para) groupadd.8.xml:51(para) gpasswd.1.xml:51(para)
+#: chgpasswd.8.xml:51(para)
+msgid ""
+"Note: split groups may not be supported by all tools (even in the Shadow "
+"toolsuite. You should not use this variable unless you really need it."
+msgstr ""
+
+#: usermod.8.xml:347(para)
+msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
@@ -814,16 +898,16 @@
 "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: userdel.8.xml:12(refentrytitle) userdel.8.xml:17(refname)
-#: userdel.8.xml:22(command) login.defs.5.xml:402(term)
+#: userdel.8.xml:41(refentrytitle) userdel.8.xml:46(refname)
+#: userdel.8.xml:51(command) login.defs.5.xml:434(term)
 msgid "userdel"
 msgstr "userdel"
 
-#: userdel.8.xml:18(refpurpose)
+#: userdel.8.xml:47(refpurpose)
 msgid "delete a user account and related files"
 msgstr "supprimer un compte utilisateur et les fichiers associés"
 
-#: userdel.8.xml:32(para)
+#: userdel.8.xml:61(para)
 #, fuzzy
 msgid ""
 "The <command>userdel</command> command modifies the system account files, "
@@ -835,16 +919,16 @@
 "<emphasis remap=\"I\">utilisateur</emphasis>. L'utilisateur nommé doit "
 "exister."
 
-#: userdel.8.xml:41(para)
+#: userdel.8.xml:70(para)
 msgid "The options which apply to the <command>userdel</command> command are:"
 msgstr ""
 "Les options disponibles de la commande <command>userdel</command> sont :"
 
-#: userdel.8.xml:46(term) groupadd.8.xml:52(term)
+#: userdel.8.xml:75(term) groupadd.8.xml:78(term)
 msgid "<option>-f</option>, <option>--force</option>"
 msgstr "<option>-f</option>, <option>--force</option>"
 
-#: userdel.8.xml:50(para)
+#: userdel.8.xml:79(para)
 #, fuzzy
 msgid ""
 "This option forces the removal of the user account, even if the user is "
@@ -866,7 +950,7 @@
 "groupe existe avec le même nom que l'utilisateur supprimé, alors ce groupe "
 "sera supprimé, même s'il s'agit du groupe primaire d'un autre utilisateur."
 
-#: userdel.8.xml:63(para)
+#: userdel.8.xml:92(para)
 msgid ""
 "<emphasis>Note:</emphasis> This option is dangerous and may leave your "
 "system in an inconsistent state."
@@ -874,11 +958,11 @@
 "<emphasis>Note :</emphasis> Cette option est dangereuse, elle peut laisser "
 "votre système dans un état incohérent."
 
-#: userdel.8.xml:76(term)
+#: userdel.8.xml:105(term)
 msgid "<option>-r</option>, <option>--remove</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
-#: userdel.8.xml:80(para)
+#: userdel.8.xml:109(para)
 msgid ""
 "Files in the user's home directory will be removed along with the home "
 "directory itself and the user's mail spool. Files located in other file "
@@ -889,7 +973,7 @@
 "d'attente des courriels. Vous devrez rechercher et éliminer vous-même les "
 "fichiers situés dans d'autres systèmes de fichiers."
 
-#: userdel.8.xml:86(para)
+#: userdel.8.xml:115(para)
 msgid ""
 "The mail spool is defined by the <emphasis>MAIL_DIR</emphasis> variable in "
 "the <filename>login.defs</filename> file."
@@ -897,12 +981,12 @@
 "Le répertoire d'attente des courriels est défini par la variable "
 "<emphasis>MAIL_DIR</emphasis> du fichier <filename>login.defs</filename>."
 
-#: userdel.8.xml:2(term) login.defs.5.xml:2(term)
+#: userdel.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>USERDEL_CMD</option> (string)"
 msgstr "USERDEL_CMD (chaîne)"
 
-#: userdel.8.xml:4(para) login.defs.5.xml:4(para)
+#: userdel.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "If defined, this command is run when removing a user. It should remove any "
 "at/cron/print jobs etc. owned by the user to be removed (passed as the first "
@@ -913,122 +997,127 @@
 "périodiques cron ou at, tous les travaux d'impression, etc. de l'utilisateur "
 "(qui sera fourni comme premier paramètre)."
 
-#: userdel.8.xml:2(term) useradd.8.xml:2(term) su.1.xml:2(term)
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: userdel.8.xml:32(term) useradd.8.xml:32(term) su.1.xml:32(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>USERGROUPS_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (booléen)"
 
-#: userdel.8.xml:4(para) useradd.8.xml:4(para) su.1.xml:4(para)
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: userdel.8.xml:34(para) useradd.8.xml:34(para) su.1.xml:34(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Enable setting of the umask group bits to be the same as owner bits "
 "(examples: 022 -&gt; 002, 077 -&gt; 007) for non-root users, if the uid is "
-"the same as gid, and username is the same as the primary group name. "
-"<placeholder-1/> If set to <replaceable>yes</replaceable>, <command>userdel</"
-"command> will remove the user's group if it contains no more members, and "
+"the same as gid, and username is the same as the primary group name."
+msgstr ""
+
+#: userdel.8.xml:39(para) useradd.8.xml:39(para) su.1.xml:39(para)
+#: login.defs.5.xml:39(para) login.1.xml:39(para)
+msgid ""
+"If set to <replaceable>yes</replaceable>, <command>userdel</command> will "
+"remove the user's group if it contains no more members, and "
 "<command>useradd</command> will create by default a group with the name of "
 "the user."
 msgstr ""
 
-#: userdel.8.xml:120(filename) useradd.8.xml:532(filename)
-#: pwconv.8.xml:141(filename) newusers.8.xml:224(filename)
-#: login.access.5.xml:69(filename) groupadd.8.xml:178(filename)
-#: chsh.1.xml:119(filename) chpasswd.8.xml:168(filename)
-#: chgpasswd.8.xml:163(filename) chfn.1.xml:87(filename)
+#: userdel.8.xml:149(filename) useradd.8.xml:658(filename)
+#: pwconv.8.xml:171(filename) newusers.8.xml:347(filename)
+#: login.access.5.xml:99(filename) groupadd.8.xml:204(filename)
+#: chsh.1.xml:148(filename) chpasswd.8.xml:200(filename)
+#: chgpasswd.8.xml:195(filename) chfn.1.xml:116(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
-#: userdel.8.xml:122(para) useradd.8.xml:534(para) pwconv.8.xml:143(para)
-#: newusers.8.xml:226(para) login.access.5.xml:71(para)
-#: groupadd.8.xml:180(para) chsh.1.xml:121(para) chpasswd.8.xml:170(para)
-#: chgpasswd.8.xml:165(para) chfn.1.xml:89(para)
+#: userdel.8.xml:151(para) useradd.8.xml:660(para) pwconv.8.xml:173(para)
+#: newusers.8.xml:349(para) login.access.5.xml:101(para)
+#: groupadd.8.xml:206(para) chsh.1.xml:150(para) chpasswd.8.xml:202(para)
+#: chgpasswd.8.xml:197(para) chfn.1.xml:118(para)
 msgid "Shadow password suite configuration."
 msgstr "Configuration de la suite des mots de passe cachés « shadow password »."
 
-#: userdel.8.xml:141(title) useradd.8.xml:541(title) pwck.8.xml:208(title)
-#: passwd.1.xml:343(title) grpck.8.xml:182(title) groupmod.8.xml:139(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:208(title) chage.1.xml:199(title)
+#: userdel.8.xml:170(title) useradd.8.xml:667(title) pwck.8.xml:241(title)
+#: passwd.1.xml:385(title) grpck.8.xml:214(title) groupmod.8.xml:168(title)
+#: groupdel.8.xml:106(title) groupadd.8.xml:234(title) chage.1.xml:228(title)
 msgid "EXIT VALUES"
 msgstr "VALEURS DE RETOUR"
 
-#: userdel.8.xml:146(replaceable) useradd.8.xml:546(replaceable)
-#: pwck.8.xml:213(replaceable) passwd.1.xml:348(replaceable)
-#: grpck.8.xml:187(replaceable) groupmod.8.xml:144(replaceable)
-#: groupdel.8.xml:82(replaceable) groupadd.8.xml:213(replaceable)
-#: chage.1.xml:204(replaceable)
+#: userdel.8.xml:175(replaceable) useradd.8.xml:672(replaceable)
+#: pwck.8.xml:246(replaceable) passwd.1.xml:390(replaceable)
+#: grpck.8.xml:219(replaceable) groupmod.8.xml:173(replaceable)
+#: groupdel.8.xml:111(replaceable) groupadd.8.xml:239(replaceable)
+#: chage.1.xml:233(replaceable)
 msgid "0"
 msgstr "0"
 
-#: userdel.8.xml:148(para) useradd.8.xml:548(para) pwck.8.xml:215(para)
-#: passwd.1.xml:350(para) grpck.8.xml:189(para) groupmod.8.xml:146(para)
-#: groupdel.8.xml:84(para) groupadd.8.xml:215(para) chage.1.xml:206(para)
+#: userdel.8.xml:177(para) useradd.8.xml:674(para) pwck.8.xml:248(para)
+#: passwd.1.xml:392(para) grpck.8.xml:221(para) groupmod.8.xml:175(para)
+#: groupdel.8.xml:113(para) groupadd.8.xml:241(para) chage.1.xml:235(para)
 msgid "success"
 msgstr "succès"
 
-#: userdel.8.xml:152(replaceable) useradd.8.xml:552(replaceable)
-#: su.1.xml:26(manvolnum) sg.1.xml:10(manvolnum) pwck.8.xml:219(replaceable)
-#: passwd.1.xml:16(manvolnum) passwd.1.xml:354(replaceable)
-#: newgrp.1.xml:10(manvolnum) login.1.xml:42(manvolnum)
-#: grpck.8.xml:193(replaceable) groups.1.xml:6(manvolnum)
-#: gpasswd.1.xml:14(manvolnum) expiry.1.xml:12(manvolnum)
-#: chsh.1.xml:12(manvolnum) chfn.1.xml:13(manvolnum) chage.1.xml:6(manvolnum)
-#: chage.1.xml:210(replaceable)
+#: userdel.8.xml:181(replaceable) useradd.8.xml:678(replaceable)
+#: su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:252(replaceable)
+#: passwd.1.xml:45(manvolnum) passwd.1.xml:396(replaceable)
+#: newgrp.1.xml:39(manvolnum) login.1.xml:71(manvolnum)
+#: grpck.8.xml:225(replaceable) groups.1.xml:35(manvolnum)
+#: gpasswd.1.xml:43(manvolnum) expiry.1.xml:42(manvolnum)
+#: chsh.1.xml:41(manvolnum) chfn.1.xml:42(manvolnum) chage.1.xml:35(manvolnum)
+#: chage.1.xml:239(replaceable)
 msgid "1"
 msgstr "1"
 
-#: userdel.8.xml:154(para) useradd.8.xml:554(para)
+#: userdel.8.xml:183(para) useradd.8.xml:680(para)
 msgid "can't update password file"
 msgstr "impossible de mettre à jour le fichier des mots de passe"
 
-#: userdel.8.xml:158(replaceable) useradd.8.xml:558(replaceable)
-#: pwck.8.xml:225(replaceable) passwd.1.xml:360(replaceable)
-#: grpck.8.xml:199(replaceable) groupmod.8.xml:150(replaceable)
-#: groupdel.8.xml:88(replaceable) groupadd.8.xml:219(replaceable)
-#: chage.1.xml:216(replaceable)
+#: userdel.8.xml:187(replaceable) useradd.8.xml:684(replaceable)
+#: pwck.8.xml:258(replaceable) passwd.1.xml:402(replaceable)
+#: grpck.8.xml:231(replaceable) groupmod.8.xml:179(replaceable)
+#: groupdel.8.xml:117(replaceable) groupadd.8.xml:245(replaceable)
+#: chage.1.xml:245(replaceable)
 msgid "2"
 msgstr "2"
 
-#: userdel.8.xml:160(para) useradd.8.xml:560(para) pwck.8.xml:221(para)
-#: grpck.8.xml:195(para) groupmod.8.xml:152(para) groupdel.8.xml:90(para)
-#: groupadd.8.xml:221(para) chage.1.xml:218(para)
+#: userdel.8.xml:189(para) useradd.8.xml:686(para) pwck.8.xml:254(para)
+#: grpck.8.xml:227(para) groupmod.8.xml:181(para) groupdel.8.xml:119(para)
+#: groupadd.8.xml:247(para) chage.1.xml:247(para)
 msgid "invalid command syntax"
 msgstr "erreur de syntaxe"
 
-#: userdel.8.xml:164(replaceable) useradd.8.xml:576(replaceable)
-#: passwd.1.xml:384(replaceable) groupmod.8.xml:168(replaceable)
-#: groupdel.8.xml:94(replaceable)
+#: userdel.8.xml:193(replaceable) useradd.8.xml:702(replaceable)
+#: pwck.8.xml:282(replaceable) passwd.1.xml:426(replaceable)
+#: groupmod.8.xml:197(replaceable) groupdel.8.xml:123(replaceable)
 msgid "6"
 msgstr "6"
 
-#: userdel.8.xml:166(para)
+#: userdel.8.xml:195(para)
 msgid "specified user doesn't exist"
 msgstr "l'utilisateur indiqué n'existe pas"
 
-#: userdel.8.xml:172(para)
+#: userdel.8.xml:201(para)
 msgid "user currently logged in"
 msgstr "l'utilisateur est actuellement connecté"
 
-#: userdel.8.xml:176(replaceable) useradd.8.xml:588(replaceable)
-#: groupmod.8.xml:180(replaceable) groupdel.8.xml:106(replaceable)
-#: groupadd.8.xml:243(replaceable)
+#: userdel.8.xml:205(replaceable) useradd.8.xml:714(replaceable)
+#: groupmod.8.xml:209(replaceable) groupdel.8.xml:135(replaceable)
+#: groupadd.8.xml:269(replaceable)
 msgid "10"
 msgstr "10"
 
-#: userdel.8.xml:178(para) useradd.8.xml:590(para) groupmod.8.xml:182(para)
-#: groupdel.8.xml:108(para) groupadd.8.xml:245(para)
+#: userdel.8.xml:207(para) useradd.8.xml:716(para) groupmod.8.xml:211(para)
+#: groupdel.8.xml:137(para) groupadd.8.xml:271(para)
 msgid "can't update group file"
 msgstr "impossible de mettre à jour le fichier des groupes"
 
-#: userdel.8.xml:182(replaceable) useradd.8.xml:594(replaceable)
+#: userdel.8.xml:211(replaceable) useradd.8.xml:720(replaceable)
 msgid "12"
 msgstr "12"
 
-#: userdel.8.xml:184(para)
+#: userdel.8.xml:213(para)
 msgid "can't remove home directory"
 msgstr "impossible de supprimer le répertoire personnel"
 
-#: userdel.8.xml:142(para)
+#: userdel.8.xml:171(para)
 msgid ""
 "The <command>userdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -1036,7 +1125,7 @@
 "La commande <command>userdel</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: userdel.8.xml:193(para)
+#: userdel.8.xml:222(para)
 msgid ""
 "<command>userdel</command> will not allow you to remove an account if the "
 "user is currently logged in. You must kill any running processes which "
@@ -1047,7 +1136,7 @@
 "les processus en cours d'exécution appartenant à l'utilisateur que vous êtes "
 "en train de supprimer."
 
-#: userdel.8.xml:198(para)
+#: userdel.8.xml:227(para)
 msgid ""
 "You may not remove any NIS attributes on a NIS client. This must be "
 "performed on the NIS server."
@@ -1055,7 +1144,7 @@
 "Vous ne pouvez supprimer aucun attribut NIS d'un client NIS. Cela doit être "
 "effectué sur le serveur NIS."
 
-#: userdel.8.xml:201(para)
+#: userdel.8.xml:230(para)
 msgid ""
 "If <emphasis>USERGROUPS_ENAB</emphasis> is defined to <emphasis remap=\"I"
 "\">yes</emphasis> in <filename>/etc/login.defs</filename>, <command>userdel</"
@@ -1074,7 +1163,7 @@
 "avertissement sera affiché et l'utilisateur ne sera pas supprimé. L'option "
 "<option>-f</option> permet de forcer la suppression du groupe."
 
-#: userdel.8.xml:214(para)
+#: userdel.8.xml:243(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1108,23 +1197,23 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: useradd.8.xml:19(refentrytitle) useradd.8.xml:24(refname)
-#: useradd.8.xml:29(command) useradd.8.xml:36(command)
-#: useradd.8.xml:40(command) login.defs.5.xml:389(term)
+#: useradd.8.xml:49(refentrytitle) useradd.8.xml:54(refname)
+#: useradd.8.xml:59(command) useradd.8.xml:66(command)
+#: useradd.8.xml:70(command) login.defs.5.xml:421(term)
 msgid "useradd"
 msgstr "useradd"
 
-#: useradd.8.xml:25(refpurpose)
+#: useradd.8.xml:55(refpurpose)
 msgid "create a new user or update default new user information"
 msgstr ""
 "créer un nouvel utilisateur ou modifier les informations par défaut "
 "appliquées aux nouveaux utilisateurs"
 
-#: useradd.8.xml:37(arg) useradd.8.xml:41(arg)
+#: useradd.8.xml:67(arg) useradd.8.xml:71(arg)
 msgid "-D"
 msgstr "-D"
 
-#: useradd.8.xml:50(para)
+#: useradd.8.xml:80(para)
 #, fuzzy
 msgid ""
 "When invoked without the <option>-D</option> option, the <command>useradd</"
@@ -1141,12 +1230,19 @@
 "useradd fera la mise à jour des fichiers du système, elle pourra créer le "
 "répertoire personnel et copier les fichiers initiaux."
 
-#: useradd.8.xml:63(para)
+#: useradd.8.xml:89(para)
+msgid ""
+"By default, a group will also be created for the new user (see <option>-g</"
+"option>, <option>-N</option>, <option>-U</option>, and "
+"<option>USERGROUPS_ENAB</option>)."
+msgstr ""
+
+#: useradd.8.xml:98(para)
 msgid "The options which apply to the <command>useradd</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>useradd</command> sont :"
 
-#: useradd.8.xml:67(term) useradd.8.xml:379(term)
+#: useradd.8.xml:102(term) useradd.8.xml:475(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
@@ -1154,7 +1250,7 @@
 "<option>-b</option>, <option>--base-dir</option> <replaceable>RÉP_BASE</"
 "replaceable>"
 
-#: useradd.8.xml:72(para)
+#: useradd.8.xml:107(para)
 #, fuzzy
 msgid ""
 "The default base directory for the system if <option>-d</"
@@ -1169,8 +1265,15 @@
 "<option>-m</option> n'est pas utilisée, <replaceable>RÉP_BASE</replaceable> "
 "doit exister."
 
-#: useradd.8.xml:88(para)
+#: useradd.8.xml:115(para)
 msgid ""
+"If this option is not specified, <command>useradd</command> will use the "
+"base directory specified by the <option>HOME</option> variable in <filename>/"
+"etc/default/useradd</filename>, or <filename>/home</filename> by default."
+msgstr ""
+
+#: useradd.8.xml:130(para)
+msgid ""
 "Any text string. It is generally a short description of the login, and is "
 "currently used as the field for the user's full name."
 msgstr ""
@@ -1178,7 +1281,7 @@
 "elle est actuellement utilisée comme champ pour le nom complet de "
 "l'utilisateur."
 
-#: useradd.8.xml:101(para)
+#: useradd.8.xml:143(para)
 msgid ""
 "The new user will be created using <replaceable>HOME_DIR</replaceable> as "
 "the value for the user's login directory. The default is to append the "
@@ -1195,31 +1298,78 @@
 "nécessaire que le répertoire <replaceable>RÉP_PERSO</replaceable> existe "
 "mais il ne sera pas créé s'il n'existe pas."
 
-#: useradd.8.xml:113(term)
+#: useradd.8.xml:155(term)
 #, fuzzy
 #| msgid "<option>-d</option>, <option>--delete</option>"
 msgid "<option>-D</option>, <option>--defaults</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
-#: useradd.8.xml:117(para)
+#: useradd.8.xml:159(para)
 #, fuzzy
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr "Modifier les valeurs par défaut"
 
-#: useradd.8.xml:154(para)
+#: useradd.8.xml:174(para)
 msgid ""
+"If not specified, <command>useradd</command> will use the default expiry "
+"date specified by the <option>EXPIRE</option> variable in <filename>/etc/"
+"default/useradd</filename>, or an empty string (no expiry) by default."
+msgstr ""
+
+#: useradd.8.xml:188(para)
+#, fuzzy
+#| msgid ""
+#| "The number of days after a password expires until the account is "
+#| "permanently disabled. A value of 0 disables the account as soon as the "
+#| "password has expired, and a value of -1 disables the feature. The default "
+#| "value is -1."
+msgid ""
+"The number of days after a password expires until the account is permanently "
+"disabled. A value of 0 disables the account as soon as the password has "
+"expired, and a value of -1 disables the feature."
+msgstr ""
+"Nombre de jours suivant la fin de validité d'un mot de passe après lequel le "
+"compte est définitivement désactivé. Une valeur de 0 désactive le compte dès "
+"que le mot de passe a dépassé sa fin de validité, et une valeur de -1 "
+"désactive cette fonctionnalité. La valeur par défaut est de -1."
+
+#: useradd.8.xml:194(para)
+msgid ""
+"If not specified, <command>useradd</command> will use the default inactivity "
+"period specified by the <option>INACTIVE</option> variable in the <filename>/"
+"etc/default/useradd</filename>, or -1 by default."
+msgstr ""
+
+#: useradd.8.xml:208(para)
+#, fuzzy
+#| msgid ""
+#| "The group name or number of the user's new initial login group. The group "
+#| "name must exist. A group number must refer to an already existing group. "
+#| "The default group number is 1."
+msgid ""
 "The group name or number of the user's initial login group. The group name "
-"must exist. A group number must refer to an already existing group. The "
-"default group number is 1 or whatever is specified in <filename>/etc/default/"
-"useradd</filename>."
+"must exist. A group number must refer to an already existing group."
 msgstr ""
-"Nom ou ou numéro du groupe de connexion initial de l'utilisateur. Le nom du "
-"groupe doit exister. Un numéro de groupe doit se référer à un groupe "
-"existant. Le numéro de groupe par défaut est de 1, ou la valeur indiquée "
-"dans <filename>/etc/default/useradd</filename>."
+"Nom du groupe ou identifiant numérique du groupe de connexion initial de "
+"l'utilisateur. Le nom du groupe doit exister. Un numéro de groupe doit se "
+"référer à un groupe déjà existant. Le numéro de groupe par défaut est de 1."
 
-#: useradd.8.xml:168(para)
+#: useradd.8.xml:213(para)
 msgid ""
+"If not specified, the bahavior of <command>useradd</command> will depend on "
+"the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>. If this variable is set to <replaceable>yes</replaceable> (or "
+"<option>-U/--user-group</option> is specified on the command line), a group "
+"will be created for the user, with the same name as her loginname. If the "
+"variable is set to <replaceable>no</replaceable> (or <option>-N/--no-user-"
+"group</option> is specified on the command line), useradd will set the "
+"primary group of the new user to the value specified by the <option>GROUP</"
+"option> variable in <filename>/etc/default/useradd</filename>, or 100 by "
+"default."
+msgstr ""
+
+#: useradd.8.xml:236(para)
+msgid ""
 "A list of supplementary groups which the user is also a member of. Each "
 "group is separated from the next by a comma, with no intervening whitespace. "
 "The groups are subject to the same restrictions as the group given with the "
@@ -1232,7 +1382,7 @@
 "de l'option <option>-g</option>. Le comportement par défaut pour "
 "l'utilisateur est de n'appartenir qu'au groupe initial."
 
-#: useradd.8.xml:185(term)
+#: useradd.8.xml:253(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
@@ -1244,14 +1394,14 @@
 "<option>-s</option>, <option>--shell</option> <replaceable>INTERPRÉTEUR</"
 "replaceable>"
 
-#: useradd.8.xml:190(para)
+#: useradd.8.xml:258(para)
 msgid ""
 "The skeleton directory, which contains files and directories to be copied in "
 "the user's home directory, when the home directory is created by "
 "<command>useradd</command>."
 msgstr ""
 
-#: useradd.8.xml:195(para)
+#: useradd.8.xml:263(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
@@ -1259,14 +1409,14 @@
 "home</option>) option is specified."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:199(para)
+#: useradd.8.xml:267(para)
 msgid ""
-"If this option is not set, the skeleton directory is defined in <filename>/"
-"etc/default/useradd</filename> or, by default, <filename>/etc/skel</"
-"filename>."
+"If this option is not set, the skeleton directory is defined by the "
+"<option>SKEL</option> variable in <filename>/etc/default/useradd</filename> "
+"or, by default, <filename>/etc/skel</filename>."
 msgstr ""
 
-#: useradd.8.xml:207(term) groupadd.8.xml:86(term)
+#: useradd.8.xml:276(term) groupadd.8.xml:112(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
@@ -1274,10 +1424,21 @@
 "<option>-K</option>, <option>--key</option> <replaceable>CLÉ</"
 "replaceable>=<replaceable>VALEUR</replaceable>"
 
-#: useradd.8.xml:212(para)
+#: useradd.8.xml:281(para)
+#, fuzzy
+#| msgid ""
+#| "Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, "
+#| "PASS_MAX_DAYS and others). <placeholder-1/> Example: <option>-K </"
+#| "option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</"
+#| "replaceable> can be used when creating system account to turn off "
+#| "password ageing, even though system account has no password at all. "
+#| "Multiple <option>-K</option> options can be specified, e.g.: <option>-K </"
+#| "option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
+#| "replaceable><option> -K </option><replaceable>UID_MAX</"
+#| "replaceable>=<replaceable>499</replaceable>"
 msgid ""
-"Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS "
-"and others). <placeholder-1/> Example: <option>-K </"
+"Overrides <filename>/etc/login.defs</filename> defaults (UID_MIN, UID_MAX, "
+"UMASK, PASS_MAX_DAYS and others). <placeholder-1/> Example: <option>-K </"
 "option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</"
 "replaceable> can be used when creating system account to turn off password "
 "ageing, even though system account has no password at all. Multiple <option>-"
@@ -1297,7 +1458,7 @@
 "replaceable>=<replaceable>100</replaceable> <option>-K</option> "
 "<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>"
 
-#: useradd.8.xml:226(para)
+#: useradd.8.xml:295(para)
 msgid ""
 "Note: <option>-K </option><replaceable>UID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
@@ -1307,64 +1468,86 @@
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable> ne fonctionne pas pour l'instant."
 
-#: useradd.8.xml:234(option) groupmems.8.xml:24(arg)
-#: groupmems.8.xml:79(option)
-msgid "-l"
-msgstr "-l"
+#: useradd.8.xml:303(term)
+#, fuzzy
+#| msgid "<option>-l</option>, <option>--list</option>"
+msgid "<option>-l</option>, <option>--no-log-init</option>"
+msgstr "<option>-l</option>, <option>--list</option>"
 
-#: useradd.8.xml:236(para)
+#: useradd.8.xml:305(para)
 msgid "Do not add the user to the lastlog and faillog databases."
 msgstr ""
 
-#: useradd.8.xml:239(para)
+#: useradd.8.xml:308(para)
 msgid ""
 "By default, the user's entries in the lastlog and faillog databases are "
 "resetted to avoid reusing the entry from a previously deleted user."
 msgstr ""
 
-#: useradd.8.xml:247(term)
+#: useradd.8.xml:316(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:251(para)
+#: useradd.8.xml:320(para)
 msgid ""
 "Create the user's home directory if it does not exist. The files and "
 "directories contained in the skeleton directory (which can be defined with "
 "the <option>-k</option> option) will be copied to the home directory."
 msgstr ""
 
-#: useradd.8.xml:257(para)
+#: useradd.8.xml:326(para)
 msgid "By default, no home directories are created."
 msgstr ""
 
-#: useradd.8.xml:263(term)
+#: useradd.8.xml:333(option)
 #, fuzzy
+#| msgid "-"
+msgid "-M"
+msgstr "-"
+
+#: useradd.8.xml:336(para)
+msgid ""
+"Do no create the user's home directory, even if the system wide setting from "
+"<filename>/etc/login.defs</filename> (<option>CREATE_HOME</option>) is set "
+"to <replaceable>yes</replaceable>."
+msgstr ""
+
+#: useradd.8.xml:345(term)
+#, fuzzy
 #| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-N</option>, <option>--no-user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: useradd.8.xml:267(para)
+#: useradd.8.xml:349(para)
 msgid ""
 "Do not create a group with the same name as the user, but add the user to "
 "the group specified by the <option>-g</option> option or by the GROUP "
 "variable in <filename>/etc/default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:273(para) useradd.8.xml:358(para)
+#: useradd.8.xml:355(para) useradd.8.xml:454(para)
 msgid ""
 "The default behavior (if the <option>-g</option>, <option>-N</option>, and "
 "<option>-U</option> options are not specified) is defined by the "
-"<option>USERGROUPS_ENAB</option> variable in <filename>login.defs</filename>."
+"<option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>."
 msgstr ""
 
-#: useradd.8.xml:286(para)
+#: useradd.8.xml:368(para)
 msgid "Allow the creation of a user account with a duplicate (non-unique) UID."
 msgstr ""
 "Permet de créer un compte d'utilisateur avec un identifiant (« UID ») "
 "dupliqué (non unique)."
 
-#: useradd.8.xml:295(para)
+#: useradd.8.xml:369(para)
+#, fuzzy
+#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
+"This option is only valid in combination with the <option>-o</option> option."
+msgstr "<option>-m</option>, <option>--create-home</option>"
+
+#: useradd.8.xml:381(para)
+msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
 "disable the account."
@@ -1373,36 +1556,51 @@
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>. Le comportement par défaut est de désactiver le compte."
 
-#: useradd.8.xml:303(term) newusers.8.xml:113(term) groupadd.8.xml:130(term)
+#: useradd.8.xml:389(term) newusers.8.xml:236(term) groupadd.8.xml:156(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-r</option>, <option>--system</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: useradd.8.xml:307(para) newusers.8.xml:117(para)
+#: useradd.8.xml:393(para) newusers.8.xml:240(para)
 msgid "Create a system account."
 msgstr ""
 
-#: useradd.8.xml:310(para) newusers.8.xml:120(para)
+#: useradd.8.xml:396(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are choosen in the "
 "<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
-"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<filename>/etc/login.defs</filename>, instead of <option>UID_MIN</option>-"
 "<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
 "the creation of groups)."
 msgstr ""
 
-#: useradd.8.xml:327(para)
+#: useradd.8.xml:405(para)
 msgid ""
+"Note that <command>useradd</command> will not create a home directory for "
+"such an user, regardless of the default setting in <filename>/etc/login."
+"defs</filename> (<option>CREATE_HOME</option>). You have to specify the "
+"<option>-m</option> options if you want a home directory for a system "
+"account to be created."
+msgstr ""
+
+#: useradd.8.xml:421(para)
+#, fuzzy
+#| msgid ""
+#| "The name of the user's login shell. The default is to leave this field "
+#| "blank, which causes the system to select the default login shell."
+msgid ""
 "The name of the user's login shell. The default is to leave this field "
-"blank, which causes the system to select the default login shell."
+"blank, which causes the system to select the default login shell specified "
+"by the <option>SHELL</option> variable in <filename>/etc/default/useradd</"
+"filename>, or an empty string by default."
 msgstr ""
 "Le nom de l'interpréteur de commandes initial de l'utilisateur (« login "
 "shell »). Le comportement par défaut est de laisser ce champ vide. Le "
 "système sélectionnera alors l'interpréteur par défaut."
 
-#: useradd.8.xml:340(para)
+#: useradd.8.xml:436(para)
 msgid ""
 "The numerical value of the user's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. The "
@@ -1418,23 +1616,23 @@
 "comprises entre 0 et 999 sont généralement réservées pour les comptes "
 "systèmes."
 
-#: useradd.8.xml:350(term)
+#: useradd.8.xml:446(term)
 #, fuzzy
 #| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-U</option>, <option>--user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: useradd.8.xml:354(para)
+#: useradd.8.xml:450(para)
 msgid ""
 "Create a group with the same name as the user, and add the user to this "
 "group."
 msgstr ""
 
-#: useradd.8.xml:369(title)
+#: useradd.8.xml:465(title)
 msgid "Changing the default values"
 msgstr "Modifier les valeurs par défaut"
 
-#: useradd.8.xml:370(para)
+#: useradd.8.xml:466(para)
 #, fuzzy
 msgid ""
 "When invoked with only the <option>-D</option> option, <command>useradd</"
@@ -1446,7 +1644,7 @@
 "command> affichera soit les valeurs actuelles par défaut, soit mettra à jour "
 "les valeurs par défaut via la ligne de commande. Les options valables sont :"
 
-#: useradd.8.xml:384(para)
+#: useradd.8.xml:480(para)
 #, fuzzy
 msgid ""
 "The path prefix for a new user's home directory. The user's name will be "
@@ -1459,44 +1657,80 @@
 "replaceable> pour créer le nom du nouveau répertoire si l'option <option>-d</"
 "option> n'est pas utilisée pendant la création d'un nouveau compte."
 
-#: useradd.8.xml:399(para)
+#: useradd.8.xml:487(para)
+msgid ""
+"This option sets the <option>HOME</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
+#: useradd.8.xml:499(para)
 msgid "The date on which the user account is disabled."
 msgstr "Date à laquelle le compte utilisateur sera désactivé."
 
-#: useradd.8.xml:408(para)
+#: useradd.8.xml:500(para)
 msgid ""
+"This option sets the <option>EXPIRE</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
+#: useradd.8.xml:512(para)
+msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
 msgstr ""
 "Nombre de jours après la fin de validité d'un mot de passe avant que le "
 "compte ne soit désactivé."
 
-#: useradd.8.xml:420(para)
+#: useradd.8.xml:516(para)
 msgid ""
-"The group name or ID for a new user's initial group. The named group must "
-"exist, and a numerical group ID must have an existing entry."
+"This option sets the <option>INACTIVE</option> variable in <filename>/etc/"
+"default/useradd</filename>."
 msgstr ""
-"Nom de groupe ou identifiant numérique du groupe initial d'un nouvel "
-"utilisateur. Le groupe spécifié doit exister, et un identifiant de groupe "
-"numérique doit déjà exister."
 
-#: useradd.8.xml:433(para)
+#: useradd.8.xml:528(para)
+msgid ""
+"The group name or ID for a new user's initial group (when the <option>-N/--"
+"no-user-group</option> is used or when the <option>USERGROUPS_ENAB</option> "
+"variable is set to <replaceable>no</replaceable> in <filename>/etc/login."
+"defs</filename>. The named group must exist, and a numerical group ID must "
+"have an existing entry."
+msgstr ""
+
+#: useradd.8.xml:537(para)
+msgid ""
+"This option sets the <option>GROUP</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
+#: useradd.8.xml:549(para)
 msgid "The name of a new user's login shell."
 msgstr ""
 
-#: useradd.8.xml:444(title)
+#: useradd.8.xml:552(para)
+msgid ""
+"This option sets the <option>SHELL</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
+#: useradd.8.xml:564(title)
 msgid "NOTES"
 msgstr "NOTES"
 
-#: useradd.8.xml:445(para)
+#: useradd.8.xml:565(para)
+#, fuzzy
+#| msgid ""
+#| "The system administrator is responsible for placing the default user "
+#| "files in the <filename>/etc/skel/</filename> directory."
 msgid ""
 "The system administrator is responsible for placing the default user files "
-"in the <filename>/etc/skel/</filename> directory."
+"in the <filename>/etc/skel/</filename> directory (or any other skeleton "
+"directory specified in <filename>/etc/default/useradd</filename> or on the "
+"command line)."
 msgstr ""
 "L'administrateur système doit se charger de placer les fichiers par défaut "
 "dans le répertoire <filename>/etc/skel</filename>."
 
-#: useradd.8.xml:452(para)
+#: useradd.8.xml:574(para)
 #, fuzzy
 msgid ""
 "You may not add a user to a NIS or LDAP group. This must be performed on the "
@@ -1505,7 +1739,7 @@
 "Vous ne pouvez pas ajouter d'utilisateur à un groupe NIS. Cela doit être "
 "effectué sur le serveur NIS."
 
-#: useradd.8.xml:457(para)
+#: useradd.8.xml:579(para)
 #, fuzzy
 msgid ""
 "Similarly, if the username already exists in an external user database such "
@@ -1517,31 +1751,58 @@
 "compte d'utilisateur."
 
 # NOTE: digits
-#: useradd.8.xml:463(para)
+#: useradd.8.xml:585(para)
+#, fuzzy
+#| msgid ""
+#| "Usernames must begin with a lower case letter or an underscore, and only "
+#| "lower case letters, underscores, dashes, and dollar signs may follow. In "
+#| "regular expression terms: [a-z_][a-z0-9_-]*[$]"
 msgid ""
 "Usernames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
-"regular expression terms: [a-z_][a-z0-9_-]*[$]"
+"regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 "Les noms d'utilisateur doivent commencer par une lettre minuscule ou un "
 "tiret bas (« underscore »), et seuls des lettres minuscules, des chiffres, "
 "des « underscore », des tirets ou un dollar peuvent suivre. Soit, sous la "
 "forme d'une expression rationnelle : [a-z_][a-z0-9_-]*[$]"
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: groupadd.8.xml:2(term)
+#: useradd.8.xml:590(para)
 #, fuzzy
+#| msgid "Groupnames may only be up to 16 characters long."
+msgid "Usernames may only be up to 32 characters long."
+msgstr "Les noms de groupe sont limités à 16 caractères."
+
+#: useradd.8.xml:30(term) login.defs.5.xml:30(term)
+#, fuzzy
+msgid "<option>CREATE_HOME</option> (boolean)"
+msgstr "CHFN_AUTH (booléen)"
+
+#: useradd.8.xml:32(para) login.defs.5.xml:32(para)
+msgid ""
+"Indicate if a home directory should be created by default for new users."
+msgstr ""
+
+#: useradd.8.xml:36(para) login.defs.5.xml:36(para)
+msgid ""
+"This setting does not apply to system users, and can be overriden on the "
+"command line."
+msgstr ""
+
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: groupadd.8.xml:32(term)
+#, fuzzy
 msgid "<option>GID_MAX</option> (number)"
 msgstr "GID_MAX (nombre)"
 
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
-#: groupadd.8.xml:3(term)
+#: useradd.8.xml:33(term) newusers.8.xml:33(term) login.defs.5.xml:33(term)
+#: groupadd.8.xml:33(term)
 #, fuzzy
 msgid "<option>GID_MIN</option> (number)"
 msgstr "GID_MIN (nombre)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
-#: groupadd.8.xml:5(para)
+#: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para)
+#: groupadd.8.xml:35(para)
 #, fuzzy
 #| msgid ""
 #| "Range of group IDs to choose from for the <command>useradd</command> and "
@@ -1554,14 +1815,14 @@
 "Plage d'identifiants numérique de groupe que les commandes <command>useradd</"
 "command> et <command>groupadd</command> peuvent utiliser."
 
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) pwck.8.xml:2(term)
-#: newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_MAX_DAYS</option> (number)"
 msgstr "PASS_MAX_DAYS (nombre)"
 
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) pwck.8.xml:4(para)
-#: newusers.8.xml:4(para) login.defs.5.xml:4(para)
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "The maximum number of days a password may be used. If the password is older "
 "than this, a password change will be forced. If not specified, -1 will be "
@@ -1571,14 +1832,14 @@
 "une modification du mot de passe est obligatoire. S'il n'est pas précisé, la "
 "valeur de -1 est utilisée (ce qui enlève toute restriction)."
 
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) pwck.8.xml:2(term)
-#: newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_MIN_DAYS</option> (number)"
 msgstr "PASS_MIN_DAYS (nombre)"
 
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) pwck.8.xml:4(para)
-#: newusers.8.xml:4(para) login.defs.5.xml:4(para)
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "The minimum number of days allowed between password changes. Any password "
 "changes attempted sooner than this will be rejected. If not specified, -1 "
@@ -1589,14 +1850,14 @@
 "rejetée. S'il n'est pas précisé, la valeur de -1 est utilisée (ce qui enlève "
 "toute restriction)."
 
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) pwck.8.xml:2(term)
-#: newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_WARN_AGE</option> (number)"
 msgstr "PASS_WARN_AGE (nombre)"
 
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) pwck.8.xml:4(para)
-#: newusers.8.xml:4(para) login.defs.5.xml:4(para)
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "The number of days warning given before a password expires. A zero means "
 "warning is given only upon the day of expiration, a negative value means no "
@@ -1607,20 +1868,20 @@
 "signifie qu'aucun avertissement n'est donné. S'il n'est pas précisé, aucun "
 "avertissement n'est donné."
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: groupadd.8.xml:2(term)
+#: useradd.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: groupadd.8.xml:30(term)
 #, fuzzy
 msgid "<option>SYS_GID_MAX</option> (number)"
 msgstr "GID_MAX (nombre)"
 
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
-#: groupadd.8.xml:3(term)
+#: useradd.8.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
+#: groupadd.8.xml:31(term)
 #, fuzzy
 msgid "<option>SYS_GID_MIN</option> (number)"
 msgstr "GID_MIN (nombre)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
-#: groupadd.8.xml:5(para)
+#: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
+#: groupadd.8.xml:33(para)
 #, fuzzy
 #| msgid ""
 #| "Range of group IDs to choose from for the <command>useradd</command> and "
@@ -1633,17 +1894,17 @@
 "Plage d'identifiants numérique de groupe que les commandes <command>useradd</"
 "command> et <command>groupadd</command> peuvent utiliser."
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
 #, fuzzy
 msgid "<option>SYS_UID_MAX</option> (number)"
 msgstr "UID_MAX (nombre)"
 
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
+#: useradd.8.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
 #, fuzzy
 msgid "<option>SYS_UID_MIN</option> (number)"
 msgstr "UID_MIN (nombre)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
+#: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
 #, fuzzy
 #| msgid ""
 #| "Range of group IDs to choose from for the <command>useradd</command> and "
@@ -1655,17 +1916,17 @@
 "Plage d'identifiants numérique de groupe que les commandes <command>useradd</"
 "command> et <command>groupadd</command> peuvent utiliser."
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>UID_MAX</option> (number)"
 msgstr "UID_MAX (nombre)"
 
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
+#: useradd.8.xml:33(term) newusers.8.xml:33(term) login.defs.5.xml:33(term)
 #, fuzzy
 msgid "<option>UID_MIN</option> (number)"
 msgstr "UID_MIN (nombre)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
+#: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para)
 #, fuzzy
 #| msgid ""
 #| "Range of group IDs to choose from for the <command>useradd</command> and "
@@ -1677,86 +1938,108 @@
 "Plage d'identifiants numérique de groupe que les commandes <command>useradd</"
 "command> et <command>groupadd</command> peuvent utiliser."
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: login.1.xml:2(term)
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: login.1.xml:32(term)
 #, fuzzy
 msgid "<option>UMASK</option> (number)"
 msgstr "UMASK (nombre)"
 
-#: useradd.8.xml:4(para) newusers.8.xml:4(para) login.defs.5.xml:4(para)
-#: login.1.xml:4(para)
+#: useradd.8.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
+#: login.1.xml:34(para)
+#, fuzzy
+#| msgid ""
+#| "The permission mask is initialized to this value. If not specified, the "
+#| "permission mask will be initialized to 022."
 msgid ""
-"The permission mask is initialized to this value. If not specified, the "
-"permission mask will be initialized to 022."
+"The file mode creation mask is initialized to this value. If not specified, "
+"the mask will be initialized to 022."
 msgstr ""
 "Valeur d'initialisation du masque de permissions. S'il n'est pas précisé, le "
 "masque des permissions sera initialisé à 022."
 
-#: useradd.8.xml:520(filename)
+#: useradd.8.xml:38(para) newusers.8.xml:38(para) login.defs.5.xml:38(para)
+#: login.1.xml:38(para)
+msgid ""
+"<command>useradd</command> and <command>newusers</command> use this mask to "
+"set the mode of the home directory they create"
+msgstr ""
+
+#: useradd.8.xml:42(para) newusers.8.xml:42(para) login.defs.5.xml:42(para)
+#: login.1.xml:42(para)
+msgid ""
+"It is also used by <command>login</command> to define users' initial umask. "
+"Note that this mask can be overriden by the user's GECOS line (if "
+"<option>QUOTAS_ENAB</option> is set) or by the specification of a limit with "
+"the <emphasis>K</emphasis> identifier in "
+"<citerefentry><refentrytitle>limits</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+
+#: useradd.8.xml:646(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
-#: useradd.8.xml:522(para)
+#: useradd.8.xml:648(para)
 msgid "Default values for account creation."
 msgstr "Valeurs par défaut pour la création de comptes."
 
-#: useradd.8.xml:526(filename)
+#: useradd.8.xml:652(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
-#: useradd.8.xml:528(para)
+#: useradd.8.xml:654(para)
 msgid "Directory containing default files."
 msgstr "Répertoire contenant les fichiers par défaut."
 
-#: useradd.8.xml:564(replaceable) shadow.3.xml:6(manvolnum)
-#: pwck.8.xml:231(replaceable) passwd.1.xml:366(replaceable)
-#: grpck.8.xml:205(replaceable) groupmod.8.xml:156(replaceable)
-#: groupadd.8.xml:225(replaceable)
+#: useradd.8.xml:690(replaceable) shadow.3.xml:35(manvolnum)
+#: pwck.8.xml:264(replaceable) passwd.1.xml:408(replaceable)
+#: grpck.8.xml:237(replaceable) groupmod.8.xml:185(replaceable)
+#: groupadd.8.xml:251(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:566(para) passwd.1.xml:386(para) groupmod.8.xml:158(para)
-#: groupadd.8.xml:227(para)
+#: useradd.8.xml:692(para) passwd.1.xml:428(para) groupmod.8.xml:187(para)
+#: groupadd.8.xml:253(para)
 msgid "invalid argument to option"
 msgstr "paramètre non valable pour l'option"
 
-#: useradd.8.xml:570(replaceable) pwck.8.xml:237(replaceable)
-#: passwd.1.xml:372(replaceable) grpck.8.xml:211(replaceable)
-#: groupmod.8.xml:162(replaceable) groupadd.8.xml:231(replaceable)
+#: useradd.8.xml:696(replaceable) pwck.8.xml:270(replaceable)
+#: passwd.1.xml:414(replaceable) grpck.8.xml:243(replaceable)
+#: groupmod.8.xml:191(replaceable) groupadd.8.xml:257(replaceable)
 msgid "4"
 msgstr "4"
 
-#: useradd.8.xml:572(para)
+#: useradd.8.xml:698(para)
 msgid "UID already in use (and no <option>-o</option>)"
 msgstr "UID déjà utilisé (et pas d'option <option>-o</option>)"
 
-#: useradd.8.xml:578(para) groupmod.8.xml:164(para) groupmod.8.xml:170(para)
-#: groupdel.8.xml:96(para)
+#: useradd.8.xml:704(para) groupmod.8.xml:193(para) groupmod.8.xml:199(para)
+#: groupdel.8.xml:125(para)
 msgid "specified group doesn't exist"
 msgstr "le groupe spécifié n'existe pas"
 
-#: useradd.8.xml:582(replaceable) groupmod.8.xml:174(replaceable)
-#: groupadd.8.xml:237(replaceable)
+#: useradd.8.xml:708(replaceable) groupmod.8.xml:203(replaceable)
+#: groupadd.8.xml:263(replaceable)
 msgid "9"
 msgstr "9"
 
-#: useradd.8.xml:584(para)
+#: useradd.8.xml:710(para)
 msgid "username already in use"
 msgstr "nom d'utilisateur déjà utilisé"
 
-#: useradd.8.xml:596(para)
+#: useradd.8.xml:722(para)
 msgid "can't create home directory"
 msgstr "impossible de créer le répertoire personnel"
 
-#: useradd.8.xml:600(replaceable)
+#: useradd.8.xml:726(replaceable)
 msgid "13"
 msgstr "13"
 
-#: useradd.8.xml:602(para)
+#: useradd.8.xml:728(para)
 msgid "can't create mail spool"
 msgstr "impossible de créer le répertoire d'attente des courriels"
 
-#: useradd.8.xml:542(para)
+#: useradd.8.xml:668(para)
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -1764,7 +2047,7 @@
 "La commande <command>useradd</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: useradd.8.xml:611(para)
+#: useradd.8.xml:737(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1802,36 +2085,36 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: suauth.5.xml:5(refentrytitle) suauth.5.xml:10(refname)
+#: suauth.5.xml:34(refentrytitle) suauth.5.xml:39(refname)
 msgid "suauth"
 msgstr "suauth"
 
-#: suauth.5.xml:6(manvolnum) shadow.5.xml:6(manvolnum)
-#: pwck.8.xml:243(replaceable) porttime.5.xml:6(manvolnum)
-#: passwd.5.xml:6(manvolnum) passwd.1.xml:378(replaceable)
-#: login.defs.5.xml:67(manvolnum) login.access.5.xml:6(manvolnum)
-#: limits.5.xml:6(manvolnum) gshadow.5.xml:6(manvolnum)
-#: grpck.8.xml:217(replaceable) faillog.5.xml:6(manvolnum)
+#: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
+#: pwck.8.xml:276(replaceable) porttime.5.xml:35(manvolnum)
+#: passwd.5.xml:35(manvolnum) passwd.1.xml:420(replaceable)
+#: login.defs.5.xml:98(manvolnum) login.access.5.xml:36(manvolnum)
+#: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
+#: grpck.8.xml:249(replaceable) faillog.5.xml:35(manvolnum)
 msgid "5"
 msgstr "5"
 
-#: suauth.5.xml:7(refmiscinfo) shadow.5.xml:7(refmiscinfo)
-#: porttime.5.xml:7(refmiscinfo) passwd.5.xml:7(refmiscinfo)
-#: login.defs.5.xml:68(refmiscinfo) login.access.5.xml:7(refmiscinfo)
-#: limits.5.xml:7(refmiscinfo) gshadow.5.xml:7(refmiscinfo)
-#: faillog.5.xml:7(refmiscinfo)
+#: suauth.5.xml:36(refmiscinfo) shadow.5.xml:36(refmiscinfo)
+#: porttime.5.xml:36(refmiscinfo) passwd.5.xml:36(refmiscinfo)
+#: login.defs.5.xml:99(refmiscinfo) login.access.5.xml:37(refmiscinfo)
+#: limits.5.xml:37(refmiscinfo) gshadow.5.xml:35(refmiscinfo)
+#: faillog.5.xml:36(refmiscinfo)
 msgid "File Formats and Conversions"
 msgstr "Formats et conversions de fichiers"
 
-#: suauth.5.xml:11(refpurpose)
+#: suauth.5.xml:40(refpurpose)
 msgid "detailed su control file"
 msgstr "Fichier de contrôle détaillé de su"
 
-#: suauth.5.xml:16(command) suauth.5.xml:142(filename)
+#: suauth.5.xml:45(command) suauth.5.xml:171(filename)
 msgid "/etc/suauth"
 msgstr "/etc/suauth"
 
-#: suauth.5.xml:22(para)
+#: suauth.5.xml:51(para)
 msgid ""
 "The file <filename>/etc/suauth</filename> is referenced whenever the su "
 "command is called. It can change the behaviour of the su command, based upon:"
@@ -1841,7 +2124,7 @@
 "fonction de :"
 
 #. .RS
-#: suauth.5.xml:29(literallayout)
+#: suauth.5.xml:58(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -1853,13 +2136,13 @@
 "    "
 
 #. .fi
-#: suauth.5.xml:33(para)
+#: suauth.5.xml:62(para)
 msgid ""
 "2) the user executing the su command (or any groups he might be a member of)"
 msgstr ""
 "2) l'utilisateur qui exécute la commande su (ou un groupe dont il est membre)"
 
-#: suauth.5.xml:38(para)
+#: suauth.5.xml:67(para)
 msgid ""
 "The file is formatted like this, with lines starting with a # being treated "
 "as comment lines and ignored;"
@@ -1867,7 +2150,7 @@
 "Le fichier est formaté de la façon suivante (les lignes commençant par un "
 "« # » sont des commentaires, et sont ignorées) :"
 
-#: suauth.5.xml:43(literallayout)
+#: suauth.5.xml:72(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -1878,7 +2161,7 @@
 "      vers-id:par-id:ACTION\n"
 "    "
 
-#: suauth.5.xml:47(para)
+#: suauth.5.xml:76(para)
 msgid ""
 "Where to-id is either the word <emphasis>ALL</emphasis>, a list of usernames "
 "delimited by \",\" or the words <emphasis>ALL EXCEPT</emphasis> followed by "
@@ -1888,7 +2171,7 @@
 "d'utilisateurs séparés par une virgule ou <emphasis>ALL EXCEPT</emphasis> "
 "suivi d'une liste d'utilisateurs séparés par une virgule."
 
-#: suauth.5.xml:53(para)
+#: suauth.5.xml:82(para)
 msgid ""
 "from-id is formatted the same as to-id except the extra word "
 "<emphasis>GROUP</emphasis> is recognised. <emphasis>ALL EXCEPT GROUP</"
@@ -1906,35 +2189,35 @@
 "<citerefentry><refentrytitle>/etc/group</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry> est nécessaire."
 
-#: suauth.5.xml:64(para)
+#: suauth.5.xml:93(para)
 msgid "Action can be one only of the following currently supported options."
 msgstr "Les valeurs d'ACTION valables sont :"
 
-#: suauth.5.xml:70(emphasis)
+#: suauth.5.xml:99(emphasis)
 msgid "DENY"
 msgstr "DENY"
 
-#: suauth.5.xml:73(para)
+#: suauth.5.xml:102(para)
 msgid "The attempt to su is stopped before a password is even asked for."
 msgstr ""
 "La tentative de changement d'utilisateur s'est arrêtée avant que le mot de "
 "passe ne soit demandé."
 
-#: suauth.5.xml:80(emphasis)
+#: suauth.5.xml:109(emphasis)
 msgid "NOPASS"
 msgstr "NOPASS"
 
-#: suauth.5.xml:83(para)
+#: suauth.5.xml:112(para)
 msgid ""
 "The attempt to su is automatically successful; no password is asked for."
 msgstr ""
 "La tentative est automatiquement réussie. Aucun mot de passe n'est demandé."
 
-#: suauth.5.xml:91(emphasis)
+#: suauth.5.xml:120(emphasis)
 msgid "OWNPASS"
 msgstr "OWNPASS"
 
-#: suauth.5.xml:94(para)
+#: suauth.5.xml:123(para)
 msgid ""
 "For the su command to be successful, the user must enter his or her own "
 "password. They are told this."
@@ -1942,7 +2225,7 @@
 "Pour que la commande su soit réussie, l'utilisateur doit entrer son propre "
 "mot de passe. Ceci lui est demandé."
 
-#: suauth.5.xml:102(para)
+#: suauth.5.xml:131(para)
 msgid ""
 "Note there are three separate fields delimited by a colon. No whitespace "
 "must surround this colon. Also note that the file is examined sequentially "
@@ -1956,11 +2239,11 @@
 "utilisée sans que le reste du fichier ne soit examiné. Ceci permet à "
 "l'administrateur système de définir un contrôle aussi fin qu'il le souhaite."
 
-#: suauth.5.xml:112(title)
+#: suauth.5.xml:141(title)
 msgid "EXAMPLE"
 msgstr "EXEMPLE"
 
-#: suauth.5.xml:113(literallayout)
+#: suauth.5.xml:142(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2010,11 +2293,11 @@
 "      #\n"
 "    "
 
-#: suauth.5.xml:149(title) pwconv.8.xml:105(title) login.defs.5.xml:428(title)
+#: suauth.5.xml:178(title) pwconv.8.xml:135(title) login.defs.5.xml:455(title)
 msgid "BUGS"
 msgstr "BOGUES"
 
-#: suauth.5.xml:150(para)
+#: suauth.5.xml:179(para)
 msgid ""
 "There could be plenty lurking. The file parser is particularly unforgiving "
 "about syntax errors, expecting no spurious whitespace (apart from beginning "
@@ -2024,11 +2307,11 @@
 "impitoyable avec les erreurs de syntaxe. Il n'autorise d'espace qu'en début "
 "et fin de ligne, et seul le délimiteur spécifique doit être utilisé."
 
-#: suauth.5.xml:159(title) shadow.3.xml:154(title)
+#: suauth.5.xml:188(title) shadow.3.xml:183(title)
 msgid "DIAGNOSTICS"
 msgstr "DIAGNOSTICS"
 
-#: suauth.5.xml:160(para)
+#: suauth.5.xml:189(para)
 msgid ""
 "An error parsing the file is reported using "
 "<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</"
@@ -2038,7 +2321,7 @@
 "<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry> au niveau ERR dans la catégorie AUTH."
 
-#: suauth.5.xml:169(para)
+#: suauth.5.xml:198(para)
 msgid ""
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -2046,26 +2329,31 @@
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: su.1.xml:25(refentrytitle) su.1.xml:30(refname) su.1.xml:35(command)
-#: login.defs.5.xml:363(term)
+#: su.1.xml:54(refentrytitle) su.1.xml:59(refname) su.1.xml:64(command)
+#: login.defs.5.xml:395(term)
 msgid "su"
 msgstr "su"
 
-#: su.1.xml:27(refmiscinfo) sg.1.xml:11(refmiscinfo)
-#: passwd.1.xml:17(refmiscinfo) newgrp.1.xml:11(refmiscinfo)
-#: login.1.xml:43(refmiscinfo) groups.1.xml:7(refmiscinfo)
-#: gpasswd.1.xml:15(refmiscinfo) expiry.1.xml:13(refmiscinfo)
-#: chsh.1.xml:13(refmiscinfo) chfn.1.xml:14(refmiscinfo)
-#: chage.1.xml:7(refmiscinfo)
+#: su.1.xml:56(refmiscinfo) sg.1.xml:40(refmiscinfo)
+#: passwd.1.xml:46(refmiscinfo) newgrp.1.xml:40(refmiscinfo)
+#: login.1.xml:72(refmiscinfo) groups.1.xml:36(refmiscinfo)
+#: gpasswd.1.xml:44(refmiscinfo) expiry.1.xml:43(refmiscinfo)
+#: chsh.1.xml:42(refmiscinfo) chfn.1.xml:43(refmiscinfo)
+#: chage.1.xml:36(refmiscinfo)
 msgid "User Commands"
 msgstr "Commandes utilisateur"
 
-#: su.1.xml:31(refpurpose)
+#: su.1.xml:60(refpurpose)
 #, fuzzy
 msgid "change user ID or become superuser"
 msgstr "Changer d'identifiant d'utilisateur ou devenir superutilisateur"
 
-#: su.1.xml:49(para)
+#: su.1.xml:70(replaceable) login.1.xml:85(replaceable)
+#: login.1.xml:93(replaceable)
+msgid "username"
+msgstr "nom_utilisateur"
+
+#: su.1.xml:78(para)
 #, fuzzy
 msgid ""
 "The <command>su</command> command is used to become another user during a "
@@ -2080,7 +2368,7 @@
 "permet d'obtenir un environnement similaire à celui que l'utilisateur aurait "
 "obtenu lors d'une connexion directe."
 
-#: su.1.xml:58(para)
+#: su.1.xml:87(para)
 msgid ""
 "Additional arguments may be provided after the username, in which case they "
 "are supplied to the user's login shell. In particular, an argument of "
@@ -2096,7 +2384,7 @@
 "l'interpréteur indiqué dans <filename>/etc/passwd</filename> pour "
 "l'utilisateur cible."
 
-#: su.1.xml:67(para)
+#: su.1.xml:96(para)
 msgid ""
 "You can use the <option>--</option> argument to separate <command>su</"
 "command> options from the arguments supplied to the shell."
@@ -2105,7 +2393,7 @@
 "options de <command>su</command> des paramètres fournis par l'interpréteur "
 "de commandes."
 
-#: su.1.xml:72(para)
+#: su.1.xml:101(para)
 msgid ""
 "The user will be prompted for a password, if appropriate. Invalid passwords "
 "will produce an error message. All attempts, both valid and invalid, are "
@@ -2115,7 +2403,7 @@
 "passe incorrects produisent un message d'erreur. Toutes les tentatives, "
 "réussies ou non, sont enregistrées afin de détecter tout abus du système."
 
-#: su.1.xml:77(para)
+#: su.1.xml:106(para)
 #, fuzzy
 msgid ""
 "The current environment is passed to the new shell. The value of <envar>"
@@ -2132,7 +2420,7 @@
 "modifié avec les paramètres <emphasis>ENV_PATH</emphasis> et "
 "<emphasis>ENV_SUPATH</emphasis> de <filename>/etc/login.defs</filename>. "
 
-#: su.1.xml:86(para) login.1.xml:135(para)
+#: su.1.xml:115(para) login.1.xml:166(para)
 msgid ""
 "A subsystem login is indicated by the presence of a \"*\" as the first "
 "character of the login shell. The given home directory will be used as the "
@@ -2143,11 +2431,11 @@
 "personnel sera utilisé comme racine d'un nouveau système de fichiers dans "
 "lequel l'utilisateur sera connecté."
 
-#: su.1.xml:95(para)
+#: su.1.xml:124(para)
 msgid "The options which apply to the <command>su</command> command are:"
 msgstr "Les options applicables à la commande <command>su</command> sont :"
 
-#: su.1.xml:99(term)
+#: su.1.xml:128(term)
 #, fuzzy
 msgid ""
 "<option>-c</option>, <option>--command</option><replaceable>COMMAND</"
@@ -2156,7 +2444,7 @@
 "<option>-c</option>, <option>--comment</option> <replaceable>COMMENTAIRE</"
 "replaceable>"
 
-#: su.1.xml:104(para)
+#: su.1.xml:133(para)
 msgid ""
 "Specify a command that will be invoked by the shell using its <option>-c</"
 "option>."
@@ -2164,11 +2452,11 @@
 "Indiquer une commande qui sera invoquée par l'interpréteur de commandes en "
 "utilisant son option <option>-c</option>"
 
-#: su.1.xml:111(term)
+#: su.1.xml:140(term)
 msgid "<option>-</option>, <option>-l</option>, <option>--login</option>"
 msgstr "<option>-</option>, <option>-l</option>, <option>--login</option>"
 
-#: su.1.xml:115(para)
+#: su.1.xml:144(para)
 msgid ""
 "Provide an environment similar to what the user would expect had the user "
 "logged in directly."
@@ -2176,7 +2464,7 @@
 "Fournir à l'utilisateur un environnement similaire à celui qu'il aurait "
 "obtenu s'il s'était connecté directement."
 
-#: su.1.xml:119(para)
+#: su.1.xml:148(para)
 msgid ""
 "When <option>-</option> is used, it must be specified as the last "
 "<command>su</command> option. The other forms (<option>-l</option> and "
@@ -2186,15 +2474,15 @@
 "paramètre de <command>su</command> option. Les autres formes (<option>-l</"
 "option> et <option>--login</option>) ne présentent pas cette restriction."
 
-#: su.1.xml:133(para)
+#: su.1.xml:162(para)
 msgid "The shell that will be invoked."
 msgstr "Interpréteur de commande devant être appelé."
 
-#: su.1.xml:138(para)
+#: su.1.xml:167(para)
 msgid "The shell specified with --shell."
 msgstr "Interpréteur de commande indiqué par --shell."
 
-#: su.1.xml:141(para)
+#: su.1.xml:170(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
@@ -2203,7 +2491,7 @@
 "commandes indiqué par la variable d'environnement <envar>$SHELL</envar> sera "
 "utilisé."
 
-#: su.1.xml:148(para)
+#: su.1.xml:177(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
@@ -2211,7 +2499,7 @@
 "Interpréteur de commandes indiqué dans <filename>/etc/passwd</filename> pour "
 "l'utilisateur cible."
 
-#: su.1.xml:154(para)
+#: su.1.xml:183(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
@@ -2219,7 +2507,7 @@
 "<filename>/bin/sh</filename> si aucun interpréteur de commandes ne peut être "
 "trouvé par l'une des méthodes ci-dessus."
 
-#: su.1.xml:134(para)
+#: su.1.xml:163(para)
 #, fuzzy
 msgid ""
 "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
@@ -2227,7 +2515,7 @@
 "L'interpréteur de commandes est choisi parmi (celui de plus haute priorité "
 "en tête) : <placeholder-1/>"
 
-#: su.1.xml:161(para)
+#: su.1.xml:190(para)
 #, fuzzy
 msgid ""
 "If the target user has a restricted shell (i.e. the shell field of this "
@@ -2243,7 +2531,7 @@
 "$SHELL</envar> ne seront prises en compte à moins que <command>su</command> "
 "ne soit appelé par le superutilisateur."
 
-#: su.1.xml:172(term)
+#: su.1.xml:201(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -2251,11 +2539,11 @@
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
 
-#: su.1.xml:177(para)
+#: su.1.xml:206(para)
 msgid "Preserve the current environment."
 msgstr "Préserver l'environnement actuel."
 
-#: su.1.xml:178(para)
+#: su.1.xml:207(para)
 msgid ""
 "If the target user has a restricted shell, this option has no effect (unless "
 "<command>su</command> is called by root)."
@@ -2264,7 +2552,7 @@
 "option n'a aucun effet (à moins que <command>su</command> ne soit appelé par "
 "le superutilisateur)."
 
-#: su.1.xml:189(para)
+#: su.1.xml:218(para)
 msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -2273,28 +2561,28 @@
 "compilation. Seules certaines d'entre elles peuvent avoir été activées sur "
 "votre site."
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>CONSOLE</option> (string)"
 msgstr "CHFN_RESTRICT (chaîne)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, either full pathname of a file containing device names or a \":"
 "\" delimited list of device names. Root logins will be allowed only upon "
 "these devices."
 msgstr ""
 
-#: su.1.xml:9(para) login.defs.5.xml:9(para) login.1.xml:9(para)
+#: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
 msgid "If not defined, root will be allowed on any device."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>CONSOLE_GROUPS</option> (string)"
 msgstr "CHFN_RESTRICT (chaîne)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "List of groups to add to the user's supplementary group set when logging in "
 "on the console (as determined by the CONSOLE setting). Default is none. "
@@ -2302,18 +2590,18 @@
 "permanent access to these groups, even when not logged in on the console."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>DEFAULT_HOME</option> (boolean)"
 msgstr "CHFN_AUTH (booléen)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Indicate if login is allowed if we can't cd to the home directory. Default "
 "in no."
 msgstr ""
 
-#: su.1.xml:8(para) login.defs.5.xml:8(para) login.1.xml:8(para)
+#: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
 msgid ""
 "If set to <replaceable>yes</replaceable>, the user will login in the root "
 "(<filename>/</filename>) directory if it is not possible to cd to her home "
@@ -2321,41 +2609,41 @@
 msgstr ""
 
 #. XXX: When compiled with PAM support, only sulogin uses ENV_HZ
-#: su.1.xml:3(term) login.defs.5.xml:3(term) login.1.xml:3(term)
+#: su.1.xml:33(term) login.defs.5.xml:33(term) login.1.xml:33(term)
 #, fuzzy
 msgid "<option>ENV_HZ</option> (string)"
 msgstr "MAIL_DIR (chaîne)"
 
-#: su.1.xml:5(para) login.defs.5.xml:5(para) login.1.xml:5(para)
+#: su.1.xml:35(para) login.defs.5.xml:35(para) login.1.xml:35(para)
 msgid ""
 "If set, it will be used to define the HZ environment variable when a user "
 "login. The value must be preceded by <replaceable>HZ=</replaceable>. A "
 "common value on Linux is <replaceable>HZ=100</replaceable>."
 msgstr ""
 
-#: su.1.xml:11(para) login.defs.5.xml:11(para) login.1.xml:11(para)
+#: su.1.xml:41(para) login.defs.5.xml:41(para) login.1.xml:41(para)
 msgid ""
 "The <envar>HZ</envar> environment variable is only set when the user (the "
 "superuser) logs in with <command>sulogin</command>."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENVIRON_FILE</option> (string)"
 msgstr "MAIL_DIR (chaîne)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If this file exists and is readable, login environment will be read from it. "
 "Every line should be in the form name=value."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_PATH</option> (string)"
 msgstr "CHFN_RESTRICT (chaîne)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, it will be used to define the PATH environment variable when a "
 "regular user login. The value can be preceded by <replaceable>PATH=</"
@@ -2364,12 +2652,12 @@
 "usr/bin</replaceable>."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_SUPATH</option> (string)"
 msgstr "CHFN_RESTRICT (chaîne)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, it will be used to define the PATH environment variable when the "
 "superuser login. The value can be preceded by <replaceable>PATH=</"
@@ -2378,12 +2666,12 @@
 "<replaceable>PATH=/bin:/usr/bin</replaceable>."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_TZ</option> (string)"
 msgstr "CHFN_RESTRICT (chaîne)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, it will be used to define the TZ environment variable when a user "
 "login. The value can be the name of a timezone preceded by <replaceable>TZ=</"
@@ -2393,72 +2681,72 @@
 msgstr ""
 
 #. TODO: it can in fact be used to set any other variable
-#: su.1.xml:13(para) login.defs.5.xml:13(para) login.1.xml:13(para)
+#: su.1.xml:43(para) login.defs.5.xml:43(para) login.1.xml:43(para)
 msgid ""
 "If a full path is specified but the file does not exist or cannot be read, "
 "the default is to use <replaceable>TZ=CST6CDT</replaceable>."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
-#: chsh.1.xml:2(term) chfn.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
+#: chsh.1.xml:32(term) chfn.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOGIN_STRING</option> (string)"
 msgstr "CHFN_RESTRICT (chaîne)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
-#: chsh.1.xml:4(para) chfn.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
+#: chsh.1.xml:34(para) chfn.1.xml:34(para)
 msgid ""
 "The string used for prompting a password. The default is to use \"Password: "
 "\", or a translation of that string. If you set this variable, the prompt "
 "will no be translated."
 msgstr ""
 
-#: su.1.xml:9(para) login.defs.5.xml:9(para) login.1.xml:9(para)
-#: chsh.1.xml:9(para) chfn.1.xml:9(para)
+#: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
+#: chsh.1.xml:39(para) chfn.1.xml:39(para)
 msgid ""
 "If the string contains <replaceable>%s</replaceable>, this will be replaced "
 "by the user's name."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>MAIL_CHECK_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (booléen)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable checking and display of mailbox status upon login."
 msgstr ""
 
-#: su.1.xml:7(para) login.defs.5.xml:7(para) login.1.xml:7(para)
+#: su.1.xml:37(para) login.defs.5.xml:37(para) login.1.xml:37(para)
 msgid ""
 "You should disable it if the shell startup files already check for mail "
 "(\"mailx -e\" or equivalent)."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>QUOTAS_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (booléen)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable setting of ulimit, umask, and niceness from passwd gecos field."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SULOG_FILE</option> (string)"
 msgstr "CHFN_RESTRICT (chaîne)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "If defined, all su activity is logged to this file."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SU_NAME</option> (string)"
 msgstr "MAIL_DIR (chaîne)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "If defined, the command name to display when running \"su -\". For example, "
 "if this is defined as \"su\" then a \"ps\" will display the command is \"-su"
@@ -2466,12 +2754,12 @@
 "being run, e.g. something like \"-sh\"."
 msgstr ""
 
-#: su.1.xml:3(term) login.defs.5.xml:3(term)
+#: su.1.xml:33(term) login.defs.5.xml:33(term)
 #, fuzzy
 msgid "<option>SU_WHEEL_ONLY</option> (boolean)"
 msgstr "CHFN_AUTH (booléen)"
 
-#: su.1.xml:5(para) login.defs.5.xml:5(para)
+#: su.1.xml:35(para) login.defs.5.xml:35(para)
 msgid ""
 "If <replaceable>yes</replaceable>, the user must be listed as a member of "
 "the first gid 0 group in <filename>/etc/group</filename> (called "
@@ -2480,18 +2768,18 @@
 "empty, no one will be able to <command>su</command> to uid 0."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SYSLOG_SU_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (booléen)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "Enable \"syslog\" logging of <command>su</command> activity - in addition to "
 "sulog file logging."
 msgstr ""
 
-#: su.1.xml:243(para)
+#: su.1.xml:272(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -2507,27 +2795,27 @@
 "citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>"
 
-#: sg.1.xml:9(refentrytitle) sg.1.xml:14(refname) sg.1.xml:20(command)
+#: sg.1.xml:38(refentrytitle) sg.1.xml:43(refname) sg.1.xml:49(command)
 msgid "sg"
 msgstr "sg"
 
-#: sg.1.xml:15(refpurpose)
+#: sg.1.xml:44(refpurpose)
 msgid "execute command as different group ID"
 msgstr "exécuter une commande avec un autre identifiant de groupe"
 
-#: sg.1.xml:21(arg) newgrp.1.xml:20(arg)
+#: sg.1.xml:50(arg) newgrp.1.xml:49(arg)
 msgid "-"
 msgstr "-"
 
-#: sg.1.xml:23(arg) expiry.1.xml:23(arg)
+#: sg.1.xml:52(arg) expiry.1.xml:53(arg)
 msgid "-c"
 msgstr "-c"
 
-#: sg.1.xml:22(arg)
+#: sg.1.xml:51(arg)
 msgid "group <placeholder-1/> command"
 msgstr "groupe <placeholder-1/> commande"
 
-#: sg.1.xml:31(para)
+#: sg.1.xml:60(para)
 msgid ""
 "The <command>sg</command> command works similar to <command>newgrp</command> "
 "but accepts a command. The command will be executed with the <filename>/bin/"
@@ -2552,16 +2840,16 @@
 "<command>sg</command>, ce qui permet de retrouver le groupe précédent à la "
 "sortie de <command>sg</command>."
 
-#: sg.1.xml:2(term) newgrp.1.xml:2(term) login.defs.5.xml:2(term)
+#: sg.1.xml:32(term) newgrp.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SYSLOG_SG_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (booléen)"
 
-#: sg.1.xml:4(para) newgrp.1.xml:4(para) login.defs.5.xml:4(para)
+#: sg.1.xml:34(para) newgrp.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Enable \"syslog\" logging of <command>sg</command> activity."
 msgstr ""
 
-#: sg.1.xml:90(para)
+#: sg.1.xml:119(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -2598,90 +2886,61 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
-#: shadow.5.xml:5(refentrytitle) shadow.5.xml:10(refname)
-#: shadow.3.xml:5(refentrytitle) shadow.3.xml:10(refname)
-#: pwck.8.xml:31(replaceable) pwck.8.xml:45(replaceable)
-#: grpck.8.xml:24(replaceable) grpck.8.xml:33(replaceable)
+#: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
+#: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
+#: pwck.8.xml:60(replaceable) pwck.8.xml:74(replaceable)
+#: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
 msgid "shadow"
 msgstr "shadow"
 
 # NOTE: shadowed, not encrypted
-#: shadow.5.xml:11(refpurpose)
+#: shadow.5.xml:40(refpurpose)
 msgid "encrypted password file"
 msgstr "fichier des mots de passe cachés"
 
-#: shadow.5.xml:16(para)
+#: shadow.5.xml:45(para)
+#, fuzzy
+#| msgid ""
+#| "<emphasis remap=\"I\">shadow</emphasis> contains the encrypted password "
+#| "information for user's accounts and optional the password aging "
+#| "information. Included is:"
 msgid ""
-"<emphasis remap=\"I\">shadow</emphasis> contains the encrypted password "
-"information for user's accounts and optional the password aging information. "
-"Included is:"
+"<filename>shadow</filename> is a file which contains the password "
+"information for the system's accounts and optional aging information."
 msgstr ""
 "Le fichier <filename>/etc/shadow</filename> contient les informations "
 "cachées concernant les mots de passe des utilisateurs et leurs dates de "
 "validité. Ces informations comprennent :"
 
-#: shadow.5.xml:23(para) passwd.5.xml:24(para)
-msgid "login name"
-msgstr "nom de connexion de l'utilisateur (« login »)"
-
-#: shadow.5.xml:26(para) gshadow.5.xml:26(para)
-msgid "encrypted password"
-msgstr "mot de passe chiffré"
-
-#: shadow.5.xml:29(para)
-msgid "days since Jan 1, 1970 that password was last changed"
+#: shadow.5.xml:51(para) gshadow.5.xml:82(para)
+msgid ""
+"This file must not be readable by regular users if password security is to "
+"be maintained."
 msgstr ""
-"nombre de jours, comptés à partir du 1er janvier 1970, depuis le dernier "
-"changement de mot de passe"
+"Ce fichier ne doit pas être accessible en lecture par les utilisateurs "
+"normaux afin de maintenir la sécurité des mots de passe, en particuliers "
+"pour prévenir les attaques par dictionnaires."
 
-#: shadow.5.xml:32(para)
-msgid "days before password may be changed"
-msgstr "nombre de jours à attendre avant de pouvoir changer le mot de passe"
-
-#: shadow.5.xml:35(para)
-msgid "days after which password must be changed"
-msgstr "nombre de jours après lesquels le mot de passe doit être changé"
-
-#: shadow.5.xml:38(para)
-msgid "days before password is to expire that user is warned"
+#: shadow.5.xml:56(para)
+msgid ""
+"Each line of this file contains 9 fields, separated by colons (<quote>:</"
+"quote>), in the following order:"
 msgstr ""
-"nombre de jours avant la fin de validité du mot de passe et pendant lesquels "
-"l'utilisateur est averti"
 
-#: shadow.5.xml:41(para)
-msgid "days after password expires that account is disabled"
-msgstr ""
-"nombre de jours après la fin de validité provoquant la désactivation du "
-"compte"
+#: shadow.5.xml:63(emphasis) passwd.5.xml:53(para)
+msgid "login name"
+msgstr "nom de connexion de l'utilisateur (« login »)"
 
-#: shadow.5.xml:44(para)
-msgid "days since Jan 1, 1970 that account is disabled"
+#: shadow.5.xml:65(para)
+msgid "It must be a valid account name, which exist on the system."
 msgstr ""
-"nombre de jours, comptés à partir du 1er janvier 1970, depuis que le compte "
-"est désactivé"
 
-#: shadow.5.xml:47(para)
-msgid "a reserved field"
-msgstr "champ réservé"
+#: shadow.5.xml:71(emphasis) gshadow.5.xml:54(para)
+msgid "encrypted password"
+msgstr "mot de passe chiffré"
 
-#: shadow.5.xml:51(para)
-#, fuzzy
+#: shadow.5.xml:73(para)
 msgid ""
-"The password field must be filled. The encrypted password consists of 13 to "
-"24 characters from the 64 character alphabet a thru z, A thru Z, 0 thru 9, "
-"\\. and /. Optionally it can start with a \"$\" character. This means the "
-"encrypted password was generated using another (not DES) algorithm. For "
-"example if it starts with \"$1$\" it means the MD5-based algorithm was used."
-msgstr ""
-"Le champ « mot de passe » doit être rempli. Le mot de passe chiffré comprend "
-"13 à 24 caractères pris dans l'alphabet de 64 caractère : a-z, A-Z, 0-9, \\. "
-"et /. Il peut optionellement commencer par un caractère « $ ». Ceci signifie "
-"que le mot de passe a été généré par un autre algorithme (autre que DES). "
-"Par exemple, s'il commence par « $1$ », l'algorithme basé sur MD5 a été "
-"utilisé."
-
-#: shadow.5.xml:60(para)
-msgid ""
 "Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry> for details on how this string is interpreted."
 msgstr ""
@@ -2689,13 +2948,20 @@
 "manvolnum></citerefentry> pour plus d'informations sur le traitement de "
 "cette chaîne."
 
-#: shadow.5.xml:68(para)
+#: shadow.5.xml:78(para)
+#, fuzzy
+#| msgid ""
+#| "If the password field contains some string that is not valid result of "
+#| "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+#| "manvolnum></citerefentry>, for instance ! or *, the user will not be able "
+#| "to use a unix password to log in, subject to "
+#| "<citerefentry><refentrytitle>pam</refentrytitle><manvolnum>7</manvolnum></"
+#| "citerefentry>."
 msgid ""
-"If the password field contains some string that is not valid result of "
+"If the password field contains some string that is not a valid result of "
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>, for instance ! or *, the user will not be able to use a unix "
-"password to log in, subject to <citerefentry><refentrytitle>pam</"
-"refentrytitle><manvolnum>7</manvolnum></citerefentry>."
+"password to log in (but the user may log in the system by other means)."
 msgstr ""
 "Si le champ du mot de passe contient une chaîne qui ne peut pas être un "
 "résultat valable de <citerefentry><refentrytitle>crypt</"
@@ -2705,161 +2971,306 @@
 "<citerefentry><refentrytitle>pam</refentrytitle><manvolnum>7</manvolnum></"
 "citerefentry>."
 
-#: shadow.5.xml:77(para)
+#: shadow.5.xml:85(para)
 msgid ""
-"The date of the last password change is given as the number of days since "
-"Jan 1, 1970. The password may not be changed again until the proper number "
-"of days have passed, and must be changed after the maximum number of days. "
-"If the minimum number of days required is greater than the maximum number of "
-"day allowed, this password may not be changed by the user."
+"This field may be empty, in which case no passwords are required to "
+"authenticate as the specified login name. However, some applications which "
+"read the <filename>/etc/shadow</filename> file may decide not to permit any "
+"access at all if the password field is empty."
 msgstr ""
-"La date de dernière modification du mot de passe est donnée par le nombre de "
-"jours écoulés depuis le 1er janvier 1970 jusqu'au dernier changement du mot "
-"de passe. Un mot de passe ne peut pas être changé de nouveau avant le nombre "
-"de jours indiqués, et doit être modifié avant le nombre maximal de jours "
-"spécifié. Si le nombre minimal de jours requis est plus grand que le nombre "
-"maximal de jours de validité, ce mot de passe ne peut pas être changé par "
-"l'utilisateur."
 
-#: shadow.5.xml:86(para)
+#: shadow.5.xml:92(para)
 msgid ""
-"An account is considered to be inactive and is disabled if the password is "
-"not changed within the specified number of days after the password expires. "
-"An account will also be disabled on the specified day regardless of other "
-"password expiration information."
+"A password field which starts with a exclamation mark means that the "
+"password is locked. The remaining characters on the line represent the "
+"password field before the password was locked."
 msgstr ""
-"Un compte est considéré comme inactif et est désactivé si le mot de passe "
-"n'est pas changé dans l'intervalle indiqué après la fin de la validité du "
-"mot de passe. Un compte est également désactivé le jour indiqué quels que "
-"soient les autres informations de validité."
 
-#: shadow.5.xml:93(para)
+#: shadow.5.xml:102(emphasis)
+#, fuzzy
+#| msgid "days before password may be changed"
+msgid "date of last password change"
+msgstr "nombre de jours à attendre avant de pouvoir changer le mot de passe"
+
+#: shadow.5.xml:105(para)
 msgid ""
-"This information supersedes any password or password age information present "
-"in <filename>/etc/passwd</filename>."
+"The date of the last password change, expressed as the number of days since "
+"Jan 1, 1970."
 msgstr ""
-"Ces informations sont prioritaires sur tous les autres champs présents dans "
-"<filename>/etc/passwd</filename>."
 
-#: shadow.5.xml:98(para) gshadow.5.xml:54(para)
+#: shadow.5.xml:109(para)
 msgid ""
-"This file must not be readable by regular users if password security is to "
-"be maintained."
+"The value 0 has a special meaning, which is that the user should change her "
+"pasword the next time she will log in the system."
 msgstr ""
-"Ce fichier ne doit pas être accessible en lecture par les utilisateurs "
-"normaux afin de maintenir la sécurité des mots de passe, en particuliers "
-"pour prévenir les attaques par dictionnaires."
 
-#: shadow.5.xml:124(para)
+#: shadow.5.xml:114(para)
+msgid "An empty field means that password aging features are disabled."
+msgstr ""
+
+#: shadow.5.xml:121(emphasis)
+#, fuzzy
+#| msgid "Password Changes"
+msgid "minimum password age"
+msgstr "Modifications du mot de passe"
+
+#: shadow.5.xml:123(para)
 msgid ""
+"The minimum password age is the number of days the user will have to wait "
+"before she will be allowed to change her password again."
+msgstr ""
+
+#: shadow.5.xml:128(para)
+msgid "An empty field and value 0 mean that there are no minimum password age."
+msgstr ""
+
+#: shadow.5.xml:135(emphasis)
+#, fuzzy
+#| msgid "Password Changes"
+msgid "maximum password age"
+msgstr "Modifications du mot de passe"
+
+#: shadow.5.xml:137(para)
+msgid ""
+"The maximum password age is the number of days after which the user will "
+"have to change her password."
+msgstr ""
+
+#: shadow.5.xml:141(para)
+msgid ""
+"After this number of days is elapsed, the password may still be valid. The "
+"user should be asked to change her password the next time she will log in."
+msgstr ""
+
+#: shadow.5.xml:146(para)
+msgid ""
+"An empty field means that there are no maximum password age, no password "
+"warning period, and no password inactivity period (see below)."
+msgstr ""
+
+#: shadow.5.xml:151(para)
+msgid ""
+"If the maximum password age is lower than the minimum password age, the user "
+"cannot change her password."
+msgstr ""
+
+#: shadow.5.xml:159(emphasis)
+#, fuzzy
+#| msgid "Password Changes"
+msgid "password warning period"
+msgstr "Modifications du mot de passe"
+
+#: shadow.5.xml:162(para)
+#, fuzzy
+#| msgid ""
+#| "The number of days after a password has expired before the account will "
+#| "be disabled."
+msgid ""
+"The number of days before a password is going to expire (see the maximum "
+"password age above) during which the user should be warned."
+msgstr ""
+"Nombre de jours après la fin de validité d'un mot de passe avant que le "
+"compte ne soit désactivé."
+
+#: shadow.5.xml:167(para)
+msgid ""
+"An empty field and value 0 mean that there are no password warning period."
+msgstr ""
+
+#: shadow.5.xml:175(emphasis)
+msgid "password inactivity period"
+msgstr ""
+
+#: shadow.5.xml:178(para)
+msgid ""
+"The number of days after a password has expired (see the maximum password "
+"age above) during which the password should still be accepted (and the user "
+"should update her password during the next login)."
+msgstr ""
+
+#: shadow.5.xml:184(para)
+msgid ""
+"After expiration of the password and this expiration period is elapsed, no "
+"login is possible using the current user's password. The user should contact "
+"her administrator."
+msgstr ""
+
+#: shadow.5.xml:189(para)
+msgid ""
+"An empty field means that there are no enforcement of an inactivity period."
+msgstr ""
+
+#: shadow.5.xml:197(emphasis)
+#, fuzzy
+#| msgid "User account information."
+msgid "account expiration date"
+msgstr "Informations sur les comptes des utilisateurs."
+
+#: shadow.5.xml:200(para)
+msgid ""
+"The date of expiration of the account, expressed as the number of days since "
+"Jan 1, 1970."
+msgstr ""
+
+#: shadow.5.xml:204(para)
+msgid ""
+"Note that an account expiration differs from a password expiration. In case "
+"of an acount expiration, the user shall not be allowed to login. In case of "
+"a password expiration, the user is not allowed to login using her password."
+msgstr ""
+
+#: shadow.5.xml:210(para)
+msgid "An empty field means that the account will never expire."
+msgstr ""
+
+#: shadow.5.xml:213(para)
+msgid ""
+"The value 0 should not be used as it is interpreted as either an account "
+"with no expiration, or as an expiration on Jan 1, 1970."
+msgstr ""
+
+#: shadow.5.xml:221(emphasis)
+#, fuzzy
+#| msgid "a reserved field"
+msgid "reserved field"
+msgstr "champ réservé"
+
+#: shadow.5.xml:223(para)
+#, fuzzy
+#| msgid "sp_flag - reserved for future use"
+msgid "This field is reserved for future use."
+msgstr "sp_flag - réservé pour une utilisation future"
+
+#: shadow.5.xml:249(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>"
+msgid ""
 "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>pwconv</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>login</"
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>pwconv</"
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>"
 
-#: shadow.3.xml:7(refmiscinfo)
+#: shadow.3.xml:36(refmiscinfo)
 msgid "Library Calls"
 msgstr "Appels de bibliothèque"
 
-#: shadow.3.xml:11(refname)
+#: shadow.3.xml:40(refname)
 msgid "getspnam"
 msgstr "getspnam"
 
-#: shadow.3.xml:12(refpurpose)
+#: shadow.3.xml:41(refpurpose)
 msgid "encrypted password file routines"
 msgstr "routines d'utilisation des mots de passe cachés"
 
-#: shadow.3.xml:16(title)
+#: shadow.3.xml:45(title)
 msgid "SYNTAX"
 msgstr "SYNTAX"
 
-#: shadow.3.xml:18(emphasis)
+#: shadow.3.xml:47(emphasis)
 msgid "#include &lt;shadow.h&gt;"
 msgstr "#include &lt;shadow.h&gt;"
 
-#: shadow.3.xml:22(emphasis)
+#: shadow.3.xml:51(emphasis)
 msgid "struct spwd *getspent();"
 msgstr "struct spwd *getspent();"
 
-#: shadow.3.xml:26(emphasis)
+#: shadow.3.xml:55(emphasis)
 msgid "struct spwd *getspnam(char"
 msgstr "struct spwd *getspnam(char"
 
-#: shadow.3.xml:27(emphasis)
+#: shadow.3.xml:56(emphasis)
 msgid "*name"
 msgstr "*nom"
 
-#: shadow.3.xml:27(emphasis) shadow.3.xml:40(emphasis)
-#: shadow.3.xml:45(emphasis) shadow.3.xml:51(emphasis)
+#: shadow.3.xml:56(emphasis) shadow.3.xml:69(emphasis)
+#: shadow.3.xml:74(emphasis) shadow.3.xml:80(emphasis)
 msgid ");"
 msgstr ");"
 
-#: shadow.3.xml:31(emphasis)
+#: shadow.3.xml:60(emphasis)
 msgid "void setspent();"
 msgstr "void setspent();"
 
-#: shadow.3.xml:35(emphasis)
+#: shadow.3.xml:64(emphasis)
 msgid "void endspent();"
 msgstr "void endspent();"
 
-#: shadow.3.xml:39(emphasis)
+#: shadow.3.xml:68(emphasis)
 msgid "struct spwd *fgetspent(FILE"
 msgstr "struct spwd *fgetspent(FILE"
 
-#: shadow.3.xml:40(emphasis) shadow.3.xml:51(emphasis)
+#: shadow.3.xml:69(emphasis) shadow.3.xml:80(emphasis)
 msgid "*fp"
 msgstr "*fp"
 
-#: shadow.3.xml:44(emphasis)
+#: shadow.3.xml:73(emphasis)
 msgid "struct spwd *sgetspent(char"
 msgstr "struct spwd *sgetspent(char"
 
-#: shadow.3.xml:45(emphasis)
+#: shadow.3.xml:74(emphasis)
 msgid "*cp"
 msgstr "*cp"
 
-#: shadow.3.xml:49(emphasis)
+#: shadow.3.xml:78(emphasis)
 msgid "int putspent(struct spwd"
 msgstr "int putspent(struct spwd"
 
-#: shadow.3.xml:50(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "*p,"
 msgstr "*p,"
 
-#: shadow.3.xml:50(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "FILE"
 msgstr "FICHIER"
 
-#: shadow.3.xml:55(emphasis)
+#: shadow.3.xml:84(emphasis)
 msgid "int lckpwdf();"
 msgstr "int lckpwdf();"
 
-#: shadow.3.xml:59(emphasis)
+#: shadow.3.xml:88(emphasis)
 msgid "int ulckpwdf();"
 msgstr "int ulckpwdf();"
 
-#: shadow.3.xml:65(para)
+#: shadow.3.xml:94(para)
 msgid ""
 "<emphasis remap=\"I\">shadow</emphasis> manipulates the contents of the "
 "shadow password file, <filename>/etc/shadow</filename>. The structure in the "
@@ -2869,7 +3280,7 @@
 "mots de passe cachés, <filename>/etc/shadow</filename>. La structure définie "
 "dans le fichier inclus est :"
 
-#: shadow.3.xml:70(programlisting)
+#: shadow.3.xml:99(programlisting)
 #, no-wrap
 msgid ""
 "struct spwd {\n"
@@ -2898,40 +3309,40 @@
 "}\n"
 "    "
 
-#: shadow.3.xml:82(para)
+#: shadow.3.xml:111(para)
 msgid "The meanings of each field are:"
 msgstr "La signification de chaque champ est la suivante :"
 
-#: shadow.3.xml:85(para)
+#: shadow.3.xml:114(para)
 msgid "sp_namp - pointer to null-terminated user name"
 msgstr ""
 "sp_namp - pointeur vers le nom d'utilisateur terminé par un zéro binaire "
 "(« null-terminated »)"
 
-#: shadow.3.xml:88(para)
+#: shadow.3.xml:117(para)
 msgid "sp_pwdp - pointer to null-terminated password"
 msgstr ""
 "sp_pwdp - pointeur vers le mot de passe terminé par un zéro binaire ( « null-"
 "terminated »)"
 
-#: shadow.3.xml:91(para)
+#: shadow.3.xml:120(para)
 msgid "sp_lstchg - days since Jan 1, 1970 password was last changed"
 msgstr ""
 "sp_lstchg - nombre de jours, comptés à partir du 1er janvier 1970, depuis la "
 "dernière modification du mot de passe"
 
-#: shadow.3.xml:94(para)
+#: shadow.3.xml:123(para)
 msgid "sp_min - days before which password may not be changed"
 msgstr ""
 "sp_min - nombre de jours pendant lesquels le mot de passe ne peut pas être "
 "changé"
 
-#: shadow.3.xml:97(para)
+#: shadow.3.xml:126(para)
 msgid "sp_max - days after which password must be changed"
 msgstr ""
 "sp_max - nombre maximal de jours avant que le mot de passe doive être changé"
 
-#: shadow.3.xml:100(para)
+#: shadow.3.xml:129(para)
 msgid ""
 "sp_warn - days before password is to expire that user is warned of pending "
 "password expiration"
@@ -2940,7 +3351,7 @@
 "validité pendant lesquels l'utilisateur est averti de la fin prochaine de la "
 "validité de son mot de passe"
 
-#: shadow.3.xml:105(para)
+#: shadow.3.xml:134(para)
 msgid ""
 "sp_inact - days after password expires that account is considered inactive "
 "and disabled"
@@ -2948,17 +3359,17 @@
 "sp_inact - nombre de jours après la fin de validité du mot de passe avant de "
 "considérer que le compte est inactif et soit désactivé"
 
-#: shadow.3.xml:110(para)
+#: shadow.3.xml:139(para)
 msgid "sp_expire - days since Jan 1, 1970 when account will be disabled"
 msgstr ""
 "sp_expire - nombre de jours, comptés à partir du 1er janvier 1970, après "
 "lesquels le compte sera désactivé"
 
-#: shadow.3.xml:113(para)
+#: shadow.3.xml:142(para)
 msgid "sp_flag - reserved for future use"
 msgstr "sp_flag - réservé pour une utilisation future"
 
-#: shadow.3.xml:121(para)
+#: shadow.3.xml:150(para)
 msgid ""
 "<emphasis>getspent</emphasis>, <emphasis>getspname</emphasis>, "
 "<emphasis>fgetspent</emphasis>, and <emphasis>sgetspent</emphasis> each "
@@ -2982,7 +3393,7 @@
 "entrée correspondant à <emphasis>nom</emphasis> dans le fichier fourni en "
 "entrée."
 
-#: shadow.3.xml:134(para)
+#: shadow.3.xml:163(para)
 msgid ""
 "<emphasis>setspent</emphasis> and <emphasis>endspent</emphasis> may be used "
 "to begin and end, respectively, access to the shadow password file."
@@ -2991,7 +3402,7 @@
 "utilisés pour débuter et terminer l'accès au fichier de mots de passe cachés."
 
 # TBD: vérifier tous les remap
-#: shadow.3.xml:140(para)
+#: shadow.3.xml:169(para)
 msgid ""
 "The <emphasis>lckpwdf</emphasis> and <emphasis>ulckpwdf</emphasis> routines "
 "should be used to insure exclusive access to the <filename>/etc/shadow</"
@@ -3011,7 +3422,7 @@
 "être placé, <emphasis>lckpwdf</emphasis> renvoie -1. Quand les deux verrous "
 "peuvent être placés, la valeur 0 est renvoyée."
 
-#: shadow.3.xml:155(para)
+#: shadow.3.xml:184(para)
 msgid ""
 "Routines return NULL if no more entries are available or if an error occurs "
 "during processing. Routines which have <emphasis>int</emphasis> as the "
@@ -3022,7 +3433,7 @@
 "retour est un <emphasis>int</emphasis> renvoient 0 en cas de succès et -1 en "
 "cas d'échec."
 
-#: shadow.3.xml:165(para)
+#: shadow.3.xml:194(para)
 #, fuzzy
 msgid ""
 "These routines may only be used by the superuser as access to the shadow "
@@ -3031,7 +3442,7 @@
 "Ces fonctions peuvent n'être disponibles que pour le superutilisateur car "
 "l'accès au fichier de mots de passe cachés est restreint."
 
-#: shadow.3.xml:185(para)
+#: shadow.3.xml:214(para)
 msgid ""
 "<citerefentry><refentrytitle>getpwent</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -3041,31 +3452,31 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: pwconv.8.xml:12(refentrytitle) pwconv.8.xml:17(refname)
-#: pwconv.8.xml:26(command) login.defs.5.xml:356(term)
+#: pwconv.8.xml:42(refentrytitle) pwconv.8.xml:47(refname)
+#: pwconv.8.xml:56(command) login.defs.5.xml:388(term)
 msgid "pwconv"
 msgstr "pwconv"
 
-#: pwconv.8.xml:18(refname) pwconv.8.xml:29(command)
+#: pwconv.8.xml:48(refname) pwconv.8.xml:59(command)
 msgid "pwunconv"
 msgstr "pwunconv"
 
-#: pwconv.8.xml:19(refname) pwconv.8.xml:32(command)
-#: login.defs.5.xml:270(term)
+#: pwconv.8.xml:49(refname) pwconv.8.xml:62(command)
+#: login.defs.5.xml:302(term)
 msgid "grpconv"
 msgstr "grpconv"
 
-#: pwconv.8.xml:20(refname) pwconv.8.xml:35(command)
-#: login.defs.5.xml:276(term)
+#: pwconv.8.xml:50(refname) pwconv.8.xml:65(command)
+#: login.defs.5.xml:308(term)
 msgid "grpunconv"
 msgstr "grpunconv"
 
-#: pwconv.8.xml:21(refpurpose)
+#: pwconv.8.xml:51(refpurpose)
 msgid "convert to and from shadow passwords and groups"
 msgstr ""
 "Convertir vers ou depuis les fichiers de mots de passe ou de groupe cachés"
 
-#: pwconv.8.xml:41(para)
+#: pwconv.8.xml:71(para)
 #, fuzzy
 msgid ""
 "The <command>pwconv</command> command creates <emphasis remap=\"I\">shadow</"
@@ -3076,7 +3487,7 @@
 "emphasis> à partir du fichier <emphasis remap=\"I\">passwd</emphasis> et "
 "d'un éventuel fichier <emphasis remap=\"I\">shadow</emphasis>."
 
-#: pwconv.8.xml:47(para)
+#: pwconv.8.xml:77(para)
 #, fuzzy
 msgid ""
 "The <command>pwunconv</command> command creates <emphasis remap=\"I"
@@ -3089,7 +3500,7 @@
 "<emphasis remap=\"I\">shadow</emphasis> puis supprime <emphasis remap=\"I"
 "\">shadow</emphasis>."
 
-#: pwconv.8.xml:54(para)
+#: pwconv.8.xml:84(para)
 #, fuzzy
 msgid ""
 "The <command>grpconv</command> command creates <emphasis remap=\"I"
@@ -3100,7 +3511,7 @@
 "partir de <emphasis remap=\"I\">group</emphasis> et d'un éventuel fichier "
 "<emphasis remap=\"I\">gshadow</emphasis>."
 
-#: pwconv.8.xml:60(para)
+#: pwconv.8.xml:90(para)
 #, fuzzy
 msgid ""
 "The <command>grpunconv</command> command creates <emphasis remap=\"I"
@@ -3113,7 +3524,7 @@
 "remap=\"I\">gshadow</emphasis> puis supprime <emphasis remap=\"I\">gshadow</"
 "emphasis>."
 
-#: pwconv.8.xml:67(para)
+#: pwconv.8.xml:97(para)
 msgid ""
 "These four programs all operate on the normal and shadow password and group "
 "files: <filename>/etc/passwd</filename>, <filename>/etc/group</filename>, "
@@ -3124,7 +3535,7 @@
 "filename>, <filename>/etc/group</filename>, <filename>/etc/shadow</"
 "filename>, et <filename>/etc/gshadow</filename>."
 
-#: pwconv.8.xml:74(para)
+#: pwconv.8.xml:104(para)
 msgid ""
 "Each program acquires the necessary locks before conversion. "
 "<command>pwconv</command> and <command>grpconv</command> are similar. First, "
@@ -3148,7 +3559,7 @@
 "bien pour une mise à jour, si les fichiers principaux [ NdT : non cachés ] "
 "ont été édités à la main."
 
-#: pwconv.8.xml:85(para)
+#: pwconv.8.xml:115(para)
 msgid ""
 "<command>pwconv</command> will use the values of <emphasis remap=\"I"
 "\">PASS_MIN_DAYS</emphasis>, <emphasis remap=\"I\">PASS_MAX_DAYS</emphasis>, "
@@ -3161,7 +3572,7 @@
 "et <emphasis remap=\"I\">PASS_WARN_AGE</emphasis> définies dans le fichier "
 "<filename>/etc/login.defs</filename>."
 
-#: pwconv.8.xml:94(para)
+#: pwconv.8.xml:124(para)
 msgid ""
 "Likewise <command>pwunconv</command> and <command>grpunconv</command> are "
 "similar. Passwords in the main file are updated from the shadowed file. "
@@ -3178,7 +3589,7 @@
 "des mots de passe sont perdues par <command>pwunconv</command>. Il ne "
 "convertit que ce qu'il peut."
 
-#: pwconv.8.xml:106(para)
+#: pwconv.8.xml:136(para)
 msgid ""
 "Errors in the password or group files (such as invalid or duplicate entries) "
 "may cause these programs to loop forever or fail in other strange ways. "
@@ -3191,20 +3602,20 @@
 "étrange. Veuillez exécuter <command>pwck</command> et <command>grpck</"
 "command> pour corriger ces erreurs avant lancer toute conversion."
 
-#: pwconv.8.xml:117(para)
+#: pwconv.8.xml:147(para)
 msgid ""
 "The following configuration variable in <filename>/etc/login.defs</filename> "
 "changes the behavior of <command>grpconv</command> and <command>grpunconv</"
 "command>:"
 msgstr ""
 
-#: pwconv.8.xml:125(para)
+#: pwconv.8.xml:155(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of <command>pwconv</command>:"
 msgstr ""
 
-#: pwconv.8.xml:151(para)
+#: pwconv.8.xml:181(para)
 msgid ""
 "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -3218,37 +3629,37 @@
 "<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>."
 
-#: pwck.8.xml:11(refentrytitle) pwck.8.xml:16(refname) pwck.8.xml:22(command)
-#: pwck.8.xml:37(command) login.defs.5.xml:348(term)
+#: pwck.8.xml:40(refentrytitle) pwck.8.xml:45(refname) pwck.8.xml:51(command)
+#: pwck.8.xml:66(command) login.defs.5.xml:380(term)
 msgid "pwck"
 msgstr "pwck"
 
-#: pwck.8.xml:17(refpurpose)
+#: pwck.8.xml:46(refpurpose)
 msgid "verify integrity of password files"
 msgstr "Vérifier l'intégrité des fichiers de mots de passe"
 
-#: pwck.8.xml:23(arg) pwck.8.xml:38(arg) pwck.8.xml:111(option)
+#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:140(option)
 msgid "-q"
 msgstr "-q"
 
-#: pwck.8.xml:24(arg) pwck.8.xml:132(option) grpck.8.xml:29(arg)
-#: grpck.8.xml:101(option)
+#: pwck.8.xml:53(arg) pwck.8.xml:161(option) grpck.8.xml:58(arg)
+#: grpck.8.xml:130(option)
 msgid "-s"
 msgstr "-s"
 
-#: pwck.8.xml:27(replaceable) pwck.8.xml:42(replaceable)
-#: passwd.5.xml:5(refentrytitle) passwd.5.xml:10(refname)
-#: passwd.1.xml:15(refentrytitle) passwd.1.xml:20(refname)
-#: passwd.1.xml:26(command) login.defs.5.xml:337(term)
+#: pwck.8.xml:56(replaceable) pwck.8.xml:71(replaceable)
+#: passwd.5.xml:34(refentrytitle) passwd.5.xml:39(refname)
+#: passwd.1.xml:44(refentrytitle) passwd.1.xml:49(refname)
+#: passwd.1.xml:55(command) login.defs.5.xml:369(term)
 msgid "passwd"
 msgstr "passwd"
 
-#: pwck.8.xml:39(arg) pwck.8.xml:122(option) login.1.xml:186(option)
-#: grpck.8.xml:20(arg) grpck.8.xml:91(option) gpasswd.1.xml:120(option)
+#: pwck.8.xml:68(arg) pwck.8.xml:151(option) login.1.xml:222(option)
+#: grpck.8.xml:49(arg) grpck.8.xml:120(option)
 msgid "-r"
 msgstr "-r"
 
-#: pwck.8.xml:53(para)
+#: pwck.8.xml:82(para)
 #, fuzzy
 msgid ""
 "The <command>pwck</command> command verifies the integrity of the system "
@@ -3266,35 +3677,35 @@
 "demandée pour détruire les entrées mal formatées ou ayant d'autres erreurs "
 "non récupérables."
 
-#: pwck.8.xml:62(para) grpck.8.xml:51(para)
+#: pwck.8.xml:91(para) grpck.8.xml:80(para)
 msgid "Checks are made to verify that each entry has:"
 msgstr "Voici les vérifications effectuées :"
 
-#: pwck.8.xml:65(para) grpck.8.xml:55(para)
+#: pwck.8.xml:94(para) grpck.8.xml:84(para)
 msgid "the correct number of fields"
 msgstr "nombre correct de champs"
 
-#: pwck.8.xml:68(para)
+#: pwck.8.xml:97(para)
 msgid "a unique user name"
 msgstr "unicité des noms d'utilisateur"
 
-#: pwck.8.xml:71(para)
+#: pwck.8.xml:100(para)
 msgid "a valid user and group identifier"
 msgstr "validité des identifiants d'utilisateur et de groupe"
 
-#: pwck.8.xml:74(para)
+#: pwck.8.xml:103(para)
 msgid "a valid primary group"
 msgstr "validité du groupe primaire"
 
-#: pwck.8.xml:77(para)
+#: pwck.8.xml:106(para)
 msgid "a valid home directory"
 msgstr "validité du répertoire personnel"
 
-#: pwck.8.xml:80(para)
+#: pwck.8.xml:109(para)
 msgid "a valid login shell"
 msgstr "validité de l'interpréteur de commandes initial (« login shell »)"
 
-#: pwck.8.xml:84(para)
+#: pwck.8.xml:113(para)
 msgid ""
 "The checks for correct number of fields and unique user name are fatal. If "
 "the entry has the wrong number of fields, the user will be prompted to "
@@ -3314,7 +3725,7 @@
 "l'utilisateur est encouragé à utiliser <command>usermod</command> pour les "
 "corriger."
 
-#: pwck.8.xml:95(para)
+#: pwck.8.xml:124(para)
 msgid ""
 "The commands which operate on the <filename>/etc/passwd</filename> file are "
 "not able to alter corrupted or duplicated entries. <command>pwck</command> "
@@ -3324,12 +3735,12 @@
 "peuvent pas modifier les entrées corrompues ou redondantes. <command>Pwck</"
 "command> doit être utilisé dans ce cas pour retirer ces entrées."
 
-#: pwck.8.xml:105(para)
+#: pwck.8.xml:134(para)
 msgid "The options which apply to the <command>pwck</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>pwck</command> sont :"
 
-#: pwck.8.xml:114(para)
+#: pwck.8.xml:143(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
@@ -3337,11 +3748,11 @@
 "Ne signaler que les erreurs. Les avertissements qui ne nécessite pas une "
 "action de la part de l'utilisateur ne seront pas affichés."
 
-#: pwck.8.xml:125(para)
+#: pwck.8.xml:154(para)
 msgid "Execute the <command>pwck</command> command in read-only mode."
 msgstr "Permet d'exécuter <command>pwck</command> dans le mode lecture seule."
 
-#: pwck.8.xml:135(para)
+#: pwck.8.xml:164(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
@@ -3349,7 +3760,7 @@
 "Trie les entrées de <filename>/etc/passwd</filename> et <filename>/etc/"
 "shadow</filename> par UID."
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:172(para)
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename>. The user may select "
@@ -3362,39 +3773,59 @@
 "\">fichier_passwd</emphasis> et <emphasis remap=\"I\">fichier_shadow</"
 "emphasis>."
 
-#: pwck.8.xml:192(para)
+#: pwck.8.xml:221(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>group</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"citerefentry>, <citerefentry><refentrytitle>grpck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>usermod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>usermod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"citerefentry>."
 
-#: pwck.8.xml:227(para)
+#: pwck.8.xml:260(para)
 msgid "one or more bad password entries"
 msgstr "une entrée de mot de passe ou plus est incorrecte"
 
-#: pwck.8.xml:233(para)
+#: pwck.8.xml:266(para)
 msgid "can't open password files"
 msgstr "impossible d'ouvrir les fichiers de mots de passe"
 
-#: pwck.8.xml:239(para)
+#: pwck.8.xml:272(para)
 msgid "can't lock password files"
 msgstr "impossible de verrouiller les fichiers de mots de passe"
 
-#: pwck.8.xml:245(para)
+#: pwck.8.xml:278(para)
 msgid "can't update password files"
 msgstr "impossible de mettre à jour les fichiers des mots de passe"
 
-#: pwck.8.xml:209(para)
+#: pwck.8.xml:284(para)
+#, fuzzy
+#| msgid "can't open password files"
+msgid "can't sort password files"
+msgstr "impossible d'ouvrir les fichiers de mots de passe"
+
+#: pwck.8.xml:242(para)
 msgid ""
 "The <command>pwck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -3402,17 +3833,17 @@
 "La commande <command>pwck</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: porttime.5.xml:5(refentrytitle) porttime.5.xml:10(refname)
+#: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
 msgid "porttime"
 msgstr "porttime"
 
-#: porttime.5.xml:11(refpurpose)
+#: porttime.5.xml:40(refpurpose)
 msgid "port access time file"
 msgstr ""
 "Fichier de configuration des droits d'accès en fonction de la date et de "
 "l'heure"
 
-#: porttime.5.xml:16(para)
+#: porttime.5.xml:45(para)
 msgid ""
 "<emphasis remap=\"I\">porttime</emphasis> contains a list of tty devices, "
 "user names, and permitted login times."
@@ -3420,7 +3851,7 @@
 "<emphasis remap=\"I\">porttime</emphasis> contient une liste de tty, noms "
 "d'utilisateurs, et horaires d'accès autorisés."
 
-#: porttime.5.xml:21(para)
+#: porttime.5.xml:50(para)
 msgid ""
 "Each entry consists of three colon separated fields. The first field is a "
 "comma separated list of tty devices, or an asterisk to indicate that all tty "
@@ -3436,7 +3867,7 @@
 "indiquer que cette entrée correspond à n'importe quel utilisateur. Le "
 "troisième champ est une liste d'horaires d'accès autorisés."
 
-#: porttime.5.xml:30(para)
+#: porttime.5.xml:59(para)
 msgid ""
 "Each access time entry consists of zero or more days of the week, "
 "abbreviated <emphasis>Su</emphasis>, <emphasis>Mo</emphasis>, <emphasis>Tu</"
@@ -3457,11 +3888,11 @@
 "semaine. Par défaut, si aucun jour n'est spécifié, <emphasis>Al</emphasis> "
 "est utilisé."
 
-#: porttime.5.xml:44(title)
+#: porttime.5.xml:73(title)
 msgid "EXAMPLES"
 msgstr "EXEMPLES"
 
-#: porttime.5.xml:45(para)
+#: porttime.5.xml:74(para)
 msgid ""
 "The following entry allows access to user <emphasis remap=\"B\">jfh</"
 "emphasis> on every port during weekdays from 9am to 5pm."
@@ -3470,11 +3901,11 @@
 "\">jfh</emphasis> sur n'importe quel port pendant la semaine de 9 heures à "
 "17 heures."
 
-#: porttime.5.xml:51(para)
+#: porttime.5.xml:80(para)
 msgid "*:jfh:Wk0900-1700"
 msgstr "*:jfh:Wk0900-1700"
 
-#: porttime.5.xml:53(para)
+#: porttime.5.xml:82(para)
 msgid ""
 "The following entries allow access only to the users <emphasis>root</"
 "emphasis> and <emphasis>oper</emphasis> on <filename>/dev/console</filename> "
@@ -3489,7 +3920,7 @@
 "utilisateurs ne satisferont que la deuxième entrée, qui n'autorise aucun "
 "accès."
 
-#: porttime.5.xml:62(programlisting)
+#: porttime.5.xml:91(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3502,7 +3933,7 @@
 "      console:*:\n"
 "    "
 
-#: porttime.5.xml:67(para)
+#: porttime.5.xml:96(para)
 msgid ""
 "The following entry allows access for the user <emphasis>games</emphasis> on "
 "any port during non-working hours."
@@ -3510,19 +3941,19 @@
 "L'entrée suivante autorise l'accès à tous les ports pour l'utilisateur "
 "<emphasis>games</emphasis>, en dehors des heures de travail."
 
-#: porttime.5.xml:72(para)
+#: porttime.5.xml:101(para)
 msgid "*:games:Wk1700-0900,SaSu0000-2400"
 msgstr "*:games:Wk1700-0900,SaSu0000-2400"
 
-#: porttime.5.xml:79(filename) logoutd.8.xml:38(filename)
+#: porttime.5.xml:108(filename) logoutd.8.xml:67(filename)
 msgid "/etc/porttime"
 msgstr "/etc/porttime"
 
-#: porttime.5.xml:81(para) logoutd.8.xml:40(para)
+#: porttime.5.xml:110(para) logoutd.8.xml:69(para)
 msgid "File containing port access."
 msgstr "Fichier contenant le port d'accès."
 
-#: porttime.5.xml:89(para) login.access.5.xml:79(para)
+#: porttime.5.xml:118(para) login.access.5.xml:109(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -3530,11 +3961,11 @@
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: passwd.5.xml:11(refpurpose)
+#: passwd.5.xml:40(refpurpose)
 msgid "the password file"
 msgstr "fichier des mots de passe"
 
-#: passwd.5.xml:16(para)
+#: passwd.5.xml:45(para)
 msgid ""
 "<filename>/etc/passwd</filename> contains one line for each user account, "
 "with seven fields delimited by colons (<quote>:</quote>). These fields are:"
@@ -3543,31 +3974,31 @@
 "comptes utilisateurs. Ces informations consistent en sept champs séparés par "
 "des deux-points (« : ») :"
 
-#: passwd.5.xml:27(para)
+#: passwd.5.xml:56(para)
 msgid "optional encrypted password"
 msgstr "un mot de passe chiffré optionnel"
 
-#: passwd.5.xml:30(para)
+#: passwd.5.xml:59(para)
 msgid "numerical user ID"
 msgstr "l'identifiant numérique de l'utilisateur"
 
-#: passwd.5.xml:33(para)
+#: passwd.5.xml:62(para)
 msgid "numerical group ID"
 msgstr "l'identifiant numérique du groupe de l'utilisateur"
 
-#: passwd.5.xml:36(para)
+#: passwd.5.xml:65(para)
 msgid "user name or comment field"
 msgstr "le nom complet de l'utilisateur ou un champ de commentaires"
 
-#: passwd.5.xml:39(para)
+#: passwd.5.xml:68(para)
 msgid "user home directory"
 msgstr "le répertoire personnel de l'utilisateur"
 
-#: passwd.5.xml:42(para)
+#: passwd.5.xml:71(para)
 msgid "optional user command interpreter"
 msgstr "l'interpréteur de commandes de l'utilisateur (optionnel)"
 
-#: passwd.5.xml:46(para)
+#: passwd.5.xml:75(para)
 msgid ""
 "The encrypted password field may be blank, in which case no password is "
 "required to authenticate as the specified login name. However, some "
@@ -3598,7 +4029,7 @@
 "indiqué dans <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry>."
 
-#: passwd.5.xml:65(para)
+#: passwd.5.xml:94(para)
 msgid ""
 "The comment field is used by various system utilities, such as "
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
@@ -3608,7 +4039,7 @@
 "que <citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>."
 
-#: passwd.5.xml:71(para)
+#: passwd.5.xml:100(para)
 msgid ""
 "The home directory field provides the name of the initial working directory. "
 "The <command>login</command> program uses this information to set the value "
@@ -3619,7 +4050,7 @@
 "information pour définir la valeur de la variable d'environnement <envar>"
 "$HOME</envar>."
 
-#: passwd.5.xml:77(para)
+#: passwd.5.xml:106(para)
 msgid ""
 "The command interpreter field provides the name of the user's command "
 "language interpreter, or the name of the initial program to execute. The "
@@ -3634,56 +4065,77 @@
 "<filename>/bin/sh</filename> est utilisé par défaut."
 
 # TBC: file ?
-#: passwd.5.xml:98(para)
+#: passwd.5.xml:127(para)
 msgid "optional encrypted password file"
 msgstr "un mot de passe chiffré optionnel"
 
-#: passwd.5.xml:106(para)
+#: passwd.5.xml:135(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
+#| "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>login</"
+"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>getent</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
-"refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"citerefentry>, <citerefentry><refentrytitle>pwck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>pwconv</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>pwunconv</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>login</"
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
+"citerefentry>, <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwconv</refentrytitle><manvolnum>8</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>pwunconv</"
+"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
+"<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: passwd.1.xml:21(refpurpose)
+#: passwd.1.xml:50(refpurpose)
 msgid "change user password"
 msgstr "Modifier le mot de passe d'un utilisateur"
 
-#: passwd.1.xml:38(para)
+#: passwd.1.xml:67(para)
 #, fuzzy
 msgid ""
 "The <command>passwd</command> command changes passwords for user accounts. A "
 "normal user may only change the password for his/her own account, while the "
 "superuser may change the password for any account. <command>passwd</command> "
-"also changes account information, such as the full name of the user, the "
-"user's login shell, or his/her password expiry date and interval."
+"also changes the account or associated password validity period."
 msgstr ""
 "<command>Passwd</command> modifie les mots de passe des comptes "
 "d'utilisateurs. Un utilisateur normal ne peut changer que son propre mot de "
@@ -3693,11 +4145,11 @@
 "interpréteur de commandes de connexion (« login shell »), la date de fin de "
 "validité du mot de passe, ou sa durée de validité."
 
-#: passwd.1.xml:48(title)
+#: passwd.1.xml:76(title)
 msgid "Password Changes"
 msgstr "Modifications du mot de passe"
 
-#: passwd.1.xml:49(para)
+#: passwd.1.xml:77(para)
 #, fuzzy
 msgid ""
 "The user is first prompted for his/her old password, if one is present. This "
@@ -3711,7 +4163,7 @@
 "entrer le mot de passe correct. Le superutilisateur peut contourner cette "
 "première étape de manière à changer les mots de passe ayant été oubliés."
 
-#: passwd.1.xml:57(para)
+#: passwd.1.xml:85(para)
 msgid ""
 "After the password has been entered, password aging information is checked "
 "to see if the user is permitted to change the password at this time. If not, "
@@ -3722,7 +4174,7 @@
 "autorisé à modifier son mot de passe à cet instant. Dans le cas contraire, "
 "<command>passwd</command> refuse de changer le mot de passe, et quitte."
 
-#: passwd.1.xml:64(para)
+#: passwd.1.xml:92(para)
 msgid ""
 "The user is then prompted twice for a replacement password. The second entry "
 "is compared against the first and both are required to match in order for "
@@ -3732,7 +4184,7 @@
 "mot de passe est comparé avec le premier. Ces deux mots de passe devront "
 "être identiques pour que le mot de passe soit changé."
 
-#: passwd.1.xml:70(para)
+#: passwd.1.xml:98(para)
 msgid ""
 "Then, the password is tested for complexity. As a general guideline, "
 "passwords should consist of 6 to 8 characters including one or more "
@@ -3742,19 +4194,19 @@
 "générale, un mot de passe doit toujours être constitué de 6 à 8 caractères "
 "en en choisissant un ou plus parmi chacun des ensembles suivants :"
 
-#: passwd.1.xml:78(para)
+#: passwd.1.xml:106(para)
 msgid "lower case alphabetics"
 msgstr "caractères alphabétiques minuscules"
 
-#: passwd.1.xml:81(para)
+#: passwd.1.xml:109(para)
 msgid "digits 0 thru 9"
 msgstr "chiffres de 0 à 9"
 
-#: passwd.1.xml:84(para)
+#: passwd.1.xml:112(para)
 msgid "punctuation marks"
 msgstr "marques de ponctuation"
 
-#: passwd.1.xml:88(para)
+#: passwd.1.xml:116(para)
 msgid ""
 "Care must be taken not to include the system default erase or kill "
 "characters. <command>passwd</command> will reject any password which is not "
@@ -3764,11 +4216,11 @@
 "d'effacement. <command>Passwd</command> rejettera tout mot de passe dont la "
 "complexité ne sera pas suffisante."
 
-#: passwd.1.xml:97(title)
+#: passwd.1.xml:125(title)
 msgid "Hints for user passwords"
 msgstr "Astuces pour les mots de passe"
 
-#: passwd.1.xml:98(para)
+#: passwd.1.xml:126(para)
 msgid ""
 "The security of a password depends upon the strength of the encryption "
 "algorithm and the size of the key space. The <emphasis>UNIX</emphasis> "
@@ -3782,7 +4234,7 @@
 "l'algorithme NBS DES, elle est très sûre. La taille de l'espace de clés "
 "dépend de l'aléa du mot de passe utilisé."
 
-#: passwd.1.xml:106(para)
+#: passwd.1.xml:134(para)
 msgid ""
 "Compromises in password security normally result from careless password "
 "selection or handling. For this reason, you should not select a password "
@@ -3798,23 +4250,23 @@
 "date de naissance, ou une adresse. En effet ceux-ci pourraient être devinés "
 "pour violer la sécurité du système."
 
-#: passwd.1.xml:115(para)
+#: passwd.1.xml:143(para)
 msgid ""
 "You can find advices on how to choose a strong password on http://en."
 "wikipedia.org/wiki/Password_strength"
 msgstr ""
 
-#: passwd.1.xml:124(para)
+#: passwd.1.xml:152(para)
 msgid "The options which apply to the <command>passwd</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>passwd</command> sont :"
 
-#: passwd.1.xml:129(term) faillog.8.xml:42(term)
+#: passwd.1.xml:157(term) faillog.8.xml:71(term)
 msgid "<option>-a</option>, <option>--all</option>"
 msgstr "<option>-a</option>, <option>--all</option>"
 
 # NOTE: pas clair
-#: passwd.1.xml:133(para)
+#: passwd.1.xml:161(para)
 msgid ""
 "This option can be used only with <option>-S</option> and causes show status "
 "for all users."
@@ -3822,11 +4274,11 @@
 "Cette option ne peut être utilisée qu'avec <option>-S</option> et permet "
 "d'afficher l'état des mots de passe pour tous les utilisateurs."
 
-#: passwd.1.xml:140(term)
+#: passwd.1.xml:168(term)
 msgid "<option>-d</option>, <option>--delete</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
-#: passwd.1.xml:144(para)
+#: passwd.1.xml:172(para)
 msgid ""
 "Delete a user's password (make it empty). This is a quick way to disable a "
 "password for an account. It will set the named account passwordless."
@@ -3835,11 +4287,11 @@
 "rapide de supprimer l'authentification par mot de passe pour un compte. Il "
 "rend le compte indiqué sans mot de passe."
 
-#: passwd.1.xml:152(term)
+#: passwd.1.xml:180(term)
 msgid "<option>-e</option>, <option>--expire</option>"
 msgstr "<option>-e</option>, <option>--expire</option>"
 
-#: passwd.1.xml:156(para)
+#: passwd.1.xml:184(para)
 msgid ""
 "Immediately expire an account's password. This in effect can force a user to "
 "change his/her password at the user's next login."
@@ -3848,7 +4300,7 @@
 "d'obliger un utilisateur à changer son mot de passe lors de sa prochaine "
 "connexion."
 
-#: passwd.1.xml:169(term)
+#: passwd.1.xml:197(term)
 msgid ""
 "<option>-i</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -3857,7 +4309,7 @@
 "<replaceable>DURÉE_INACTIVITÉ</replaceable>"
 
 # NOTE: Only this user account
-#: passwd.1.xml:173(para)
+#: passwd.1.xml:201(para)
 msgid ""
 "This option is used to disable an account after the password has been "
 "expired for a number of days. After a user account has had an expired "
@@ -3870,12 +4322,12 @@
 "<replaceable>DURÉE_INACTIVITÉ</replaceable> jours, l'utilisateur ne pourra "
 "plus se connecter avec ce compte."
 
-#: passwd.1.xml:182(term)
+#: passwd.1.xml:210(term)
 msgid "<option>-k</option>, <option>--keep-tokens</option>"
 msgstr "<option>-k</option>, <option>--keep-tokens</option>"
 
 # NOTE: pas clair
-#: passwd.1.xml:186(para)
+#: passwd.1.xml:214(para)
 #, fuzzy
 msgid ""
 "Indicate password change should be performed only for expired authentication "
@@ -3886,30 +4338,42 @@
 "modifié. C'est utile quand l'utilisateur ne veut pas modifier un mot de "
 "passe qui serait toujours valable."
 
-#: passwd.1.xml:194(term)
+#: passwd.1.xml:222(term)
 msgid "<option>-l</option>, <option>--lock</option>"
 msgstr "<option>-l</option>, <option>--lock</option>"
 
-#: passwd.1.xml:198(para)
+#: passwd.1.xml:226(para)
 #, fuzzy
 msgid ""
-"Lock the named account. This option disables an account by changing the "
-"password to a value which matches no possible encrypted value, and by "
-"setting the account expiry field to 1."
+"Lock the password of the named account. This option disables a password by "
+"changing it to a value which matches no possible encrypted value (it adds a "
+"´!´ at the beginning of the password)."
 msgstr ""
 "Verrouille le compte indiqué. Cette option désactive un compte en modifiant "
 "son mot de passe pour une valeur qui ne peut pas correspondre à un mot de "
 "passe chiffré possible."
 
-#: passwd.1.xml:206(term) chage.1.xml:109(term)
+#: passwd.1.xml:232(para)
 msgid ""
+"Note that this does not disable the account. The user may still be able to "
+"login using another authentication token (e.g. an SSH key). To disable the "
+"account, administrators should use <command>usermod --expiredate 1</command> "
+"(this set the account's expire date to Jan 2, 1970)."
+msgstr ""
+
+#: passwd.1.xml:239(para)
+msgid "Users with a locked password are not allowed to change their password."
+msgstr ""
+
+#: passwd.1.xml:246(term) chage.1.xml:138(term)
+msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--mindays</option> <replaceable>JOURS_MIN</"
 "replaceable>"
 
-#: passwd.1.xml:210(para) chage.1.xml:113(para)
+#: passwd.1.xml:250(para) chage.1.xml:142(para)
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
@@ -3919,7 +4383,7 @@
 "<replaceable>MIN_DAYS</replaceable>. Une valeur de zéro pour ce champ "
 "indique que l'utilisateur peut changer son mot de passe quand il le souhaite."
 
-#: passwd.1.xml:228(term)
+#: passwd.1.xml:268(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
@@ -3927,24 +4391,34 @@
 "<option>-r</option>, <option>--repository</option> <replaceable>REPOSITORY</"
 "replaceable>"
 
-#: passwd.1.xml:232(para)
+#: passwd.1.xml:272(para)
 #, fuzzy
 msgid "change password in <replaceable>REPOSITORY</replaceable> repository"
 msgstr ""
 "Change le mot de passe de la base <replaceable>REPOSITORY</replaceable>"
 
-#: passwd.1.xml:238(term)
+#: passwd.1.xml:278(term)
 msgid "<option>-S</option>, <option>--status</option>"
 msgstr "<option>-S</option>, <option>--status</option>"
 
-#: passwd.1.xml:242(para)
+#: passwd.1.xml:282(para)
+#, fuzzy
+#| msgid ""
+#| "Display account status information. The status information consists of 7 "
+#| "fields. The first field is the user's login name. The second field "
+#| "indicates if the user account is locked (L), has no password (NP), or has "
+#| "a usable password (P). The third field gives the date of the last "
+#| "password change. The next four fields are the minimum age, maximum age, "
+#| "warning period, and inactivity period for the password. These ages are "
+#| "expressed in days."
 msgid ""
 "Display account status information. The status information consists of 7 "
 "fields. The first field is the user's login name. The second field indicates "
-"if the user account is locked (L), has no password (NP), or has a usable "
-"password (P). The third field gives the date of the last password change. "
-"The next four fields are the minimum age, maximum age, warning period, and "
-"inactivity period for the password. These ages are expressed in days."
+"if the user account has a locked password (L), has no password (NP), or has "
+"a usable password (P). The third field gives the date of the last password "
+"change. The next four fields are the minimum age, maximum age, warning "
+"period, and inactivity period for the password. These ages are expressed in "
+"days."
 msgstr ""
 "Afficher l'état d'un compte. Cet état est constitué de 7 champs. Le premier "
 "champ est le nom du compte. Le second champ indique si le compte est bloqué "
@@ -3954,23 +4428,24 @@
 "maximum de validité, la durée d'avertissement, et la durée d'inactivité "
 "autorisée pour le mot de passe. Les durées sont exprimées en jours."
 
-#: passwd.1.xml:255(term)
+#: passwd.1.xml:296(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
 msgstr "<option>-u</option>, <option>--unlock</option>"
 
 # NOTE: to "the" value
-#: passwd.1.xml:259(para)
+#: passwd.1.xml:300(para)
 #, fuzzy
 msgid ""
-"Unlock the named account. This option re-enables an account by changing the "
-"password back to its previous value (to value before using <option>-l</"
-"option> option), and by resetting the account expiry field."
+"Unlock the password of the named account. This option re-enables a password "
+"by changing the password back to its previous value (to the value before "
+"using the <option>-l</option> option), and by resetting the account expiry "
+"field."
 msgstr ""
 "Déverrouille le compte indiqué. Cette option réactive un compte en changeant "
 "un mot de passe à sa valeur précédente (la valeur présente avant "
 "l'utilisation de l'option <option>-l</option>)."
 
-#: passwd.1.xml:268(term)
+#: passwd.1.xml:310(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -3978,7 +4453,7 @@
 "<option>-w</option>, <option>--warndays</option> "
 "<replaceable>DURÉE_AVERTISSEMENT</replaceable>"
 
-#: passwd.1.xml:272(para)
+#: passwd.1.xml:314(para)
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
@@ -3991,7 +4466,7 @@
 "lesquels un utilisateur sera prévenu que son mot de passe est sur le point "
 "d'arriver en fin de validité."
 
-#: passwd.1.xml:281(term)
+#: passwd.1.xml:323(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -3999,7 +4474,7 @@
 "<option>-x</option>, <option>--maxdays</option> <replaceable>JOURS_MAX</"
 "replaceable>"
 
-#: passwd.1.xml:285(para)
+#: passwd.1.xml:327(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
@@ -4008,7 +4483,7 @@
 "valable. Après <replaceable>JOURS_MAX</replaceable>, le mot de passe devra "
 "être modifié."
 
-#: passwd.1.xml:297(para)
+#: passwd.1.xml:339(para)
 msgid ""
 "Not all options may be supported. Password complexity checking may vary from "
 "site to site. The user is urged to select a password as complex as he or she "
@@ -4022,68 +4497,68 @@
 "Il se peut que les utilisateurs ne puisse pas changer leur mot de passe sur "
 "un système si NIS est activé et qu'ils ne sont pas connectés au serveur NIS."
 
-#: passwd.1.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: gpasswd.1.xml:2(term) chpasswd.8.xml:2(term) chgpasswd.8.xml:2(term)
+#: passwd.1.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: gpasswd.1.xml:30(term) chpasswd.8.xml:30(term) chgpasswd.8.xml:30(term)
 msgid "<option>ENCRYPT_METHOD</option> (string)"
 msgstr ""
 
-#: passwd.1.xml:4(para) newusers.8.xml:4(para) login.defs.5.xml:4(para)
-#: gpasswd.1.xml:4(para) chpasswd.8.xml:4(para) chgpasswd.8.xml:4(para)
+#: passwd.1.xml:32(para) newusers.8.xml:32(para) login.defs.5.xml:32(para)
+#: gpasswd.1.xml:32(para) chpasswd.8.xml:32(para) chgpasswd.8.xml:32(para)
 msgid ""
 "This defines the system default encryption algorithm for encrypting "
 "passwords (if no algorithm are specified on the command line)."
 msgstr ""
 
-#: passwd.1.xml:12(para) newusers.8.xml:12(para) login.defs.5.xml:12(para)
-#: gpasswd.1.xml:12(para) chpasswd.8.xml:12(para) chgpasswd.8.xml:12(para)
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
 msgid "<replaceable>DES</replaceable> (default)"
 msgstr ""
 
-#: passwd.1.xml:15(replaceable) newusers.8.xml:15(replaceable)
-#: login.defs.5.xml:15(replaceable) gpasswd.1.xml:15(replaceable)
-#: chpasswd.8.xml:15(replaceable) chgpasswd.8.xml:15(replaceable)
+#: passwd.1.xml:43(replaceable) newusers.8.xml:43(replaceable)
+#: login.defs.5.xml:43(replaceable) gpasswd.1.xml:43(replaceable)
+#: chpasswd.8.xml:43(replaceable) chgpasswd.8.xml:43(replaceable)
 msgid "MD5"
 msgstr ""
 
-#: passwd.1.xml:18(replaceable) newusers.8.xml:18(replaceable)
-#: login.defs.5.xml:18(replaceable) gpasswd.1.xml:18(replaceable)
-#: chpasswd.8.xml:18(replaceable) chgpasswd.8.xml:18(replaceable)
+#: passwd.1.xml:46(replaceable) newusers.8.xml:46(replaceable)
+#: login.defs.5.xml:46(replaceable) gpasswd.1.xml:46(replaceable)
+#: chpasswd.8.xml:46(replaceable) chgpasswd.8.xml:46(replaceable)
 msgid "SHA256"
 msgstr ""
 
-#: passwd.1.xml:21(replaceable) newusers.8.xml:21(replaceable)
-#: login.defs.5.xml:21(replaceable) gpasswd.1.xml:21(replaceable)
-#: chpasswd.8.xml:21(replaceable) chgpasswd.8.xml:21(replaceable)
+#: passwd.1.xml:49(replaceable) newusers.8.xml:49(replaceable)
+#: login.defs.5.xml:49(replaceable) gpasswd.1.xml:49(replaceable)
+#: chpasswd.8.xml:49(replaceable) chgpasswd.8.xml:49(replaceable)
 msgid "SHA512"
 msgstr ""
 
-#: passwd.1.xml:8(para) newusers.8.xml:8(para) login.defs.5.xml:8(para)
-#: gpasswd.1.xml:8(para) chpasswd.8.xml:8(para) chgpasswd.8.xml:8(para)
+#: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
+#: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
 msgid "It can take one of these values: <placeholder-1/>"
 msgstr ""
 
-#: passwd.1.xml:25(para) newusers.8.xml:25(para) login.defs.5.xml:25(para)
-#: gpasswd.1.xml:25(para) chpasswd.8.xml:25(para) chgpasswd.8.xml:25(para)
+#: passwd.1.xml:53(para) newusers.8.xml:53(para) login.defs.5.xml:53(para)
+#: gpasswd.1.xml:53(para) chpasswd.8.xml:53(para) chgpasswd.8.xml:53(para)
 msgid ""
 "Note: this parameter overrides the <option>MD5_CRYPT_ENAB</option> variable."
 msgstr ""
 
-#: passwd.1.xml:29(para) passwd.1.xml:23(para) newusers.8.xml:29(para)
-#: newusers.8.xml:23(para) login.defs.5.xml:29(para) login.defs.5.xml:23(para)
-#: gpasswd.1.xml:29(para) gpasswd.1.xml:23(para) chpasswd.8.xml:29(para)
-#: chpasswd.8.xml:23(para) chgpasswd.8.xml:29(para) chgpasswd.8.xml:23(para)
+#: passwd.1.xml:57(para) passwd.1.xml:53(para) newusers.8.xml:57(para)
+#: newusers.8.xml:53(para) login.defs.5.xml:57(para) login.defs.5.xml:53(para)
+#: gpasswd.1.xml:57(para) gpasswd.1.xml:53(para) chpasswd.8.xml:57(para)
+#: chpasswd.8.xml:53(para) chgpasswd.8.xml:57(para) chgpasswd.8.xml:53(para)
 msgid ""
 "Note: if you use PAM, it is recommended to set this variable consistently "
 "with the PAM modules configuration."
 msgstr ""
 
-#: passwd.1.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: gpasswd.1.xml:2(term) chpasswd.8.xml:2(term) chgpasswd.8.xml:2(term)
+#: passwd.1.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: gpasswd.1.xml:32(term) chpasswd.8.xml:32(term) chgpasswd.8.xml:32(term)
 msgid "<option>MD5_CRYPT_ENAB</option> (boolean)"
 msgstr ""
 
-#: passwd.1.xml:4(para) newusers.8.xml:4(para) login.defs.5.xml:4(para)
-#: gpasswd.1.xml:4(para) chpasswd.8.xml:4(para) chgpasswd.8.xml:4(para)
+#: passwd.1.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
+#: gpasswd.1.xml:34(para) chpasswd.8.xml:34(para) chgpasswd.8.xml:34(para)
 msgid ""
 "Indicate if passwords must be encrypted using the MD5-based algorithm. If "
 "set to <replaceable>yes</replaceable>, new passwords will be encrypted using "
@@ -4094,57 +4569,57 @@
 "<replaceable>no</replaceable>."
 msgstr ""
 
-#: passwd.1.xml:14(para) newusers.8.xml:14(para) login.defs.5.xml:14(para)
-#: gpasswd.1.xml:14(para) chpasswd.8.xml:14(para) chgpasswd.8.xml:14(para)
+#: passwd.1.xml:44(para) newusers.8.xml:44(para) login.defs.5.xml:44(para)
+#: gpasswd.1.xml:44(para) chpasswd.8.xml:44(para) chgpasswd.8.xml:44(para)
 msgid ""
 "This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
 "or by any command line option used to configure the encryption algorithm."
 msgstr ""
 
-#: passwd.1.xml:19(para) newusers.8.xml:19(para) login.defs.5.xml:19(para)
-#: gpasswd.1.xml:19(para) chpasswd.8.xml:19(para) chgpasswd.8.xml:19(para)
+#: passwd.1.xml:49(para) newusers.8.xml:49(para) login.defs.5.xml:49(para)
+#: gpasswd.1.xml:49(para) chpasswd.8.xml:49(para) chgpasswd.8.xml:49(para)
 msgid ""
 "This variable is deprecated. You should use <option>ENCRYPT_METHOD</option>."
 msgstr ""
 
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>OBSCURE_CHECKS_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (booléen)"
 
-#: passwd.1.xml:4(para) login.defs.5.xml:4(para)
+#: passwd.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Enable additional checks upon password changes."
 msgstr ""
 
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_ALWAYS_WARN</option> (boolean)"
 msgstr "CHFN_AUTH (booléen)"
 
-#: passwd.1.xml:4(para) login.defs.5.xml:4(para)
+#: passwd.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Warn about weak passwords (but still allow them) if you are root."
 msgstr ""
 
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_CHANGE_TRIES</option> (number)"
 msgstr "PASS_WARN_AGE (nombre)"
 
-#: passwd.1.xml:4(para) login.defs.5.xml:4(para)
+#: passwd.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Maximum number of attempts to change password if rejected (too easy)."
 msgstr ""
 
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_MAX_LEN</option> (number)"
 msgstr "PASS_MAX_DAYS (nombre)"
 
-#: passwd.1.xml:3(term) login.defs.5.xml:3(term)
+#: passwd.1.xml:33(term) login.defs.5.xml:33(term)
 #, fuzzy
 msgid "<option>PASS_MIN_LEN</option> (number)"
 msgstr "PASS_MIN_DAYS (nombre)"
 
-#: passwd.1.xml:5(para) login.defs.5.xml:5(para)
+#: passwd.1.xml:35(para) login.defs.5.xml:35(para)
 msgid ""
 "Number of significant characters in the password for crypt(). "
 "<option>PASS_MAX_LEN</option> is 8 by default. Don't change unless your crypt"
@@ -4152,18 +4627,18 @@
 "<replaceable>yes</replaceable>."
 msgstr ""
 
-#: passwd.1.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: gpasswd.1.xml:2(term) chpasswd.8.xml:2(term) chgpasswd.8.xml:2(term)
+#: passwd.1.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: gpasswd.1.xml:30(term) chpasswd.8.xml:30(term) chgpasswd.8.xml:30(term)
 msgid "<option>SHA_CRYPT_MIN_ROUNDS</option> (number)"
 msgstr ""
 
-#: passwd.1.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
-#: gpasswd.1.xml:3(term) chpasswd.8.xml:3(term) chgpasswd.8.xml:3(term)
+#: passwd.1.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
+#: gpasswd.1.xml:31(term) chpasswd.8.xml:31(term) chgpasswd.8.xml:31(term)
 msgid "<option>SHA_CRYPT_MAX_ROUNDS</option> (number)"
 msgstr ""
 
-#: passwd.1.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
-#: gpasswd.1.xml:5(para) chpasswd.8.xml:5(para) chgpasswd.8.xml:5(para)
+#: passwd.1.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
+#: gpasswd.1.xml:33(para) chpasswd.8.xml:33(para) chgpasswd.8.xml:33(para)
 msgid ""
 "When <option>ENCRYPT_METHOD</option> is set to <replaceable>SHA256</"
 "replaceable> or <replaceable>SHA512</replaceable>, this defines the number "
@@ -4171,62 +4646,62 @@
 "of rounds is not specified on the command line)."
 msgstr ""
 
-#: passwd.1.xml:12(para) newusers.8.xml:12(para) login.defs.5.xml:12(para)
-#: gpasswd.1.xml:12(para) chpasswd.8.xml:12(para) chgpasswd.8.xml:12(para)
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
 msgid ""
 "With a lot of rounds, it is more difficult to brute forcing the password. "
 "But note also that more CPU resources will be needed to authenticate users."
 msgstr ""
 
-#: passwd.1.xml:17(para) newusers.8.xml:17(para) login.defs.5.xml:17(para)
-#: gpasswd.1.xml:17(para) chpasswd.8.xml:17(para) chgpasswd.8.xml:17(para)
+#: passwd.1.xml:45(para) newusers.8.xml:45(para) login.defs.5.xml:45(para)
+#: gpasswd.1.xml:45(para) chpasswd.8.xml:45(para) chgpasswd.8.xml:45(para)
 msgid ""
 "If not specified, the libc will choose the default number of rounds (5000)."
 msgstr ""
 
-#: passwd.1.xml:21(para) newusers.8.xml:21(para) login.defs.5.xml:21(para)
-#: gpasswd.1.xml:21(para) chpasswd.8.xml:21(para) chgpasswd.8.xml:21(para)
+#: passwd.1.xml:49(para) newusers.8.xml:49(para) login.defs.5.xml:49(para)
+#: gpasswd.1.xml:49(para) chpasswd.8.xml:49(para) chgpasswd.8.xml:49(para)
 msgid "The values must be inside the 1000-999999999 range."
 msgstr ""
 
-#: passwd.1.xml:24(para) newusers.8.xml:24(para) login.defs.5.xml:24(para)
-#: gpasswd.1.xml:24(para) chpasswd.8.xml:24(para) chgpasswd.8.xml:24(para)
+#: passwd.1.xml:52(para) newusers.8.xml:52(para) login.defs.5.xml:52(para)
+#: gpasswd.1.xml:52(para) chpasswd.8.xml:52(para) chgpasswd.8.xml:52(para)
 msgid ""
 "If only one of the <option>SHA_CRYPT_MIN_ROUNDS</option> or "
 "<option>SHA_CRYPT_MAX_ROUNDS</option> values is set, then this value will be "
 "used."
 msgstr ""
 
-#: passwd.1.xml:29(para) newusers.8.xml:29(para) login.defs.5.xml:29(para)
-#: gpasswd.1.xml:29(para) chpasswd.8.xml:29(para) chgpasswd.8.xml:29(para)
+#: passwd.1.xml:57(para) newusers.8.xml:57(para) login.defs.5.xml:57(para)
+#: gpasswd.1.xml:57(para) chpasswd.8.xml:57(para) chgpasswd.8.xml:57(para)
 msgid ""
 "If <option>SHA_CRYPT_MIN_ROUNDS</option> &gt; <option>SHA_CRYPT_MAX_ROUNDS</"
 "option>, the highest value will be used."
 msgstr ""
 
-#: passwd.1.xml:356(para) chage.1.xml:212(para)
+#: passwd.1.xml:398(para) chage.1.xml:241(para)
 msgid "permission denied"
 msgstr "permission refusée"
 
-#: passwd.1.xml:362(para)
+#: passwd.1.xml:404(para)
 msgid "invalid combination of options"
 msgstr "combinaison d'options non valable"
 
-#: passwd.1.xml:368(para)
+#: passwd.1.xml:410(para)
 msgid "unexpected failure, nothing done"
 msgstr "échec inattendu, rien n'a été fait"
 
-#: passwd.1.xml:374(para)
+#: passwd.1.xml:416(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr "échec inattendu, le fichier <filename>passwd</filename> est manquant"
 
-#: passwd.1.xml:380(para)
+#: passwd.1.xml:422(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr ""
 "fichier <filename>passwd</filename> en cours d'utilisation, veuillez "
 "réessayer plus tard"
 
-#: passwd.1.xml:344(para)
+#: passwd.1.xml:386(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -4234,30 +4709,40 @@
 "La commande <command>passwd</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: passwd.1.xml:395(para)
+#: passwd.1.xml:437(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
+"citerefentry>. <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
+"citerefentry>, <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: nologin.8.xml:5(refentrytitle) nologin.8.xml:10(refname)
-#: nologin.8.xml:16(command)
+#: nologin.8.xml:34(refentrytitle) nologin.8.xml:39(refname)
+#: nologin.8.xml:45(command)
 msgid "nologin"
 msgstr "nologin"
 
-#: nologin.8.xml:11(refpurpose)
+#: nologin.8.xml:40(refpurpose)
 msgid "politely refuse a login"
 msgstr "refuser poliment une connexion"
 
-#: nologin.8.xml:22(para)
+#: nologin.8.xml:51(para)
 #, fuzzy
 msgid ""
 "The <command>nologin</command> command displays a message that an account is "
@@ -4269,7 +4754,7 @@
 "remplacement d'un champ de remplacement de l'interpréteur de commandes pour "
 "les comptes qui ont été désactivés."
 
-#: nologin.8.xml:27(para)
+#: nologin.8.xml:56(para)
 msgid ""
 "To disable all logins, investigate <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
@@ -4278,7 +4763,7 @@
 "<citerefentry><refentrytitle>nologin</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>."
 
-#: nologin.8.xml:36(para)
+#: nologin.8.xml:65(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
@@ -4288,36 +4773,40 @@
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: nologin.8.xml:47(title)
-msgid "HYSTORY"
+#: nologin.8.xml:76(title)
+#, fuzzy
+#| msgid "HYSTORY"
+msgid "HISTORY"
 msgstr "HISTORIQUE"
 
-#: nologin.8.xml:48(para)
-msgid "The <command>nologin</command> command appeared in BSD 4.4."
+#: nologin.8.xml:77(para)
+#, fuzzy
+#| msgid "The <command>nologin</command> command appeared in BSD 4.4."
+msgid "The <command>nologin</command> command appearred in BSD 4.4."
 msgstr "La commande <command>nologin</command> est apparue avec BSD 4.4."
 
-#: newusers.8.xml:21(refentrytitle) newusers.8.xml:26(refname)
-#: newusers.8.xml:32(command) login.defs.5.xml:321(term)
+#: newusers.8.xml:50(refentrytitle) newusers.8.xml:55(refname)
+#: newusers.8.xml:61(command) login.defs.5.xml:353(term)
 msgid "newusers"
 msgstr "newusers"
 
-#: newusers.8.xml:27(refpurpose)
+#: newusers.8.xml:56(refpurpose)
 msgid "update and create new users in batch"
 msgstr "Mettre à jour, ou créer de nouveaux utilisateurs par lots"
 
-#: newusers.8.xml:34(replaceable)
+#: newusers.8.xml:63(replaceable)
 msgid "new_users"
 msgstr "nouveaux_utilisateurs"
 
-#: newusers.8.xml:41(para)
+#: newusers.8.xml:70(para)
 #, fuzzy
 msgid ""
 "The <command>newusers</command> command reads a file of user name and clear-"
 "text password pairs and uses this information to update a group of existing "
 "users or to create new users. Each line is in the same format as the "
 "standard password file (see <citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the following "
-"exceptions:"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the exceptions "
+"explained below:"
 msgstr ""
 "<command>Newusers</command> lit un fichier contenant des paires de nom "
 "d'utilisateur et de mot de passe et utilise ces informations pour mettre à "
@@ -4326,11 +4815,32 @@
 "passe (voir <citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>) avec les exceptions suivantes :"
 
-#: newusers.8.xml:53(emphasis)
+#: newusers.8.xml:78(para)
+msgid "pw_name:pw_passwd:pw_uid:pw_gid:pw_gecos:pw_dir:pw_shell"
+msgstr ""
+
+#: newusers.8.xml:83(emphasis)
+#, fuzzy
+#| msgid "group_name"
+msgid "pw_name"
+msgstr "nom_groupe"
+
+#: newusers.8.xml:86(para)
+msgid "This is the name of the user."
+msgstr ""
+
+#: newusers.8.xml:89(para)
+msgid ""
+"It can be the name of a new user or the name of an existing user (or an user "
+"created before by <command>newusers</command>). In case of an existing user, "
+"the user's information will be changed, otherwise a new user will be created."
+msgstr ""
+
+#: newusers.8.xml:100(emphasis)
 msgid "pw_passwd"
 msgstr "pw_passwd"
 
-#: newusers.8.xml:56(para)
+#: newusers.8.xml:103(para)
 msgid ""
 "This field will be encrypted and used as the new value of the encrypted "
 "password."
@@ -4338,42 +4848,122 @@
 "Ce champ sera chiffré et utilisé comme la nouvelle valeur du mot de passe "
 "chiffré."
 
-#: newusers.8.xml:64(emphasis)
+#: newusers.8.xml:111(emphasis)
+#, fuzzy
+#| msgid "pw_gid"
+msgid "pw_uid"
+msgstr "pw_gid"
+
+#: newusers.8.xml:114(para)
+msgid "This field is used to define the UID of the user."
+msgstr ""
+
+#: newusers.8.xml:117(para)
+msgid ""
+"If the field is empty, an new (unused) UID will be defined automatically by "
+"<command>newusers</command>."
+msgstr ""
+
+#: newusers.8.xml:121(para)
+msgid "If this field contains a number, this number will be used as the UID."
+msgstr ""
+
+#: newusers.8.xml:125(para)
+msgid ""
+"If this field contains the name of an existing user (or the name of an user "
+"created before by <command>newusers</command>), the UID of the specified "
+"user will be used."
+msgstr ""
+
+#: newusers.8.xml:135(emphasis)
 msgid "pw_gid"
 msgstr "pw_gid"
 
-#: newusers.8.xml:67(para)
+#: newusers.8.xml:138(para)
+msgid "This field is used to define the primary group ID for the user."
+msgstr ""
+
+#: newusers.8.xml:141(para)
 msgid ""
-"This field must contain the name (or number) of a group. The user will be "
-"added as a member to this group. When a non-existent group name or number is "
-"specified, a new group will be created. In the case of a non-existent group "
-"number, both the name and the number of the new group will be this number."
+"If this field contains the name of an existing group (or a group created "
+"before by <command>newusers</command>), the GID of this group will be used "
+"as the primary group ID for the user."
 msgstr ""
 
-#: newusers.8.xml:78(emphasis)
+#: newusers.8.xml:147(para)
+msgid ""
+"If this field is a number, this number will be used as the primary group ID "
+"of the user. If no groups exist with this GID, a new group will be created "
+"with this GID, and the name of the user."
+msgstr ""
+
+#: newusers.8.xml:153(para)
+msgid ""
+"If this field is empty, a new group will be created with the name of the "
+"user and a GID will be automatically defined by <command>newusers</command> "
+"to be used as the primary group ID for the user and as the GID for the new "
+"group."
+msgstr ""
+
+#: newusers.8.xml:159(para)
+msgid ""
+"If this field contains the name of a group which does not exist (and was not "
+"created earlier wbefore by <command>newusers</command>), a new group will be "
+"created with the specified name and a GID will be automatically defined by "
+"<command>newusers</command> to be used as the primary group ID for the user "
+"and Gs the ID for the new group."
+msgstr ""
+
+#: newusers.8.xml:171(emphasis)
+msgid "pw_gecos"
+msgstr ""
+
+#: newusers.8.xml:174(para)
+msgid "This field is copied in the GECOS field of the user."
+msgstr ""
+
+#: newusers.8.xml:181(emphasis)
 msgid "pw_dir"
 msgstr "pw_dir"
 
-#: newusers.8.xml:81(para)
-#, fuzzy
+#: newusers.8.xml:184(para)
+msgid "This field is used to define the home directory of the user."
+msgstr ""
+
+#: newusers.8.xml:187(para)
 msgid ""
-"This field will be checked for existence as a directory, and a new directory "
-"with this name will be created if it does not already exist. The ownership "
-"of the directory will be set to be that of the user being created or updated."
+"If this field does not specify an existing directory, the specified "
+"directory is created, with ownership set to the user being created or "
+"updated and its primary group."
 msgstr ""
-"L'existence du répertoire indiqué dans ce champ est vérifiée, et dans le cas "
-"contraire, le répertoire est créé. Le propriétaire du répertoire sera "
-"l'utilisateur dont le compte est créé ou mis à jour."
 
-#: newusers.8.xml:91(para)
+#: newusers.8.xml:196(emphasis)
+msgid "pw_shell"
+msgstr ""
+
+#: newusers.8.xml:199(para)
 msgid ""
+"This field defines the shell of the user. No checks are performed on this "
+"field."
+msgstr ""
+
+#: newusers.8.xml:207(para)
+msgid ""
+"<command>newusers</command> first tries to create or change all the "
+"specified users, and then write these changes to the user or group "
+"databases. If an error occurs (except in the final writes to the databases), "
+"no changes are committed to the databases."
+msgstr ""
+
+#: newusers.8.xml:214(para)
+msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are updated at a single time."
 msgstr ""
 "Cette commande a été conçue pour les gros systèmes pour lesquels un grand "
 "nombre de comptes sont mis à jour à un même instant."
 
-#: newusers.8.xml:99(para)
+#: newusers.8.xml:222(para)
 #, fuzzy
 #| msgid ""
 #| "The options which apply to the <command>usermod</command> command are:"
@@ -4381,66 +4971,76 @@
 msgstr ""
 "Les options disponibles pour la commande <command>usermod</command> sont :"
 
-#: newusers.8.xml:103(term) chpasswd.8.xml:66(term) chgpasswd.8.xml:66(term)
+#: newusers.8.xml:226(term) chpasswd.8.xml:95(term) chgpasswd.8.xml:95(term)
 #, fuzzy
 msgid "<option>-c</option>, <option>--crypt-method</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: newusers.8.xml:105(para) chpasswd.8.xml:68(para) chgpasswd.8.xml:68(para)
+#: newusers.8.xml:228(para) chpasswd.8.xml:97(para) chgpasswd.8.xml:97(para)
 msgid "Use the specified method to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:106(para) chpasswd.8.xml:69(para) chgpasswd.8.xml:69(para)
+#: newusers.8.xml:229(para) chpasswd.8.xml:101(para) chgpasswd.8.xml:101(para)
 msgid ""
 "The available methods are DES, MD5, NONE, and SHA256 or SHA512 if your libc "
 "support these methods."
 msgstr ""
 
-#: newusers.8.xml:132(term) chpasswd.8.xml:97(term) chgpasswd.8.xml:97(term)
+#: newusers.8.xml:243(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: newusers.8.xml:255(term) chpasswd.8.xml:129(term) chgpasswd.8.xml:129(term)
 #, fuzzy
 msgid "<option>-s</option>, <option>--sha-rounds</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: newusers.8.xml:134(para) chpasswd.8.xml:99(para) chgpasswd.8.xml:99(para)
+#: newusers.8.xml:257(para) chpasswd.8.xml:131(para) chgpasswd.8.xml:131(para)
 msgid "Use the specified number of rounds to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:137(para) chpasswd.8.xml:102(para) chgpasswd.8.xml:102(para)
+#: newusers.8.xml:260(para) chpasswd.8.xml:134(para) chgpasswd.8.xml:134(para)
 msgid ""
 "The value 0 means that the system will choose the default number of rounds "
 "for the crypt method (5000)."
 msgstr ""
 
-#: newusers.8.xml:141(para) chpasswd.8.xml:106(para) chgpasswd.8.xml:106(para)
+#: newusers.8.xml:264(para) chpasswd.8.xml:138(para) chgpasswd.8.xml:138(para)
 msgid ""
 "A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
 msgstr ""
 
-#: newusers.8.xml:145(para) chpasswd.8.xml:110(para) chgpasswd.8.xml:110(para)
+#: newusers.8.xml:268(para) chpasswd.8.xml:142(para) chgpasswd.8.xml:142(para)
 msgid "You can only use this option with the SHA256 or SHA512 crypt method."
 msgstr ""
 
-#: newusers.8.xml:149(para) chpasswd.8.xml:114(para) chgpasswd.8.xml:114(para)
+#: newusers.8.xml:272(para) chpasswd.8.xml:146(para) chgpasswd.8.xml:146(para)
 msgid ""
 "By default, the number of rounds is defined by the SHA_CRYPT_MIN_ROUNDS and "
 "SHA_CRYPT_MAX_ROUNDS variables in <filename>/etc/login.defs</filename>."
 msgstr ""
 
-#: newusers.8.xml:161(para)
+#: newusers.8.xml:284(para)
 msgid ""
 "The input file must be protected since it contains unencrypted passwords."
 msgstr ""
 "Le fichier d'entrée doit être correctement protégé puisqu'il contient des "
 "mots de passe en clair."
 
-#: newusers.8.xml:165(para) chpasswd.8.xml:130(para)
+#: newusers.8.xml:288(para) chpasswd.8.xml:162(para)
 msgid ""
 "PAM is not used to update the passwords. Only <filename>/etc/passwd</"
 "filename> and <filename>/etc/shadow</filename> are updated, and the various "
 "checks or options provided by PAM modules are not used."
 msgstr ""
 
-#: newusers.8.xml:234(para)
+#: newusers.8.xml:357(para)
 msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -4454,22 +5054,22 @@
 "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: newgrp.1.xml:9(refentrytitle) newgrp.1.xml:14(refname)
-#: newgrp.1.xml:20(command) login.defs.5.xml:313(term)
+#: newgrp.1.xml:38(refentrytitle) newgrp.1.xml:43(refname)
+#: newgrp.1.xml:49(command)
 msgid "newgrp"
 msgstr "newgrp"
 
-#: newgrp.1.xml:15(refpurpose)
+#: newgrp.1.xml:44(refpurpose)
 msgid "log in to a new group"
 msgstr "se connecter avec un nouveau groupe"
 
-#: newgrp.1.xml:21(replaceable) grpck.8.xml:22(replaceable)
-#: grpck.8.xml:31(replaceable) groupdel.8.xml:22(replaceable)
-#: groupadd.8.xml:30(replaceable) gpasswd.1.xml:34(replaceable)
+#: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
+#: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
+#: groupadd.8.xml:56(replaceable) gpasswd.1.xml:63(replaceable)
 msgid "group"
 msgstr "groupe"
 
-#: newgrp.1.xml:27(para)
+#: newgrp.1.xml:56(para)
 #, fuzzy
 msgid ""
 "The <command>newgrp</command> command is used to change the current group ID "
@@ -4485,7 +5085,7 @@
 "compris le répertoire de travail actuel est conservé."
 
 # NOTE:
-#: newgrp.1.xml:35(para)
+#: newgrp.1.xml:64(para)
 msgid ""
 "<command>newgrp</command> changes the current real group ID to the named "
 "group, or to the default group listed in <filename>/etc/passwd</filename> if "
@@ -4511,7 +5111,7 @@
 "si le mot de passe du groupe est vide et que l'utilisateur ne fait pas "
 "partie de ses membres."
 
-#: newgrp.1.xml:49(para)
+#: newgrp.1.xml:78(para)
 msgid ""
 "If there is an entry for this group in <filename>/etc/gshadow</filename>, "
 "then the list of members and the password of this group will be taken from "
@@ -4523,7 +5123,7 @@
 "ce fichier, sinon, l'entrée du fichier <filename>/etc/group</filename> est "
 "utilisée."
 
-#: newgrp.1.xml:101(para)
+#: newgrp.1.xml:130(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -4548,16 +5148,16 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: logoutd.8.xml:5(refentrytitle) logoutd.8.xml:10(refname)
-#: logoutd.8.xml:16(command)
+#: logoutd.8.xml:34(refentrytitle) logoutd.8.xml:39(refname)
+#: logoutd.8.xml:45(command)
 msgid "logoutd"
 msgstr "logoutd"
 
-#: logoutd.8.xml:11(refpurpose)
+#: logoutd.8.xml:40(refpurpose)
 msgid "Enforce login time restrictions"
 msgstr "Imposer les restrictions de connexion dans le temps"
 
-#: logoutd.8.xml:22(para)
+#: logoutd.8.xml:51(para)
 msgid ""
 "<command>logoutd</command> enforces the login time and port restrictions "
 "specified in <filename>/etc/porttime</filename>. <command>logoutd</command> "
@@ -4576,23 +5176,23 @@
 "session en violation avec les restrictions de <filename>/etc/porttime</"
 "filename> est terminée."
 
-#: logoutd.8.xml:44(filename) login.1.xml:283(filename)
+#: logoutd.8.xml:73(filename) login.1.xml:319(filename)
 msgid "/var/run/utmp"
 msgstr "/var/run/utmp"
 
-#: logoutd.8.xml:46(para) login.1.xml:285(para)
+#: logoutd.8.xml:75(para) login.1.xml:321(para)
 msgid "List of current login sessions."
 msgstr "Liste des sessions de connexion en cours."
 
-#: login.defs.5.xml:66(refentrytitle) login.defs.5.xml:71(refname)
+#: login.defs.5.xml:97(refentrytitle) login.defs.5.xml:102(refname)
 msgid "login.defs"
 msgstr "login.defs"
 
-#: login.defs.5.xml:72(refpurpose)
+#: login.defs.5.xml:103(refpurpose)
 msgid "shadow password suite configuration"
 msgstr "configuration de la suite des mots de passe cachés « shadow password »"
 
-#: login.defs.5.xml:77(para)
+#: login.defs.5.xml:108(para)
 msgid ""
 "The <filename>/etc/login.defs</filename> file defines the site-specific "
 "configuration for the shadow password suite. This file is required. Absence "
@@ -4604,7 +5204,7 @@
 "est indispensable. Son absence n'empêchera pas le système de fonctionner, "
 "mais aura probablement des conséquences indésirables."
 
-#: login.defs.5.xml:84(para)
+#: login.defs.5.xml:115(para)
 msgid ""
 "This file is a readable text file, each line of the file describing one "
 "configuration parameter. The lines consist of a configuration name and "
@@ -4618,7 +5218,7 @@
 "commentaires commencent par un caractère « # », qui doit être le premier "
 "caractère non blanc de la ligne."
 
-#: login.defs.5.xml:92(para)
+#: login.defs.5.xml:123(para)
 #, fuzzy
 msgid ""
 "Parameter values may be of four types: strings, booleans, numbers, and long "
@@ -4640,16 +5240,16 @@
 "hexadécimal (en précédant la valeur de « 0x »). La valeur maximale des "
 "paramètres numériques normaux ou longs dépend de la machine."
 
-#: login.defs.5.xml:107(para)
+#: login.defs.5.xml:138(para)
 msgid "The following configuration items are provided:"
 msgstr "Les paramètres de configuration suivants sont fournis :"
 
-#: login.defs.5.xml:2(term) chfn.1.xml:2(term)
+#: login.defs.5.xml:32(term) chfn.1.xml:32(term)
 #, fuzzy
 msgid "<option>CHFN_AUTH</option> (boolean)"
 msgstr "CHFN_AUTH (booléen)"
 
-#: login.defs.5.xml:4(para) chfn.1.xml:4(para)
+#: login.defs.5.xml:34(para) chfn.1.xml:34(para)
 #, fuzzy
 msgid ""
 "If <replaceable>yes</replaceable>, the <command>chfn</command> program will "
@@ -4661,12 +5261,12 @@
 "authentification avant de procéder à tout changement, à moins qu'ils ne "
 "soient exécutés par le superutilisateur."
 
-#: login.defs.5.xml:2(term) chfn.1.xml:2(term)
+#: login.defs.5.xml:32(term) chfn.1.xml:32(term)
 #, fuzzy
 msgid "<option>CHFN_RESTRICT</option> (string)"
 msgstr "CHFN_RESTRICT (chaîne)"
 
-#: login.defs.5.xml:4(para) chfn.1.xml:4(para)
+#: login.defs.5.xml:34(para) chfn.1.xml:34(para)
 #, fuzzy
 msgid ""
 "This parameter specifies which values in the <emphasis remap=\"I\">gecos</"
@@ -4695,12 +5295,12 @@
 "il sera préférable de ne pas installer <command>chfn</command> avec "
 "l'indicateur SUID positionné."
 
-#: login.defs.5.xml:2(term) chsh.1.xml:2(term)
+#: login.defs.5.xml:32(term) chsh.1.xml:32(term)
 #, fuzzy
 msgid "<option>CHSH_AUTH</option> (boolean)"
 msgstr "CHFN_AUTH (booléen)"
 
-#: login.defs.5.xml:4(para) chsh.1.xml:4(para)
+#: login.defs.5.xml:34(para) chsh.1.xml:34(para)
 #, fuzzy
 msgid ""
 "If <replaceable>yes</replaceable>, the <command>chsh</command> program will "
@@ -4712,12 +5312,12 @@
 "authentification avant de procéder à tout changement, à moins qu'ils ne "
 "soient exécutés par le superutilisateur."
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ERASECHAR</option> (number)"
 msgstr "UMASK (nombre)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 #, fuzzy
 msgid ""
 "Terminal ERASE character (<replaceable>010</replaceable> = backspace, "
@@ -4726,61 +5326,61 @@
 "Le nom du groupe sera modifié de <emphasis remap=\"I\">GROUPE</emphasis> "
 "vers <emphasis remap=\"I\">NOUVEAU_NOM_GROUPE</emphasis>."
 
-#: login.defs.5.xml:8(para) login.defs.5.xml:7(para) login.1.xml:8(para)
-#: login.1.xml:7(para)
+#: login.defs.5.xml:38(para) login.defs.5.xml:37(para) login.1.xml:38(para)
+#: login.1.xml:37(para)
 msgid ""
 "The value can be prefixed \"0\" for an octal value, or \"0x\" for an "
 "hexadecimal value."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FAIL_DELAY</option> (number)"
 msgstr "PASS_MIN_DAYS (nombre)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Delay in seconds before being allowed another attempt after a login failure."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FAILLOG_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (booléen)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Enable logging and display of <filename>/var/log/faillog</filename> login "
 "failure info."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FAKE_SHELL</option> (string)"
 msgstr "MAIL_DIR (chaîne)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, <command>login</command> will execute this shell instead of the "
 "users' shell specified in <filename>/etc/passwd</filename>."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FTMP_FILE</option> (string)"
 msgstr "MAIL_DIR (chaîne)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, login failures will be logged in this file in a utmp format."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>HUSHLOGIN_FILE</option> (string)"
 msgstr "CHFN_RESTRICT (chaîne)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, this file can inhibit all the usual chatter during the login "
 "sequence. If a full pathname is specified, then hushed mode will be enabled "
@@ -4789,106 +5389,106 @@
 "directory."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ISSUE_FILE</option> (string)"
 msgstr "MAIL_DIR (chaîne)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "If defined, this file will be displayed before each login prompt."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>KILLCHAR</option> (number)"
 msgstr "GID_MAX (nombre)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Terminal KILL character (<replaceable>025</replaceable> = CTRL/U)."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LASTLOG_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (booléen)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable logging and display of /var/log/lastlog login time info."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOG_OK_LOGINS</option> (boolean)"
 msgstr "CHFN_AUTH (booléen)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable logging of successful logins."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOG_UNKFAIL_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (booléen)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable display of unknown usernames when login failures are recorded."
 msgstr ""
 
-#: login.defs.5.xml:8(para) login.1.xml:8(para)
+#: login.defs.5.xml:38(para) login.1.xml:38(para)
 msgid ""
 "Note: logging unknown usernames may be a security issue if an user enter her "
 "password instead of her login name."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOGIN_RETRIES</option> (number)"
 msgstr "GID_MIN (nombre)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Maximum number of login retries in case of bad password."
 msgstr ""
 
-#: login.defs.5.xml:7(para) login.1.xml:7(para)
+#: login.defs.5.xml:37(para) login.1.xml:37(para)
 msgid ""
 "This will most likely be overriden by PAM, since the default pam_unix module "
 "has it's own built in of 3 retries. However, this is a safe fallback in case "
 "you are using an authentication module that does not enforce PAM_MAXTRIES."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOGIN_TIMEOUT</option> (number)"
 msgstr "GID_MAX (nombre)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Max time in seconds for login."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>MOTD_FILE</option> (string)"
 msgstr "MAIL_DIR (chaîne)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, \":\" delimited list of \"message of the day\" files to be "
 "displayed upon login."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>NOLOGINS_FILE</option> (string)"
 msgstr "CHFN_RESTRICT (chaîne)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, name of file whose presence will inhibit non-root logins. The "
 "contents of this file should be a message indicating why logins are "
 "inhibited."
 msgstr ""
 
-#: login.defs.5.xml:149(para)
+#: login.defs.5.xml:181(para)
 #, fuzzy
 msgid ""
 "<option>PASS_MAX_DAYS</option>, <option>PASS_MIN_DAYS</option> and "
@@ -4899,45 +5499,45 @@
 "utilisés qu'au moment de la création d'un compte. Les changements "
 "n'affecteront pas les comptes existants."
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>PORTTIME_CHECKS_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (booléen)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable checking of time restrictions specified in /etc/porttime."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>TTYGROUP</option> (string)"
 msgstr "MAIL_DIR (chaîne)"
 
-#: login.defs.5.xml:3(term) login.1.xml:3(term)
+#: login.defs.5.xml:33(term) login.1.xml:33(term)
 #, fuzzy
 msgid "<option>TTYPERM</option> (string)"
 msgstr "USERDEL_CMD (chaîne)"
 
-#: login.defs.5.xml:5(para) login.1.xml:5(para)
+#: login.defs.5.xml:35(para) login.1.xml:35(para)
 msgid ""
 "The terminal permissions: the login tty will be owned by the "
 "<option>TTYGROUP</option> group, and the permissions will be set to "
 "<option>TTYPERM</option>."
 msgstr ""
 
-#: login.defs.5.xml:10(para) login.1.xml:10(para)
+#: login.defs.5.xml:40(para) login.1.xml:40(para)
 msgid ""
 "By default, the ownership of the terminal is set to the user's primary group "
 "and the permissions are set to <replaceable>0600</replaceable>."
 msgstr ""
 
-#: login.defs.5.xml:15(para) login.1.xml:15(para)
+#: login.defs.5.xml:45(para) login.1.xml:45(para)
 msgid ""
 "<option>TTYGROUP</option> can be either the name of a group or a numeric "
 "group identifier."
 msgstr ""
 
-#: login.defs.5.xml:19(para) login.1.xml:19(para)
+#: login.defs.5.xml:49(para) login.1.xml:49(para)
 msgid ""
 "If you have a <command>write</command> program which is \"setgid\" to a "
 "special group which owns the terminals, define TTYGROUP to the group number "
@@ -4945,32 +5545,32 @@
 "TTYPERM to either 622 or 600."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>TTYTYPE_FILE</option> (string)"
 msgstr "MAIL_DIR (chaîne)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, file which maps tty line to TERM environment parameter. Each "
 "line of the file is in a format something like \"vt100 tty01\"."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ULIMIT</option> (number)"
 msgstr "UID_MIN (nombre)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Default <command>ulimit</command> value."
 msgstr ""
 
-#: login.defs.5.xml:177(title)
+#: login.defs.5.xml:209(title)
 #, fuzzy
 msgid "CROSS REFERENCES"
 msgstr "RÉFÉRENCES CROISÉES"
 
-#: login.defs.5.xml:178(para)
+#: login.defs.5.xml:210(para)
 #, fuzzy
 msgid ""
 "The following cross references show which programs in the shadow password "
@@ -4979,100 +5579,99 @@
 "Les références croisées ci-dessous montrent quels sont les paramètres "
 "utilisés par les différents programmes de la suite shadow password."
 
-#: login.defs.5.xml:186(term) chfn.1.xml:12(refentrytitle)
-#: chfn.1.xml:17(refname) chfn.1.xml:23(command)
+#: login.defs.5.xml:218(term) chfn.1.xml:41(refentrytitle)
+#: chfn.1.xml:46(refname) chfn.1.xml:52(command)
 msgid "chfn"
 msgstr "chfn"
 
-#: login.defs.5.xml:188(para)
+#: login.defs.5.xml:220(para)
 msgid ""
 "<phrase condition=\"no_pam\">CHFN_AUTH</phrase> CHFN_RESTRICT <phrase "
 "condition=\"no_pam\">LOGIN_STRING</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:196(term) chgpasswd.8.xml:13(refentrytitle)
-#: chgpasswd.8.xml:18(refname) chgpasswd.8.xml:24(command)
+#: login.defs.5.xml:228(term) chgpasswd.8.xml:42(refentrytitle)
+#: chgpasswd.8.xml:47(refname) chgpasswd.8.xml:53(command)
 msgid "chgpasswd"
 msgstr "chgpasswd"
 
-#: login.defs.5.xml:198(para) login.defs.5.xml:228(para)
+#: login.defs.5.xml:230(para) login.defs.5.xml:260(para)
 msgid ""
 "ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB <phrase condition="
 "\"sha_crypt\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:206(term) chpasswd.8.xml:12(refentrytitle)
-#: chpasswd.8.xml:17(refname) chpasswd.8.xml:23(command)
+#: login.defs.5.xml:238(term) chpasswd.8.xml:41(refentrytitle)
+#: chpasswd.8.xml:46(refname) chpasswd.8.xml:52(command)
 msgid "chpasswd"
 msgstr "chpasswd"
 
-#: login.defs.5.xml:208(para)
+#: login.defs.5.xml:240(para)
 msgid ""
 "ENCRYPT_METHOD MD5_CRYPT_ENAB <phrase condition=\"sha_crypt"
 "\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:216(term) chsh.1.xml:11(refentrytitle)
-#: chsh.1.xml:16(refname) chsh.1.xml:22(command)
+#: login.defs.5.xml:248(term) chsh.1.xml:40(refentrytitle)
+#: chsh.1.xml:45(refname) chsh.1.xml:51(command)
 msgid "chsh"
 msgstr "chsh"
 
-#: login.defs.5.xml:218(para)
+#: login.defs.5.xml:250(para)
 #, fuzzy
 msgid "CHSH_AUTH LOGIN_STRING"
 msgstr "CHFN_AUTH CHFN_RESTRICT"
 
-#: login.defs.5.xml:226(term) gpasswd.1.xml:13(refentrytitle)
-#: gpasswd.1.xml:18(refname) gpasswd.1.xml:29(command)
+#: login.defs.5.xml:258(term) gpasswd.1.xml:42(refentrytitle)
+#: gpasswd.1.xml:47(refname) gpasswd.1.xml:58(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
-#: login.defs.5.xml:236(term) groupadd.8.xml:11(refentrytitle)
-#: groupadd.8.xml:16(refname) groupadd.8.xml:22(command)
+#: login.defs.5.xml:268(term) groupadd.8.xml:42(refentrytitle)
+#: groupadd.8.xml:47(refname) groupadd.8.xml:53(command)
 msgid "groupadd"
 msgstr "groupadd"
 
-#: login.defs.5.xml:238(para)
+#: login.defs.5.xml:270(para)
 #, fuzzy
 msgid "GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP SYS_GID_MAX SYS_GID_MIN"
 msgstr ""
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:245(term) groupdel.8.xml:9(refentrytitle)
-#: groupdel.8.xml:14(refname) groupdel.8.xml:20(command)
+#: login.defs.5.xml:277(term) groupdel.8.xml:38(refentrytitle)
+#: groupdel.8.xml:43(refname) groupdel.8.xml:49(command)
 msgid "groupdel"
 msgstr "groupdel"
 
-#: login.defs.5.xml:247(para) login.defs.5.xml:253(para)
-#: login.defs.5.xml:259(para) login.defs.5.xml:266(para)
-#: login.defs.5.xml:272(para) login.defs.5.xml:278(para)
-#: login.defs.5.xml:421(para)
+#: login.defs.5.xml:279(para) login.defs.5.xml:285(para)
+#: login.defs.5.xml:291(para) login.defs.5.xml:298(para)
+#: login.defs.5.xml:304(para) login.defs.5.xml:310(para)
 msgid "MAX_MEMBERS_PER_GROUP"
 msgstr ""
 
-#: login.defs.5.xml:251(term) groupmems.8.xml:9(refentrytitle)
-#: groupmems.8.xml:14(refname) groupmems.8.xml:20(command)
+#: login.defs.5.xml:283(term) groupmems.8.xml:38(refentrytitle)
+#: groupmems.8.xml:43(refname) groupmems.8.xml:49(command)
 msgid "groupmems"
 msgstr "groupmems"
 
-#: login.defs.5.xml:257(term) groupmod.8.xml:9(refentrytitle)
-#: groupmod.8.xml:14(refname) groupmod.8.xml:20(command)
+#: login.defs.5.xml:289(term) groupmod.8.xml:38(refentrytitle)
+#: groupmod.8.xml:43(refname) groupmod.8.xml:49(command)
 msgid "groupmod"
 msgstr "groupmod"
 
-#: login.defs.5.xml:264(term) grpck.8.xml:9(refentrytitle)
-#: grpck.8.xml:14(refname) grpck.8.xml:20(command) grpck.8.xml:29(command)
+#: login.defs.5.xml:296(term) grpck.8.xml:38(refentrytitle)
+#: grpck.8.xml:43(refname) grpck.8.xml:49(command) grpck.8.xml:58(command)
 msgid "grpck"
 msgstr "grpck"
 
-#: login.defs.5.xml:284(term) login.1.xml:41(refentrytitle)
-#: login.1.xml:46(refname) login.1.xml:52(command) login.1.xml:59(command)
-#: login.1.xml:65(command)
+#: login.defs.5.xml:316(term) login.1.xml:70(refentrytitle)
+#: login.1.xml:75(refname) login.1.xml:81(command) login.1.xml:89(command)
+#: login.1.xml:96(command)
 msgid "login"
 msgstr "login"
 
-#: login.defs.5.xml:286(para)
+#: login.defs.5.xml:318(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENV_PATH ENV_SUPATH ENV_TZ ENVIRON_FILE</"
@@ -5087,11 +5686,17 @@
 "phrase> USERGROUPS_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:315(para)
+#: login.defs.5.xml:345(term)
+#, fuzzy
+#| msgid "newgrp"
+msgid "newgrp / sg"
+msgstr "newgrp"
+
+#: login.defs.5.xml:347(para)
 msgid "SYSLOG_SG_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:323(para)
+#: login.defs.5.xml:355(para)
 #, fuzzy
 msgid ""
 "ENCRYPT_METHOD GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB "
@@ -5102,18 +5707,18 @@
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:339(para)
+#: login.defs.5.xml:371(para)
 msgid ""
 "ENCRYPT_METHOD MD5_CRYPT_ENAB OBSCURE_CHECKS_ENAB PASS_ALWAYS_WARN "
 "PASS_CHANGE_TRIES PASS_MAX_LEN PASS_MIN_LEN <phrase condition=\"sha_crypt"
 "\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:350(para) login.defs.5.xml:358(para)
+#: login.defs.5.xml:382(para) login.defs.5.xml:390(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 
-#: login.defs.5.xml:365(para)
+#: login.defs.5.xml:397(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENVIRON_FILE</phrase> ENV_PATH "
@@ -5123,43 +5728,54 @@
 "\">USERGROUPS_ENAB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:380(term)
+#: login.defs.5.xml:412(term)
 #, fuzzy
 msgid "sulogin"
 msgstr "login"
 
-#: login.defs.5.xml:382(para)
+#: login.defs.5.xml:414(para)
 msgid "ENV_HZ <phrase condition=\"no_pam\">ENV_TZ</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:391(para)
+#: login.defs.5.xml:423(para)
 #, fuzzy
 msgid ""
-"GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS PASS_MIN_DAYS "
-"PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN UID_MAX "
-"UID_MIN UMASK"
+"CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS "
+"PASS_MIN_DAYS PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN "
+"UID_MAX UID_MIN UMASK"
 msgstr ""
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:404(para)
+#: login.defs.5.xml:436(para)
 msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:413(para)
+#: login.defs.5.xml:445(para)
 msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP"
 msgstr ""
 
-#: login.defs.5.xml:429(para)
+#: login.defs.5.xml:456(para)
+#, fuzzy
+#| msgid ""
+#| "Much of the functionality that used to be provided by the shadow password "
+#| "suite is now handled by PAM. Thus, <filename>/etc/login.defs</filename> "
+#| "is no longer used by programs such as: "
+#| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>. Please refer to the corresponding PAM configuration files "
+#| "instead."
 msgid ""
 "Much of the functionality that used to be provided by the shadow password "
 "suite is now handled by PAM. Thus, <filename>/etc/login.defs</filename> is "
-"no longer used by programs such as: <citerefentry><refentrytitle>login</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>. Please refer to the corresponding PAM "
-"configuration files instead."
+"no longer used by <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, or less used by "
+"<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, and <citerefentry><refentrytitle>su</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>. Please refer to the "
+"corresponding PAM configuration files instead."
 msgstr ""
 "La plupart des fonctionnalités qui étaient fournies par les mots de passe "
 "cachés (« shadow password ») sont désormais gérées par PAM. De ce fait, "
@@ -5171,7 +5787,7 @@
 "citerefentry>. Veuillez plutôt vous référer aux fichiers de configuration de "
 "PAM correspondant."
 
-#: login.defs.5.xml:446(para)
+#: login.defs.5.xml:472(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5193,15 +5809,15 @@
 "citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: login.access.5.xml:5(refentrytitle) login.access.5.xml:10(refname)
+#: login.access.5.xml:35(refentrytitle) login.access.5.xml:40(refname)
 msgid "login.access"
 msgstr "login.access"
 
-#: login.access.5.xml:11(refpurpose)
+#: login.access.5.xml:41(refpurpose)
 msgid "login access control table"
 msgstr "table de contrôle des connexions"
 
-#: login.access.5.xml:16(para)
+#: login.access.5.xml:46(para)
 msgid ""
 "The <emphasis remap=\"I\">login.access</emphasis> file specifies (user, "
 "host) combinations and/or (user, tty) combinations for which a login will be "
@@ -5211,7 +5827,7 @@
 "des paires (utilisateur, hôte) et/ou (utilisateur, tty) pour lesquels toute "
 "connexion sera soit acceptée soit refusée."
 
-#: login.access.5.xml:22(para)
+#: login.access.5.xml:52(para)
 msgid ""
 "When someone logs in, the <emphasis remap=\"I\">login.access</emphasis> is "
 "scanned for the first entry that matches the (user, host) combination, or, "
@@ -5226,7 +5842,7 @@
 "champ des permissions de la table pour cette entrée détermine alors si la "
 "connexion doit être acceptée ou refusée."
 
-#: login.access.5.xml:30(para)
+#: login.access.5.xml:60(para)
 msgid ""
 "Each line of the login access control table has three fields separated by a "
 "\":\" character:"
@@ -5234,7 +5850,7 @@
 "Chaque ligne de la table de contrôle des connexions (« login access control "
 "table ») est composée de trois champs séparés par le caractère « : » :"
 
-#: login.access.5.xml:35(para)
+#: login.access.5.xml:65(para)
 msgid ""
 "<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I\">users</"
 "emphasis>:<emphasis remap=\"I\">origins</emphasis>"
@@ -5242,7 +5858,7 @@
 "<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I"
 "\">utilisateurs</emphasis>:<emphasis remap=\"I\">origines</emphasis>"
 
-#: login.access.5.xml:39(para)
+#: login.access.5.xml:69(para)
 msgid ""
 "The first field should be a \"<emphasis>+</emphasis>\" (access granted) or "
 "\"<emphasis>-</emphasis>\" (access denied) character. The second field "
@@ -5267,7 +5883,7 @@
 "chaîne ne contenant pas de « <literal>.</literal> »). Si vous utilisez NIS, "
 "vous pouvez utiliser @nomdegroupe pour les motifs d'utilisateur et d'hôte."
 
-#: login.access.5.xml:53(para)
+#: login.access.5.xml:83(para)
 msgid ""
 "The <emphasis>EXCEPT</emphasis> operator makes it possible to write very "
 "compact rules."
@@ -5275,7 +5891,7 @@
 "L'opérateur <emphasis>EXCEPT</emphasis> permet d'écrire des règles très "
 "compactes."
 
-#: login.access.5.xml:58(para)
+#: login.access.5.xml:88(para)
 msgid ""
 "The group file is searched only when a name does not match that of the "
 "logged-in user. Only groups are matched in which users are explicitly "
@@ -5287,40 +5903,37 @@
 "utilisés : le programme ne recherche pas parmi les groupes primaires des "
 "utilisateurs."
 
-#: login.1.xml:47(refpurpose)
+#: login.1.xml:76(refpurpose)
 msgid "begin session on the system"
 msgstr "Démarrer une session sur le système"
 
-#: login.1.xml:53(arg) login.1.xml:60(arg) login.1.xml:66(arg)
-#: login.1.xml:178(option) groupmems.8.xml:24(arg) groupmems.8.xml:65(option)
+#: login.1.xml:82(arg) login.1.xml:90(arg) login.1.xml:97(arg)
+#: login.1.xml:214(option) groupmems.8.xml:54(arg)
 msgid "-p"
 msgstr "-p"
 
-#: login.1.xml:55(replaceable) login.1.xml:62(replaceable)
-msgid "username"
-msgstr "nom_utilisateur"
-
-#: login.1.xml:56(replaceable)
-msgid "ENV=VAR"
-msgstr "ENV=VAR"
-
-#: login.1.xml:61(replaceable) login.1.xml:67(replaceable)
+#: login.1.xml:83(replaceable) login.1.xml:91(replaceable)
+#: login.1.xml:98(replaceable)
 msgid "host"
 msgstr "hôte"
 
-#: login.1.xml:61(arg) chfn.1.xml:27(arg)
+#: login.1.xml:83(arg) login.1.xml:91(arg) chfn.1.xml:56(arg)
 msgid "-h <placeholder-1/>"
 msgstr "-h <placeholder-1/>"
 
-#: login.1.xml:62(arg) chfn.1.xml:24(arg)
-msgid "-f <placeholder-1/>"
-msgstr "-f <placeholder-1/>"
+#: login.1.xml:86(replaceable)
+msgid "ENV=VAR"
+msgstr "ENV=VAR"
 
-#: login.1.xml:67(arg) chfn.1.xml:25(arg)
+#: login.1.xml:92(arg) login.1.xml:192(option) expiry.1.xml:54(arg)
+msgid "-f"
+msgstr "-f"
+
+#: login.1.xml:98(arg) chfn.1.xml:54(arg)
 msgid "-r <placeholder-1/>"
 msgstr "-r <placeholder-1/>"
 
-#: login.1.xml:73(para)
+#: login.1.xml:104(para)
 #, fuzzy
 msgid ""
 "The <command>login</command> program is used to establish a new session with "
@@ -5346,7 +5959,7 @@
 "interpréteur de commandes initial (« login shell ») produira un message "
 "d'erreur."
 
-#: login.1.xml:87(para)
+#: login.1.xml:118(para)
 msgid ""
 "The user is then prompted for a password, where appropriate. Echoing is "
 "disabled to prevent revealing the password. Only a small number of password "
@@ -5358,7 +5971,7 @@
 "nombre d'échecs est permis avant que <command>login</command> ne quitte et "
 "que la liaison ne soit interrompue."
 
-#: login.1.xml:94(para)
+#: login.1.xml:125(para)
 msgid ""
 "If password aging has been enabled for your account, you may be prompted for "
 "a new password before proceeding. You will be forced to provide your old "
@@ -5373,7 +5986,7 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry> pour plus d'informations."
 
-#: login.1.xml:103(para)
+#: login.1.xml:134(para)
 msgid ""
 "After a successful login, you will be informed of any system messages and "
 "the presence of mail. You may turn off the printing of the system message "
@@ -5391,7 +6004,7 @@
 "emphasis> », « <emphasis>You have mail.</emphasis> », ou « <emphasis>No Mail.</"
 "emphasis> » suivant l'état de votre boîte aux lettres."
 
-#: login.1.xml:114(para)
+#: login.1.xml:145(para)
 msgid ""
 "Your user and group ID will be set according to their values in the "
 "<filename>/etc/passwd</filename> file. The value for <envar>$HOME</envar>, "
@@ -5409,7 +6022,7 @@
 "d'umask et de nice pourront également être affectées en fonction des entrées "
 "du champ GECOS."
 
-#: login.1.xml:123(para)
+#: login.1.xml:154(para)
 msgid ""
 "On some installations, the environmental variable <envar>$TERM</envar> will "
 "be initialized to the terminal type on your tty line, as specified in "
@@ -5419,7 +6032,7 @@
 "emphasis> sera initialisée au type de terminal de votre tty, comme spécifié "
 "dans <filename>/etc/ttytype</filename>."
 
-#: login.1.xml:129(para)
+#: login.1.xml:160(para)
 msgid ""
 "An initialization script for your command interpreter may also be executed. "
 "Please see the appropriate manual section for more information on this "
@@ -5429,7 +6042,7 @@
 "également être exécuté. Veuillez vous référer à la section de manuel "
 "appropriée pour plus d'informations sur cette fonctionnalité."
 
-#: login.1.xml:141(para) login.1.xml:212(para)
+#: login.1.xml:172(para) login.1.xml:248(para)
 msgid ""
 "The <command>login</command> program is NOT responsible for removing users "
 "from the utmp file. It is the responsibility of "
@@ -5452,32 +6065,32 @@
 "apparaître comme étant connecté même après s'être déconnecté de cette « sous-"
 "session »."
 
-#: login.1.xml:161(option) groupadd.8.xml:27(arg) expiry.1.xml:24(arg)
-msgid "-f"
-msgstr "-f"
-
-#: login.1.xml:164(para)
+#: login.1.xml:195(para)
 msgid "Do not perform authentication, user is preauthenticated."
 msgstr "Ne pas réaliser d'authentification. L'utilisateur est pré-authentifié."
 
-#: login.1.xml:170(option)
+#: login.1.xml:198(para)
+msgid "Note: In that case, <replaceable>username</replaceable> is mandatory."
+msgstr ""
+
+#: login.1.xml:206(option)
 msgid "-h"
 msgstr "-h"
 
-#: login.1.xml:173(para)
+#: login.1.xml:209(para)
 msgid "Name of the remote host for this login."
 msgstr "Nom de l'hôte distant pour cette connexion."
 
-#: login.1.xml:181(para)
+#: login.1.xml:217(para)
 msgid "Preserve environment."
 msgstr "Préserver l'environnement."
 
-#: login.1.xml:189(para)
+#: login.1.xml:225(para)
 msgid "Perform autologin protocol for rlogin."
 msgstr ""
 "Exécuter le protocole de connexion automatique (autologin) pour rlogin."
 
-#: login.1.xml:194(para)
+#: login.1.xml:230(para)
 msgid ""
 "The <option>-r</option>, <option>-h</option> and <option>-f</option> options "
 "are only used when <command>login</command> is invoked by root."
@@ -5485,7 +6098,7 @@
 "Les options <option>-r</option>, <option>-h</option> et <option>-f</option> "
 "ne peuvent être utilisées que par root."
 
-#: login.1.xml:203(para)
+#: login.1.xml:239(para)
 msgid ""
 "This version of <command>login</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -5494,13 +6107,13 @@
 "compilation. Seules certaines d'entre elles peuvent avoir été activées sur "
 "votre site."
 
-#: login.1.xml:208(para)
+#: login.1.xml:244(para)
 msgid ""
 "The location of files is subject to differences in system configuration."
 msgstr ""
 "L'emplacement des fichiers peut varier suivant la configuration du système."
 
-#: login.1.xml:224(para)
+#: login.1.xml:260(para)
 #, fuzzy
 msgid ""
 "As with any program, <command>login</command>'s appearance can be faked. If "
@@ -5516,47 +6129,47 @@
 "mécanisme SAK peut être utilisé par les utilisateurs pour initier un chemin "
 "de confiance et prévenir ce genre d'attaques."
 
-#: login.1.xml:289(filename)
+#: login.1.xml:325(filename)
 msgid "/var/log/wtmp"
 msgstr "/var/log/wtmp"
 
-#: login.1.xml:291(para)
+#: login.1.xml:327(para)
 msgid "List of previous login sessions."
 msgstr "Liste des sessions de connexion précédentes."
 
-#: login.1.xml:307(filename)
+#: login.1.xml:343(filename)
 msgid "/etc/motd"
 msgstr "/etc/motd"
 
-#: login.1.xml:309(para)
+#: login.1.xml:345(para)
 msgid "System message of the day file."
 msgstr "Fichier contenant le message du système."
 
-#: login.1.xml:313(filename)
+#: login.1.xml:349(filename)
 msgid "/etc/nologin"
 msgstr "/etc/nologin"
 
-#: login.1.xml:315(para)
+#: login.1.xml:351(para)
 msgid "Prevent non-root users from logging in."
 msgstr "Empêcher les utilisateurs non-root de se connecter."
 
-#: login.1.xml:319(filename)
+#: login.1.xml:355(filename)
 msgid "/etc/ttytype"
 msgstr "/etc/ttytype"
 
-#: login.1.xml:321(para)
+#: login.1.xml:357(para)
 msgid "List of terminal types."
 msgstr "Liste des types de terminaux."
 
-#: login.1.xml:325(filename)
+#: login.1.xml:361(filename)
 msgid "$HOME/.hushlogin"
 msgstr "$HOME/.hushlogin"
 
-#: login.1.xml:327(para)
+#: login.1.xml:363(para)
 msgid "Suppress printing of system messages."
 msgstr "Supprimer l'affichage des messages du système."
 
-#: login.1.xml:335(para)
+#: login.1.xml:371(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5586,15 +6199,15 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getty</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: limits.5.xml:5(refentrytitle) limits.5.xml:10(refname)
+#: limits.5.xml:35(refentrytitle) limits.5.xml:40(refname)
 msgid "limits"
 msgstr "limits"
 
-#: limits.5.xml:11(refpurpose)
+#: limits.5.xml:41(refpurpose)
 msgid "resource limits definition"
 msgstr "définition des limites de ressources"
 
-#: limits.5.xml:17(para)
+#: limits.5.xml:47(para)
 msgid ""
 "The <emphasis remap=\"I\">limits</emphasis> file (<filename>/etc/limits</"
 "filename> by default or LIMITS_FILE defined <filename>config.h</filename>) "
@@ -5606,7 +6219,7 @@
 "filename>) décrit les limites de ressource que vous voulez imposer. Il doit "
 "être possédé et ne doit être lisible que par le compte root."
 
-#: limits.5.xml:25(para)
+#: limits.5.xml:55(para)
 msgid ""
 "By default no quota is imposed on 'root'. In fact, there is no way to impose "
 "limits via this procedure to root-equiv accounts (accounts with UID 0)."
@@ -5615,17 +6228,17 @@
 "n'est pas possible d'imposer de cette façon de limite aux comptes root ou "
 "équivalents (comptes ayant un UID de 0)."
 
-#: limits.5.xml:31(para)
+#: limits.5.xml:61(para)
 msgid "Each line describes a limit for a user in the form:"
 msgstr ""
 "Chaque ligne décrit une limite pour un utilisateur, elle est de la forme "
 "suivante :"
 
-#: limits.5.xml:34(emphasis)
+#: limits.5.xml:64(emphasis)
 msgid "user LIMITS_STRING"
 msgstr "utilisateur LISTE_DE_LIMITES"
 
-#: limits.5.xml:37(para)
+#: limits.5.xml:67(para)
 msgid ""
 "The <emphasis>LIMITS_STRING</emphasis> is a string of a concatenated list of "
 "resource limits. Each limit consists of a letter identifier followed by a "
@@ -5635,58 +6248,58 @@
 "concaténation d'une liste de limites de ressource. Chaque limite consiste en "
 "une lettre (identifiant le type de limite) et une valeur numérique."
 
-#: limits.5.xml:43(para)
+#: limits.5.xml:73(para)
 msgid "The valid identifiers are:"
 msgstr "Les identifiants possibles sont :"
 
-#: limits.5.xml:46(para)
+#: limits.5.xml:76(para)
 msgid "A: max address space (KB)"
 msgstr "A : espace d'adressage maximal (en kilo octets)"
 
-#: limits.5.xml:47(para)
+#: limits.5.xml:77(para)
 msgid "C: max core file size (KB)"
 msgstr ""
 "C : taille maximale d'un fichier image de la mémoire (« core », en kilo "
 "octets)"
 
-#: limits.5.xml:48(para)
+#: limits.5.xml:78(para)
 msgid "D: max data size (KB)"
 msgstr ""
 "D : taille maximale du segment de données d'un programme (en kilo octets)"
 
-#: limits.5.xml:49(para)
+#: limits.5.xml:79(para)
 msgid "F: maximum filesize (KB)"
 msgstr "F : taille maximale des fichiers (en kilo octets)"
 
-#: limits.5.xml:50(para)
+#: limits.5.xml:80(para)
 msgid "M: max locked-in-memory address space (KB)"
 msgstr ""
 "M : taille  maximale de mémoire verrouillée (« locked-in-memory », en kilo "
 "octets)"
 
-#: limits.5.xml:51(para)
+#: limits.5.xml:81(para)
 msgid "N: max number of open files"
 msgstr "N : nombre maximal de fichiers ouverts"
 
-#: limits.5.xml:52(para)
+#: limits.5.xml:82(para)
 msgid "R: max resident set size (KB)"
 msgstr ""
 "R : taille maximale de la mémoire résidente (« resident set size », en kilo "
 "octets)"
 
-#: limits.5.xml:53(para)
+#: limits.5.xml:83(para)
 msgid "S: max stack size (KB)"
 msgstr "S : taille maximale de la pile (en kilo octets)"
 
-#: limits.5.xml:54(para)
+#: limits.5.xml:84(para)
 msgid "T: max CPU time (MIN)"
 msgstr "T : temps processeur maximal consommé (en minutes)"
 
-#: limits.5.xml:55(para)
+#: limits.5.xml:85(para)
 msgid "U: max number of processes"
 msgstr "U : nombre maximal de processus"
 
-#: limits.5.xml:56(para)
+#: limits.5.xml:86(para)
 msgid ""
 "K: file creation mask, set by <citerefentry><refentrytitle>umask</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
@@ -5695,11 +6308,11 @@
 "<citerefentry><refentrytitle>umask</refentrytitle><manvolnum>2</manvolnum></"
 "citerefentry>."
 
-#: limits.5.xml:61(para)
+#: limits.5.xml:91(para)
 msgid "L: max number of logins for this user"
 msgstr "L : nombre maximal de connexions simultanées pour cet utilisateur"
 
-#: limits.5.xml:62(para)
+#: limits.5.xml:92(para)
 msgid ""
 "P: process priority, set by <citerefentry><refentrytitle>setpriority</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
@@ -5708,18 +6321,23 @@
 "<citerefentry><refentrytitle>setpriority</refentrytitle><manvolnum>2</"
 "manvolnum></citerefentry>."
 
-#: limits.5.xml:67(para)
+#: limits.5.xml:97(para)
 msgid "I: max nice value (0..39 which translates to 20..-19)"
 msgstr ""
 
-#: limits.5.xml:69(para)
+#: limits.5.xml:99(para)
 msgid "O: max real time priority"
 msgstr ""
 
-#: limits.5.xml:72(para)
+#: limits.5.xml:102(para)
+#, fuzzy
+#| msgid ""
+#| "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
+#| "<emphasis>LIMITS_STRING </emphasis>. For reading convenience, the "
+#| "following entries are equivalent:"
 msgid ""
 "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
-"<emphasis>LIMITS_STRING </emphasis>. For reading convenience, the following "
+"<emphasis>LIMITS_STRING</emphasis>. For reading convenience, the following "
 "entries are equivalent:"
 msgstr ""
 "Par exemple, <emphasis remap=\"I\">L2D2048N5</emphasis> est une chaîne "
@@ -5727,7 +6345,7 @@
 "les entrées suivantes sont équivalentes :"
 
 # NOTE: elle va pas cette chaîne
-#: limits.5.xml:78(programlisting)
+#: limits.5.xml:108(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -5740,7 +6358,7 @@
 "      utilisateur L2 D2048 N5\n"
 "    "
 
-#: limits.5.xml:83(para)
+#: limits.5.xml:113(para)
 msgid ""
 "Be aware that after <emphasis remap=\"I\">username</emphasis> the rest of "
 "the line is considered a limit string, thus comments are not allowed. A "
@@ -5752,7 +6370,7 @@
 "autorisés. Une chaîne de limites non valable sera rejetée (non utilisée) par "
 "le programme <command>login</command>."
 
-#: limits.5.xml:90(para)
+#: limits.5.xml:120(para)
 msgid ""
 "The default entry is denoted by username \"<emphasis>*</emphasis>\". If you "
 "have multiple <emphasis remap=\"I\">default</emphasis> entries in your "
@@ -5763,7 +6381,7 @@
 "emphasis> ». Si plusieurs entrées par défaut sont présentes dans le fichier "
 "de limites, alors seule la dernière sera prise en compte."
 
-#: limits.5.xml:97(para)
+#: limits.5.xml:127(para)
 msgid ""
 "To completely disable limits for a user, a single dash \"<emphasis>-</"
 "emphasis>\" will do."
@@ -5771,7 +6389,7 @@
 "Un simple tiret « <emphasis>-</emphasis> » sera suffisant pour désactiver "
 "toute limite à un utilisateur, "
 
-#: limits.5.xml:102(para)
+#: limits.5.xml:132(para)
 msgid ""
 "Also, please note that all limit settings are set PER LOGIN. They are not "
 "global, nor are they permanent. Perhaps global limits will come, but for now "
@@ -5781,11 +6399,11 @@
 "a pas de limite globale ou permanente. Des limites globales pourraient voir "
 "le jour, mais pour l'instant, il faut faire sans."
 
-#: limits.5.xml:113(filename)
+#: limits.5.xml:143(filename)
 msgid "/etc/limits"
 msgstr "/etc/limits"
 
-#: limits.5.xml:121(para)
+#: limits.5.xml:151(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>setpriority</"
@@ -5799,18 +6417,18 @@
 "<citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</"
 "manvolnum></citerefentry>."
 
-#: lastlog.8.xml:5(refentrytitle) lastlog.8.xml:10(refname)
-#: lastlog.8.xml:16(command)
+#: lastlog.8.xml:35(refentrytitle) lastlog.8.xml:40(refname)
+#: lastlog.8.xml:46(command)
 msgid "lastlog"
 msgstr "lastlog"
 
-#: lastlog.8.xml:11(refpurpose)
+#: lastlog.8.xml:41(refpurpose)
 msgid "reports the most recent login of all users or of a given user"
 msgstr ""
 "signaler les connexions les plus récentes de tous les utilisateurs ou d'un "
 "utilisateur donné"
 
-#: lastlog.8.xml:25(para)
+#: lastlog.8.xml:55(para)
 msgid ""
 "<command>lastlog</command> formats and prints the contents of the last login "
 "log <filename>/var/log/lastlog</filename> file. The <emphasis>login-name</"
@@ -5825,32 +6443,32 @@
 "option de spécifiée), les entrées de laslog sont affichées triées par ordre "
 "d'apparition dans <filename>/etc/passwd</filename>."
 
-#: lastlog.8.xml:37(para)
+#: lastlog.8.xml:67(para)
 msgid "The options which apply to the <command>lastlog</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>lastlog</command> sont :"
 
-#: lastlog.8.xml:42(term)
+#: lastlog.8.xml:72(term)
 msgid ""
 "<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-b</option>, <option>--before</option> <replaceable>JOURS</"
 "replaceable>"
 
-#: lastlog.8.xml:46(para)
+#: lastlog.8.xml:76(para)
 msgid ""
 "Print only lastlog records older than <emphasis remap=\"I\">DAYS</emphasis>."
 msgstr ""
 "N'affiche que les entrées du fichier lastlog plus anciennes que <emphasis "
 "remap=\"I\">JOURS</emphasis>."
 
-#: lastlog.8.xml:60(term) faillog.8.xml:93(term)
+#: lastlog.8.xml:90(term) faillog.8.xml:142(term)
 msgid ""
 "<option>-t</option>, <option>--time</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-t</option>, <option>--time</option> <replaceable>JOURS</replaceable>"
 
-#: lastlog.8.xml:65(para)
+#: lastlog.8.xml:95(para)
 msgid ""
 "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</"
 "emphasis>."
@@ -5858,7 +6476,7 @@
 "Affiche les entrées du fichier lastlog plus récentes que <emphasis remap=\"I"
 "\">JOURS</emphasis>."
 
-#: lastlog.8.xml:72(term)
+#: lastlog.8.xml:102(term) faillog.8.xml:153(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-K</option>, <option>--key</option><replaceable>KEY</"
@@ -5870,7 +6488,7 @@
 "<option>-K</option>, <option>--key</option> <replaceable>CLÉ</"
 "replaceable>=<replaceable>VALEUR</replaceable>"
 
-#: lastlog.8.xml:77(para)
+#: lastlog.8.xml:107(para)
 #, fuzzy
 #| msgid ""
 #| "Print the lastlog record for user with specified <emphasis remap=\"I"
@@ -5880,7 +6498,7 @@
 "N'affiche que les entrées correspondant à l'utilisateur <emphasis remap=\"I"
 "\">IDENTIFIANT</emphasis>."
 
-#: lastlog.8.xml:80(para)
+#: lastlog.8.xml:110(para) faillog.8.xml:163(para)
 msgid ""
 "The users can be specified by a login name, a numerical user ID, or a "
 "<replaceable>RANGE</replaceable> of users. This <replaceable>RANGE</"
@@ -5889,7 +6507,7 @@
 "UID_MAX</replaceable>), or a min value (<replaceable>UID_MIN-</replaceable>)."
 msgstr ""
 
-#: lastlog.8.xml:92(para)
+#: lastlog.8.xml:122(para)
 msgid ""
 "If the user has never logged in the message <emphasis>** Never logged in**</"
 "emphasis> will be displayed instead of the port and time."
@@ -5899,12 +6517,18 @@
 "emphasis> ») est affiché à la place des champs <emphasis>Port</emphasis> et "
 "date de <emphasis>Dernière</emphasis> connexion."
 
-#: lastlog.8.xml:99(title) groups.1.xml:36(title) chsh.1.xml:77(title)
-#: chage.1.xml:164(title)
+#: lastlog.8.xml:127(para)
+msgid ""
+"Only the entries for the current users of the system will be displayed. "
+"Other entries may exist for users that were deleted previously."
+msgstr ""
+
+#: lastlog.8.xml:135(title) groups.1.xml:65(title) chsh.1.xml:106(title)
+#: chage.1.xml:193(title)
 msgid "NOTE"
 msgstr "NOTE"
 
-#: lastlog.8.xml:100(para)
+#: lastlog.8.xml:136(para)
 msgid ""
 "The <filename>lastlog</filename> file is a database which contains info on "
 "the last login of each user. You should not rotate it. It is a sparse file, "
@@ -5921,16 +6545,16 @@
 "gros fichier si vous avez des utilisateurs avec des UID élevés). Vous pouvez "
 "afficher sa taille réelle avec « <command>ls -s</command> »."
 
-#: lastlog.8.xml:114(filename)
+#: lastlog.8.xml:150(filename)
 msgid "/var/log/lastlog"
 msgstr "/var/log/lastlog"
 
-#: lastlog.8.xml:116(para)
+#: lastlog.8.xml:152(para)
 msgid "Database times of previous user logins."
 msgstr ""
 "Base de données de l'heure des connexions précédentes des utilisateurs."
 
-#: lastlog.8.xml:124(para)
+#: lastlog.8.xml:160(para)
 msgid ""
 "Large gaps in UID numbers will cause the lastlog program to run longer with "
 "no output to the screen (i.e. if in lastlog database there is no entries for "
@@ -5943,15 +6567,15 @@
 "base de données lastlog, le programme lastlog semblera bloqué comme s'il "
 "traitait les entrées correspondant aux UID 171 à 799)."
 
-#: gshadow.5.xml:5(refentrytitle) gshadow.5.xml:10(refname)
+#: gshadow.5.xml:33(refentrytitle) gshadow.5.xml:38(refname)
 msgid "gshadow"
 msgstr "gshadow"
 
-#: gshadow.5.xml:11(refpurpose)
+#: gshadow.5.xml:39(refpurpose)
 msgid "shadowed group file"
 msgstr "informations cachées sur les groupes"
 
-#: gshadow.5.xml:16(para)
+#: gshadow.5.xml:44(para)
 msgid ""
 "<filename>/etc/gshadow</filename> contains the shadowed information for "
 "group accounts. It contains lines with the following colon-separated fields:"
@@ -5960,19 +6584,19 @@
 "groupes. Il contient des lignes avec les champs suivant séparés par des deux-"
 "points :"
 
-#: gshadow.5.xml:23(para)
+#: gshadow.5.xml:51(para)
 msgid "group name"
 msgstr "nom du groupe"
 
-#: gshadow.5.xml:29(para)
+#: gshadow.5.xml:57(para)
 msgid "comma-separated list of group administrators"
 msgstr "liste d'administrateurs du groupe séparés par des virgules"
 
-#: gshadow.5.xml:32(para)
+#: gshadow.5.xml:60(para)
 msgid "comma-separated list of group members"
 msgstr "liste des membres du groupe séparés par des virgules"
 
-#: gshadow.5.xml:36(para)
+#: gshadow.5.xml:64(para)
 msgid ""
 "The group name and password fields must be filled. The encrypted password "
 "consists of characters from the 64-character alphabet a thru z, A thru Z, 0 "
@@ -5998,7 +6622,7 @@
 "<citerefentry><refentrytitle>pam</refentrytitle><manvolnum>7</manvolnum></"
 "citerefentry>."
 
-#: gshadow.5.xml:49(para)
+#: gshadow.5.xml:77(para)
 msgid ""
 "This information supersedes any password present in <filename>/etc/group</"
 "filename>."
@@ -6006,26 +6630,41 @@
 "Ces informations sont prioritaires sur tous les autres champs présents dans "
 "<filename>/etc/group</filename>."
 
-#: gshadow.5.xml:80(para)
+#: gshadow.5.xml:108(para)
 #, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>group</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>grpconv</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</manvolnum></"
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: grpck.8.xml:15(refpurpose)
+#: grpck.8.xml:44(refpurpose)
 msgid "verify integrity of group files"
 msgstr "Vérifier l'intégrité des fichiers d'administration des groupes"
 
-#: grpck.8.xml:41(para)
+#: grpck.8.xml:70(para)
 #, fuzzy
 msgid ""
 "The <command>grpck</command> command verifies the integrity of the system "
@@ -6043,15 +6682,15 @@
 "demandée pour détruire les entrées mal formatées ou ayant d'autres erreurs "
 "non récupérables."
 
-#: grpck.8.xml:58(para)
+#: grpck.8.xml:87(para)
 msgid "a unique group name"
 msgstr "unicité des noms de groupe"
 
-#: grpck.8.xml:61(para)
+#: grpck.8.xml:90(para)
 msgid "a valid list of members and administrators"
 msgstr "validité des membres et administrateurs"
 
-#: grpck.8.xml:65(para)
+#: grpck.8.xml:94(para)
 msgid ""
 "The checks for correct number of fields and unique group name are fatal. If "
 "the entry has the wrong number of fields, the user will be prompted to "
@@ -6070,7 +6709,7 @@
 "Toutes les autres erreurs ne sont que des avertissements et l'utilisateur "
 "est encouragé à utiliser <command>groupmod</command> pour les corriger."
 
-#: grpck.8.xml:76(para)
+#: grpck.8.xml:105(para)
 msgid ""
 "The commands which operate on the <filename>/etc/group</filename> file are "
 "not able to alter corrupted or duplicated entries. <command>grpck</command> "
@@ -6080,21 +6719,21 @@
 "peuvent pas modifier les entrées corrompues ou redondantes. <command>Grpck</"
 "command> doit être utilisé dans ce cas pour supprimer ces entrées."
 
-#: grpck.8.xml:86(para)
+#: grpck.8.xml:115(para)
 #, fuzzy
 #| msgid "The options which apply to the <command>pwck</command> command are:"
 msgid "The options which apply to the <command>grpck</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>pwck</command> sont :"
 
-#: grpck.8.xml:93(para)
+#: grpck.8.xml:122(para)
 msgid ""
 "Execute the <command>grpck</command> command in read-only mode. This causes "
 "all questions regarding changes to be answered <emphasis>no</emphasis> "
 "without user intervention."
 msgstr ""
 
-#: grpck.8.xml:103(para)
+#: grpck.8.xml:132(para)
 #, fuzzy
 #| msgid ""
 #| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
@@ -6106,7 +6745,7 @@
 "Trie les entrées de <filename>/etc/passwd</filename> et <filename>/etc/"
 "shadow</filename> par UID."
 
-#: grpck.8.xml:112(para)
+#: grpck.8.xml:141(para)
 #, fuzzy
 #| msgid ""
 #| "By default, <command>pwck</command> operates on the files <filename>/etc/"
@@ -6127,53 +6766,46 @@
 "\">fichier_passwd</emphasis> et <emphasis remap=\"I\">fichier_shadow</"
 "emphasis>."
 
-#: grpck.8.xml:162(para)
+#: grpck.8.xml:191(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
-#| "citerefentry>, <citerefentry><refentrytitle>group</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum>, </"
-"citerefentry><citerefentry><refentrytitle>passwd</"
+"citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
+"condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum>, </citerefentry><citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>groupmod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>shadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>group</"
+"<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
+"citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 
-#: grpck.8.xml:201(para)
+#: grpck.8.xml:233(para)
 msgid "one or more bad group entries"
 msgstr "une entrée de groupe ou plus est incorrecte"
 
-#: grpck.8.xml:207(para)
+#: grpck.8.xml:239(para)
 msgid "can't open group files"
 msgstr "impossible d'ouvrir les fichiers group"
 
-#: grpck.8.xml:213(para)
+#: grpck.8.xml:245(para)
 msgid "can't lock group files"
 msgstr "impossible de verrouiller les fichiers group"
 
-#: grpck.8.xml:219(para)
+#: grpck.8.xml:251(para)
 msgid "can't update group files"
 msgstr "impossible de mettre à jour les fichiers group"
 
-#: grpck.8.xml:183(para)
+#: grpck.8.xml:215(para)
 msgid ""
 "The <command>grpck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6181,21 +6813,20 @@
 "La commande <command>grpck</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: groups.1.xml:5(refentrytitle) groups.1.xml:10(refname)
-#: groups.1.xml:16(command)
+#: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
+#: groups.1.xml:45(command)
 msgid "groups"
 msgstr "groups"
 
-#: groups.1.xml:11(refpurpose)
+#: groups.1.xml:40(refpurpose)
 msgid "display current group names"
 msgstr "Afficher la liste des groupes auxquels appartient l'utilisateur"
 
-#: groups.1.xml:18(replaceable) gpasswd.1.xml:94(replaceable)
-#: gpasswd.1.xml:107(replaceable) chfn.1.xml:29(replaceable)
+#: groups.1.xml:47(replaceable) chfn.1.xml:58(replaceable)
 msgid "user"
 msgstr "utilisateur"
 
-#: groups.1.xml:25(para)
+#: groups.1.xml:54(para)
 #, fuzzy
 msgid ""
 "The <command>groups</command> command displays the current group names or ID "
@@ -6211,7 +6842,7 @@
 "\">utilisateur</emphasis> permet d'afficher la liste des groupes pour cet "
 "utilisateur."
 
-#: groups.1.xml:37(para)
+#: groups.1.xml:66(para)
 msgid ""
 "Systems which do not support concurrent group sets will have the information "
 "from <filename>/etc/group</filename> reported. The user must use "
@@ -6223,7 +6854,7 @@
 "affichées. L'utilisateur doit utiliser <command>newgrp</command> ou "
 "<command>sg</command> pour modifier l'identifiant de groupe réel et effectif."
 
-#: groups.1.xml:59(para)
+#: groups.1.xml:88(para)
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getgid</"
@@ -6239,15 +6870,15 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getuid</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 
-#: groupmod.8.xml:15(refpurpose)
+#: groupmod.8.xml:44(refpurpose)
 msgid "modify a group definition on the system"
 msgstr "Modifier la définition d'un groupe du système"
 
-#: groupmod.8.xml:24(replaceable)
+#: groupmod.8.xml:53(replaceable)
 msgid "GROUP"
 msgstr "GROUPE"
 
-#: groupmod.8.xml:30(para)
+#: groupmod.8.xml:59(para)
 #, fuzzy
 msgid ""
 "The <command>groupmod</command> command modifies the definition of the "
@@ -6258,18 +6889,18 @@
 "<replaceable>GROUPE</replaceable> spécifié en modifiant l'entrée "
 "correspondante de la base de données des groupes."
 
-#: groupmod.8.xml:39(para)
+#: groupmod.8.xml:68(para)
 msgid "The options which apply to the <command>groupmod</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>groupmod</command> sont :"
 
-#: groupmod.8.xml:45(term) groupadd.8.xml:66(term)
+#: groupmod.8.xml:74(term) groupadd.8.xml:92(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option> <replaceable>GID</replaceable>"
 
-#: groupmod.8.xml:49(para)
+#: groupmod.8.xml:78(para)
 #, fuzzy
 msgid ""
 "The group ID of the given <replaceable>GROUP</replaceable> will be changed "
@@ -6288,7 +6919,7 @@
 "réservées aux comptes système. Vous devrez modifier vous-même le groupe "
 "propriétaire de tous les fichiers possédés par ce groupe."
 
-#: groupmod.8.xml:70(term)
+#: groupmod.8.xml:99(term)
 msgid ""
 "<option>-n</option>, <option>--new-name</option><replaceable>NEW_GROUP</"
 "replaceable>"
@@ -6296,7 +6927,7 @@
 "<option>-n</option>, <option>--new-name</option> "
 "<replaceable>NOUVEAU_NOM_GROUPE</replaceable>"
 
-#: groupmod.8.xml:75(para)
+#: groupmod.8.xml:104(para)
 msgid ""
 "The name of the group will be changed from <replaceable>GROUP</replaceable> "
 "to <replaceable>NEW_GROUP</replaceable> name."
@@ -6304,7 +6935,7 @@
 "Le nom du groupe sera modifié de <emphasis remap=\"I\">GROUPE</emphasis> "
 "vers <emphasis remap=\"I\">NOUVEAU_NOM_GROUPE</emphasis>."
 
-#: groupmod.8.xml:86(para)
+#: groupmod.8.xml:115(para)
 #, fuzzy
 msgid ""
 "When used with the <option>-g</option> option, allow to change the group "
@@ -6313,7 +6944,7 @@
 "En combinaison avec l'option <option>-g</option>, cette option permet de "
 "changer l'identifiant du groupe vers une valeur déjà utilisée."
 
-#: groupmod.8.xml:98(para) groupadd.8.xml:122(para)
+#: groupmod.8.xml:127(para) groupadd.8.xml:148(para)
 #, fuzzy
 #| msgid ""
 #| "The encrypted password, as returned by "
@@ -6328,11 +6959,11 @@
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>. Le comportement par défaut est de désactiver le compte."
 
-#: groupmod.8.xml:176(para)
+#: groupmod.8.xml:205(para)
 msgid "group name already in use"
 msgstr "nom de groupe déjà utilisé"
 
-#: groupmod.8.xml:140(para)
+#: groupmod.8.xml:169(para)
 msgid ""
 "The <command>groupmod</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6340,7 +6971,7 @@
 "La commande <command>groupmod</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: groupmod.8.xml:191(para)
+#: groupmod.8.xml:220(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6372,32 +7003,35 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: groupmems.8.xml:15(refpurpose)
+#: groupmems.8.xml:44(refpurpose)
 msgid "administer members of a user's primary group"
 msgstr "Administrer les membres du groupe primaire d'un utilisateur"
 
-#: groupmems.8.xml:22(replaceable) groupmems.8.xml:23(replaceable)
-#: groupmems.8.xml:53(replaceable) groupmems.8.xml:59(replaceable)
+#: groupmems.8.xml:51(replaceable) groupmems.8.xml:52(replaceable)
 msgid "user_name"
 msgstr "nom_utilisateur"
 
-#: groupmems.8.xml:22(arg)
+#: groupmems.8.xml:51(arg)
 msgid "-a <placeholder-1/>"
 msgstr "-a <placeholder-1/>"
 
-#: groupmems.8.xml:23(arg)
+#: groupmems.8.xml:52(arg)
 msgid "-d <placeholder-1/>"
 msgstr "-d <placeholder-1/>"
 
-#: groupmems.8.xml:25(replaceable) groupmems.8.xml:71(replaceable)
+#: groupmems.8.xml:53(replaceable)
 msgid "group_name"
 msgstr "nom_groupe"
 
-#: groupmems.8.xml:25(arg) groupadd.8.xml:24(arg)
+#: groupmems.8.xml:53(arg)
 msgid "-g <placeholder-1/>"
 msgstr "-g <placeholder-1/>"
 
-#: groupmems.8.xml:32(para)
+#: groupmems.8.xml:54(arg)
+msgid "-l"
+msgstr "-l"
+
+#: groupmems.8.xml:61(para)
 #, fuzzy
 msgid ""
 "The <command>groupmems</command> command allows a user to administer his/her "
@@ -6412,7 +7046,7 @@
 "sorte qu'ils soient responsable de leur groupe primaire (par exemple guest/"
 "guest)."
 
-#: groupmems.8.xml:40(para)
+#: groupmems.8.xml:69(para)
 #, fuzzy
 msgid ""
 "Only the superuser, as administrator, can use <command>groupmems</command> "
@@ -6422,50 +7056,95 @@
 "<command>groupmems</command> pour modifier la liste des membres d'un autre "
 "groupe."
 
-#: groupmems.8.xml:47(para)
+#: groupmems.8.xml:76(para)
 msgid ""
 "The options which apply to the <command>groupmems</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>groupmems</command> sont :"
 
-#: groupmems.8.xml:53(option) gpasswd.1.xml:94(option)
-msgid "-a"
-msgstr "-a"
+#: groupmems.8.xml:82(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+msgid ""
+"<option>-a</option>, <option>--add</option><replaceable>user_name</"
+"replaceable>"
+msgstr ""
+"<option>-u</option>, <option>--uid</option> <replaceable>UID</replaceable>"
 
-#: groupmems.8.xml:55(para)
-msgid "Add a new user to the group membership list."
+#: groupmems.8.xml:84(para)
+#, fuzzy
+#| msgid "Add a new user to the group membership list."
+msgid "Add an user to the group membership list."
 msgstr "Ajouter un nouvel utilisateur à la liste des membres du groupe."
 
-#: groupmems.8.xml:59(option) gpasswd.1.xml:107(option)
-msgid "-d"
-msgstr "-d"
+#: groupmems.8.xml:85(para) groupmems.8.xml:101(para)
+#: groupmems.8.xml:126(para)
+msgid ""
+"If the <filename>/etc/gshadow</filename> file exist, and the group has no "
+"entry in the <filename>/etc/gshadow</filename> file, a new entry will be "
+"created."
+msgstr ""
 
-#: groupmems.8.xml:61(para)
+#: groupmems.8.xml:93(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-d</option>, <option>--delete</option><replaceable>user_name</"
+"replaceable>"
+msgstr ""
+"<option>-t</option>, <option>--time</option> <replaceable>JOURS</replaceable>"
+
+#: groupmems.8.xml:95(para)
 msgid "Delete a user from the group membership list."
 msgstr "Supprimer un utilisateur de la liste des membres du groupe."
 
-#: groupmems.8.xml:67(para)
-msgid "Purge all users from the group membership list."
-msgstr "Supprimer tous les utilisateurs de la liste des membres du groupe."
+#: groupmems.8.xml:96(para)
+msgid ""
+"If the <filename>/etc/gshadow</filename> file exist, the user will be "
+"removed from the list of members and administrators of the group."
+msgstr ""
 
-#: groupmems.8.xml:71(option)
-msgid "-g"
-msgstr "-g"
+#: groupmems.8.xml:109(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
+msgid ""
+"<option>-g</option>, <option>--group</option><replaceable>group_name</"
+"replaceable>"
+msgstr ""
+"<option>-g</option>, <option>--gid</option> <replaceable>GID</replaceable>"
 
-#: groupmems.8.xml:73(para)
+#: groupmems.8.xml:111(para)
 #, fuzzy
 msgid "The superuser can specify which group membership list to modify."
 msgstr "Le superutilisateur peut préciser la liste des groupes à modifier."
 
-#: groupmems.8.xml:81(para)
+#: groupmems.8.xml:117(term) chage.1.xml:128(term)
+msgid "<option>-l</option>, <option>--list</option>"
+msgstr "<option>-l</option>, <option>--list</option>"
+
+#: groupmems.8.xml:119(para)
 msgid "List the group membership list."
 msgstr "Afficher la liste des membres du groupe."
 
-#: groupmems.8.xml:88(title)
+#: groupmems.8.xml:123(term)
+#, fuzzy
+#| msgid "<option>-e</option>, <option>--expire</option>"
+msgid "<option>-p</option>, <option>--purge</option>"
+msgstr "<option>-e</option>, <option>--expire</option>"
+
+#: groupmems.8.xml:125(para)
+msgid "Purge all users from the group membership list."
+msgstr "Supprimer tous les utilisateurs de la liste des membres du groupe."
+
+#: groupmems.8.xml:137(title)
 msgid "SETUP"
 msgstr "CONFIGURATION"
 
-#: groupmems.8.xml:89(para)
+#: groupmems.8.xml:138(para)
 msgid ""
 "The <command>groupmems</command> executable should be in mode <literal>2770</"
 "literal> as user <emphasis>root</emphasis> and in group <emphasis>groups</"
@@ -6480,7 +7159,7 @@
 "leur interdire d'utiliser <command>groupmems</command> pour gérer leur "
 "propre liste de membres du groupe."
 
-#: groupmems.8.xml:98(programlisting)
+#: groupmems.8.xml:147(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -6497,11 +7176,11 @@
 "\t$ groupmems -g groups -a gk4\n"
 "    "
 
-#: groupmems.8.xml:130(para)
+#: groupmems.8.xml:179(para)
 msgid "secure group account information"
 msgstr "informations cachées sur les groupes"
 
-#: groupmems.8.xml:138(para)
+#: groupmems.8.xml:187(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6529,11 +7208,11 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: groupdel.8.xml:15(refpurpose)
+#: groupdel.8.xml:44(refpurpose)
 msgid "delete a group"
 msgstr "Supprimer un groupe"
 
-#: groupdel.8.xml:29(para)
+#: groupdel.8.xml:58(para)
 msgid ""
 "The <command>groupdel</command> command modifies the system account files, "
 "deleting all entries that refer to <emphasis remap=\"I\">group</emphasis>. "
@@ -6544,7 +7223,7 @@
 "réfèrent à <emphasis remap=\"I\">groupe</emphasis>. Le groupe indiqué doit "
 "exister."
 
-#: groupdel.8.xml:34(para)
+#: groupdel.8.xml:63(para)
 msgid ""
 "You must manually check all file systems to insure that no files remain with "
 "the named group as the file group ID."
@@ -6552,7 +7231,7 @@
 "Vous devez vérifier vous-même qu'aucun fichier possédé par le groupe ne "
 "subsiste sur tous les systèmes de fichiers."
 
-#: groupdel.8.xml:41(para)
+#: groupdel.8.xml:70(para)
 msgid ""
 "You may not remove the primary group of any existing user. You must remove "
 "the user before you remove the group."
@@ -6560,11 +7239,11 @@
 "Vous ne pouvez pas supprimer le groupe primaire d'un utilisateur existant. "
 "Vous devez supprimer l'utilisateur auparavant."
 
-#: groupdel.8.xml:102(para)
+#: groupdel.8.xml:131(para)
 msgid "can't remove user's primary group"
 msgstr "impossible de supprimer le groupe primaire d'un utilisateur existant"
 
-#: groupdel.8.xml:78(para)
+#: groupdel.8.xml:107(para)
 msgid ""
 "The <command>groupdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6572,7 +7251,7 @@
 "La commande <command>groupdel</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: groupdel.8.xml:117(para)
+#: groupdel.8.xml:146(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6604,31 +7283,11 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>"
 
-#: groupadd.8.xml:17(refpurpose)
+#: groupadd.8.xml:48(refpurpose)
 msgid "create a new group"
 msgstr "Créer un nouveau groupe"
 
-#: groupadd.8.xml:24(replaceable)
-msgid "GID"
-msgstr "GID"
-
-#: groupadd.8.xml:25(arg)
-msgid "-o"
-msgstr "-o"
-
-#: groupadd.8.xml:28(replaceable)
-msgid "KEY"
-msgstr "CLÉ"
-
-#: groupadd.8.xml:28(replaceable)
-msgid "VALUE"
-msgstr "VALEUR"
-
-#: groupadd.8.xml:28(arg)
-msgid "-K <placeholder-1/>=<placeholder-2/>"
-msgstr "-K <placeholder-1/>=<placeholder-2/>"
-
-#: groupadd.8.xml:37(para)
+#: groupadd.8.xml:63(para)
 #, fuzzy
 msgid ""
 "The <command>groupadd</command> command creates a new group account using "
@@ -6640,12 +7299,12 @@
 "défaut du système. Le nouveau groupe sera inséré dans les fichiers du "
 "système selon les besoins."
 
-#: groupadd.8.xml:46(para)
+#: groupadd.8.xml:72(para)
 msgid "The options which apply to the <command>groupadd</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>groupadd</command> sont :"
 
-#: groupadd.8.xml:56(para)
+#: groupadd.8.xml:82(para)
 #, fuzzy
 msgid ""
 "This option causes the command to simply exit with success status if the "
@@ -6658,7 +7317,7 @@
 "option>, si le groupe indiqué existe déjà, un autre gid (non utilisé) sera "
 "choisi (c.-à-d. que <option>-g</option> est désactivée)."
 
-#: groupadd.8.xml:70(para)
+#: groupadd.8.xml:96(para)
 msgid ""
 "The numerical value of the group's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. The "
@@ -6674,7 +7333,7 @@
 "réservées aux comptes système."
 
 # NOTE: missing <filename>
-#: groupadd.8.xml:90(para)
+#: groupadd.8.xml:116(para)
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (GID_MIN, GID_MAX "
 "and others). Multiple <option>-K</option> options can be specified."
@@ -6683,7 +7342,7 @@
 "filename> (GID_MIN, GID_MAX et autres). L'option <option>-K</option> peut "
 "être indiquée plusieurs fois."
 
-#: groupadd.8.xml:95(para)
+#: groupadd.8.xml:121(para)
 msgid ""
 "Example: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>100</replaceable><option> -K </"
@@ -6693,7 +7352,7 @@
 "replaceable>=<replaceable>10</replaceable> <option>-K</option> "
 "<replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 
-#: groupadd.8.xml:99(para)
+#: groupadd.8.xml:125(para)
 msgid ""
 "Note: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</"
@@ -6703,18 +7362,18 @@
 "replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</"
 "replaceable>=<replaceable>499</replaceable> ne fonctionne pas pour l'instant."
 
-#: groupadd.8.xml:111(para)
+#: groupadd.8.xml:137(para)
 #, fuzzy
 msgid "This option permits to add a group with a non-unique GID."
 msgstr "Permet de créer un groupe avec un identifiant (« GID ») déjà utilisé."
 
-#: groupadd.8.xml:134(para)
+#: groupadd.8.xml:160(para)
 #, fuzzy
 #| msgid "create a new group"
 msgid "Create a system group."
 msgstr "Créer un nouveau groupe"
 
-#: groupadd.8.xml:137(para)
+#: groupadd.8.xml:163(para)
 msgid ""
 "The numeric identifiers of new system groups are choosen in the "
 "<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
@@ -6723,22 +7382,29 @@
 msgstr ""
 
 # NOTE: +digits
-#: groupadd.8.xml:188(para)
+#: groupadd.8.xml:214(para)
+#, fuzzy
+#| msgid ""
+#| "Groupnames must begin with a lower case letter or an underscore, and only "
+#| "lower case letters, underscores, dashes, and dollar signs may follow. In "
+#| "regular expression terms: [a-z_][a-z0-9_-]*[$]"
 msgid ""
 "Groupnames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
-"regular expression terms: [a-z_][a-z0-9_-]*[$]"
+"regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 "Les noms de groupe doivent commencer par une lettre minuscule ou un tiret "
 "bas (« underscore »), et seuls des lettres minuscules, des chiffres, des "
 "« underscore », des tirets ou un dollar peuvent suivre. Soit, sous la forme "
 "d'une expression rationnelle : [a-z_][a-z0-9_-]*[$]"
 
-#: groupadd.8.xml:193(para)
-msgid "Groupnames may only be up to 16 characters long."
+#: groupadd.8.xml:219(para)
+#, fuzzy
+#| msgid "Groupnames may only be up to 16 characters long."
+msgid "Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long."
 msgstr "Les noms de groupe sont limités à 16 caractères."
 
-#: groupadd.8.xml:196(para)
+#: groupadd.8.xml:222(para)
 #, fuzzy
 msgid ""
 "You may not add a NIS or LDAP group. This must be performed on the "
@@ -6747,7 +7413,7 @@
 "Vous ne pouvez pas ajouter d'utilisateur à un groupe NIS. Cela doit être "
 "effectué sur le serveur NIS."
 
-#: groupadd.8.xml:200(para)
+#: groupadd.8.xml:226(para)
 #, fuzzy
 msgid ""
 "If the groupname already exists in an external group database such as NIS or "
@@ -6756,15 +7422,15 @@
 "Si le nom du groupe existe dans une base de données externe, telle que NIS, "
 "<command>groupadd</command> refusera de créer le groupe."
 
-#: groupadd.8.xml:233(para)
+#: groupadd.8.xml:259(para)
 msgid "GID not unique (when <option>-o</option> not used)"
 msgstr "GID déjà utilisé (et <option>-o</option> n'est pas utilisé)"
 
-#: groupadd.8.xml:239(para)
+#: groupadd.8.xml:265(para)
 msgid "group name not unique"
 msgstr "nom de groupe déjà utilisé"
 
-#: groupadd.8.xml:209(para)
+#: groupadd.8.xml:235(para)
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6772,7 +7438,7 @@
 "La commande <command>groupadd</command> retourne les valeurs suivantes en "
 "quittant : <placeholder-1/>"
 
-#: groupadd.8.xml:254(para)
+#: groupadd.8.xml:280(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6806,26 +7472,26 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:21(phrase)
+#: gpasswd.1.xml:50(phrase)
 #, fuzzy
 msgid "and <placeholder-1/> files"
 msgstr "-a <placeholder-1/>"
 
-#: gpasswd.1.xml:23(phrase)
+#: gpasswd.1.xml:52(phrase)
 msgid "file"
 msgstr ""
 
-#: gpasswd.1.xml:19(refpurpose)
+#: gpasswd.1.xml:48(refpurpose)
 #, fuzzy
 msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
 msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
-#: gpasswd.1.xml:31(replaceable)
+#: gpasswd.1.xml:60(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "options"
 
-#: gpasswd.1.xml:41(para)
+#: gpasswd.1.xml:70(para)
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
 "group</filename><phrase condition=\"gshadow\">, and <filename>/etc/gshadow</"
@@ -6833,7 +7499,7 @@
 "\">administrators,</phrase> members and a password."
 msgstr ""
 
-#: gpasswd.1.xml:49(para)
+#: gpasswd.1.xml:78(para)
 #, fuzzy
 msgid ""
 "System administrator can use the <option>-A</option> option to define group "
@@ -6849,7 +7515,7 @@
 "l'option <option>-M</option> pour en définir les membres. Il possède "
 "également tous les droits des administrateurs et des membres du groupe."
 
-#: gpasswd.1.xml:54(para)
+#: gpasswd.1.xml:83(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -6857,7 +7523,7 @@
 "of the <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:61(para)
+#: gpasswd.1.xml:90(para)
 #, fuzzy
 msgid ""
 "If a password is set the members can still "
@@ -6871,11 +7537,11 @@
 "citerefentry> sans mot de passe, tandis que les utilisateurs n'étant pas "
 "membre du groupe devront fournir le mot de passe."
 
-#: gpasswd.1.xml:69(title)
+#: gpasswd.1.xml:98(title)
 msgid "Notes about group passwords"
 msgstr "Notes sur les mots de passe de groupe"
 
-#: gpasswd.1.xml:70(para)
+#: gpasswd.1.xml:99(para)
 msgid ""
 "Group passwords are an inherent security problem since more than one person "
 "is permitted to know the password. However, groups are a useful tool for "
@@ -6886,7 +7552,7 @@
 "Cependant, les groupes sont utiles pour permettre la coopération entre "
 "différents utilisateurs."
 
-#: gpasswd.1.xml:81(para)
+#: gpasswd.1.xml:110(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
@@ -6895,76 +7561,114 @@
 "Les options <option>-r</option>, <option>-h</option> et <option>-f</option> "
 "ne peuvent être utilisées que par root."
 
-#: gpasswd.1.xml:85(para)
+#: gpasswd.1.xml:114(para)
 msgid "The options cannot be combined."
 msgstr ""
 
-#: gpasswd.1.xml:88(para)
+#: gpasswd.1.xml:117(para)
 #, fuzzy
 msgid "The options which apply to the <command>gpasswd</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>passwd</command> sont :"
 
-#: gpasswd.1.xml:97(para)
+#: gpasswd.1.xml:122(term)
 #, fuzzy
+#| msgid ""
+#| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgid ""
+"<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
+msgstr ""
+"<option>-u</option>, <option>--uid</option> <replaceable>UID</replaceable>"
+
+#: gpasswd.1.xml:126(para)
+#, fuzzy
+msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
 "replaceable>."
 msgstr ""
 "Le nom du groupe sera modifié de <emphasis remap=\"I\">GROUPE</emphasis> "
 "vers <emphasis remap=\"I\">NOUVEAU_NOM_GROUPE</emphasis>."
 
-#: gpasswd.1.xml:110(para)
+#: gpasswd.1.xml:135(term)
 #, fuzzy
+#| msgid ""
+#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
+#| "replaceable>"
 msgid ""
+"<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
+msgstr ""
+"<option>-t</option>, <option>--time</option> <replaceable>JOURS</replaceable>"
+
+#: gpasswd.1.xml:139(para)
+#, fuzzy
+msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
 "<replaceable>group</replaceable>."
 msgstr ""
 "Le nom du groupe sera modifié de <emphasis remap=\"I\">GROUPE</emphasis> "
 "vers <emphasis remap=\"I\">NOUVEAU_NOM_GROUPE</emphasis>."
 
-#: gpasswd.1.xml:123(para)
+#: gpasswd.1.xml:148(term)
+#, fuzzy
+#| msgid "<option>-r</option>, <option>--remove</option>"
+msgid "<option>-r</option>, <option>--remove-password</option>"
+msgstr "<option>-r</option>, <option>--remove</option>"
+
+#: gpasswd.1.xml:152(para)
 msgid ""
 "Remove the password from the named <replaceable>group</replaceable>. Only "
 "group members will be allowed to use <command>newgrp</command> to join the "
 "named <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:135(option)
+#: gpasswd.1.xml:163(term)
 #, fuzzy
-msgid "-R"
-msgstr "-"
+#| msgid "<option>-r</option>, <option>--reset</option>"
+msgid "<option>-R</option>, <option>--restrict</option>"
+msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: gpasswd.1.xml:138(para)
+#: gpasswd.1.xml:167(para)
 msgid ""
 "Restrict the access to the named <replaceable>group</replaceable>. Only "
 "group members will be allowed to use <command>newgrp</command> to join the "
 "named <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:149(term)
+#: gpasswd.1.xml:178(term)
 #, fuzzy
-msgid "<option>-A</option><replaceable>user</replaceable>,..."
+#| msgid ""
+#| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-A</option>, <option>--administrators</option><replaceable>user</"
+"replaceable>,..."
 msgstr ""
-"<option>-u</option>, <option>--uid</option> <replaceable>UID</replaceable>"
+"<option>-m</option>, <option>--mindays</option> <replaceable>JOURS_MIN</"
+"replaceable>"
 
-#: gpasswd.1.xml:153(para)
+#: gpasswd.1.xml:182(para)
 #, fuzzy
 msgid "Set the list of administrative users."
 msgstr "liste d'administrateurs du groupe séparés par des virgules"
 
-#: gpasswd.1.xml:161(term)
+#: gpasswd.1.xml:190(term)
 #, fuzzy
-msgid "<option>-M</option><replaceable>user</replaceable>,..."
+#| msgid ""
+#| "<option>-b</option>, <option>--before</option><replaceable>DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-M</option>, <option>--members</option><replaceable>user</"
+"replaceable>,..."
 msgstr ""
-"<option>-u</option>, <option>--uid</option> <replaceable>UID</replaceable>"
+"<option>-b</option>, <option>--before</option> <replaceable>JOURS</"
+"replaceable>"
 
-#: gpasswd.1.xml:165(para)
+#: gpasswd.1.xml:194(para)
 #, fuzzy
 msgid "Set the list of group members."
 msgstr "liste des membres du groupe séparés par des virgules"
 
-#: gpasswd.1.xml:175(para)
+#: gpasswd.1.xml:204(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -6973,7 +7677,7 @@
 "server."
 msgstr ""
 
-#: gpasswd.1.xml:220(para)
+#: gpasswd.1.xml:249(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
@@ -7000,18 +7704,18 @@
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: faillog.8.xml:5(refentrytitle) faillog.8.xml:10(refname)
-#: faillog.8.xml:16(command) faillog.5.xml:5(refentrytitle)
-#: faillog.5.xml:10(refname) faillog.5.xml:53(refentrytitle)
+#: faillog.8.xml:34(refentrytitle) faillog.8.xml:39(refname)
+#: faillog.8.xml:45(command) faillog.5.xml:34(refentrytitle)
+#: faillog.5.xml:39(refname) faillog.5.xml:82(refentrytitle)
 msgid "faillog"
 msgstr "faillog"
 
-#: faillog.8.xml:11(refpurpose)
+#: faillog.8.xml:40(refpurpose)
 msgid "display faillog records or set login failure limits"
 msgstr ""
 "Examiner le fichier faillog, et fixer les limites d'échecs de connexion"
 
-#: faillog.8.xml:25(para)
+#: faillog.8.xml:54(para)
 msgid ""
 "<command>faillog</command> formats the contents of the failure log from "
 "<filename>/var/log/faillog</filename> database. It also can be used for "
@@ -7025,16 +7729,18 @@
 "argument n'affiche que la liste des échecs des utilisateurs qui ont déjà eu "
 "un échec de connexion."
 
-#: faillog.8.xml:36(para)
+#: faillog.8.xml:65(para)
 msgid "The options which apply to the <command>faillog</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>faillog</command> sont :"
 
-#: faillog.8.xml:44(para)
-msgid "Display faillog records for all users."
-msgstr "Afficher les échecs de tous les utilisateurs."
+#: faillog.8.xml:73(para)
+msgid ""
+"Display (or act on) faillog records for all users having an entry in the "
+"<filename>faillog</filename> database."
+msgstr ""
 
-#: faillog.8.xml:54(term)
+#: faillog.8.xml:86(term)
 msgid ""
 "<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
 "replaceable>"
@@ -7043,79 +7749,116 @@
 "replaceable>"
 
 # NOTE: s/to/during/
-#: faillog.8.xml:59(para)
+#: faillog.8.xml:91(para)
 msgid ""
 "Lock account to <replaceable>SEC</replaceable> seconds after failed login."
 msgstr ""
 "Verrouiller le compte pendant <replaceable>SEC</replaceable> secondes après "
 "un échec de connexion."
 
-#: faillog.8.xml:66(term)
+#: faillog.8.xml:95(para) faillog.8.xml:121(para) faillog.8.xml:135(para)
 msgid ""
+"Write access to <filename>/var/log/faillog</filename> is required for this "
+"option."
+msgstr ""
+
+#: faillog.8.xml:102(term)
+msgid ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--maximum</option> <replaceable>MAX</"
 "replaceable>"
 
-#: faillog.8.xml:71(para)
+#: faillog.8.xml:107(para)
 msgid ""
 "Set maximum number of login failures after the account is disabled to "
-"<replaceable>MAX</replaceable>. Selecting <replaceable>MAX</replaceable> "
-"value of 0 has the effect of not placing a limit on the number of failed "
-"logins. The maximum failure count should always be 0 for <emphasis>root</"
-"emphasis> to prevent a denial of services attack against the system."
+"<replaceable>MAX</replaceable>."
 msgstr ""
-"Fixer le nombre maximum d'échecs de connexion après lesquels le compte sera "
-"désactivé à <emphasis remap=\"I\">MAX</emphasis>. Une limite "
-"<replaceable>MAX</replaceable> de 0 aura pour effet de ne pas placer de "
-"limite d'échec. La limite pour l'utilisateur <emphasis>root</emphasis> "
-"devrait toujours être 0 pour éviter tout risque de déni de service contre le "
-"système."
 
-#: faillog.8.xml:82(term)
+#: faillog.8.xml:111(para)
+msgid ""
+"Selecting a <replaceable>MAX</replaceable> value of 0 has the effect of not "
+"placing a limit on the number of failed logins."
+msgstr ""
+
+#: faillog.8.xml:116(para)
+msgid ""
+"The maximum failure count should always be 0 for <emphasis>root</emphasis> "
+"to prevent a denial of services attack against the system."
+msgstr ""
+
+#: faillog.8.xml:128(term)
 msgid "<option>-r</option>, <option>--reset</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: faillog.8.xml:84(para)
+#: faillog.8.xml:130(para)
+#, fuzzy
+#| msgid ""
+#| "Reset the counters of login failures or one record if used with the "
+#| "<option>-u</option><replaceable>LOGIN</replaceable> option. Write access "
+#| "to <filename>/var/log/faillog</filename> is required for this option."
 msgid ""
 "Reset the counters of login failures or one record if used with the <option>-"
-"u</option><replaceable>LOGIN</replaceable> option. Write access to "
-"<filename>/var/log/faillog</filename> is required for this option."
+"u</option><replaceable>LOGIN</replaceable> option."
 msgstr ""
 "Réinitialiser les compteurs (ou un compteur, si l'option <option>-u</option> "
 "<replaceable>IDENTIFIANT</replaceable> est utilisée) des échecs de "
 "connexion. L'accès en écriture sur <filename>/var/log/faillog</filename> est "
 "nécessaire pour cette option."
 
-#: faillog.8.xml:97(para)
+#: faillog.8.xml:146(para)
+#, fuzzy
+#| msgid ""
+#| "Display faillog records more recent than <replaceable>DAYS</replaceable>. "
+#| "The <option>-t</option> flag overrides the use of <option>-u</option>."
 msgid ""
-"Display faillog records more recent than <replaceable>DAYS</replaceable>. "
-"The <option>-t</option> flag overrides the use of <option>-u</option>."
+"Display faillog records more recent than <replaceable>DAYS</replaceable>."
 msgstr ""
 "Afficher les entrées de faillog plus récentes que <replaceable>JOURS</"
 "replaceable>. L'option <option>-t</option> surcharge l'utilisation de "
 "l'option <option>-u</option>."
 
-#: faillog.8.xml:105(term)
+#: faillog.8.xml:158(para)
+#, fuzzy
+#| msgid ""
+#| "Display faillog record or maintains failure counters and limits (if used "
+#| "with <option>-l</option>, <option>-m</option> or <option>-r</option> "
+#| "options) only for user with <replaceable>LOGIN</replaceable>."
 msgid ""
-"<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>"
-msgstr ""
-"<option>-u</option>, <option>--user</option> <replaceable>IDENTIFIANT</"
-"replaceable>"
-
-#: faillog.8.xml:109(para)
-msgid ""
 "Display faillog record or maintains failure counters and limits (if used "
 "with <option>-l</option>, <option>-m</option> or <option>-r</option> "
-"options) only for user with <replaceable>LOGIN</replaceable>."
+"options) only for the specified user(s)."
 msgstr ""
 "Afficher l'entrée de faillog ou maintient le décompte et les limitations "
 "(suivant que l'option <option>-l</option>, <option>-m</option> ou <option>-"
 "r</option> est utilisée) seulement pour l'utilisateur "
 "<replaceable>IDENTIFIANT</replaceable>."
 
-#: faillog.8.xml:122(para)
+#: faillog.8.xml:176(para)
+#, fuzzy
+#| msgid ""
+#| "The <option>-r</option>, <option>-h</option> and <option>-f</option> "
+#| "options are only used when <command>login</command> is invoked by root."
 msgid ""
+"When none of the <option>-l</option>, <option>-m</option>, or <option>-r</"
+"option> options are used, <command>faillog</command> displays the faillog "
+"record of the specified user(s)."
+msgstr ""
+"Les options <option>-r</option>, <option>-h</option> et <option>-f</option> "
+"ne peuvent être utilisées que par root."
+
+#: faillog.8.xml:181(para)
+msgid ""
+"NOTE: in display mode, only the records of users which currently exist in "
+"the system are displayed. In the other modes (when the <option>-l</option>, "
+"<option>-m</option>, or <option>-r</option> options are used), the records "
+"of the user, or the range of users, or all the users that may have an entry "
+"in the faillog database will be changed. This is useful to reset records of "
+"users that have been deleted or set a policy in advance for a range of users."
+msgstr ""
+
+#: faillog.8.xml:194(para)
+msgid ""
 "<command>faillog</command> only prints out users with no successful login "
 "since the last failure. To print out a user who has had a successful login "
 "since their last failure, you must explicitly request the user with the "
@@ -7129,15 +7872,15 @@
 "demander l'affichage de tous les utilisateurs avec l'option <option>-a</"
 "option>."
 
-#: faillog.8.xml:135(filename) faillog.5.xml:41(filename)
+#: faillog.8.xml:207(filename) faillog.5.xml:70(filename)
 msgid "/var/log/faillog"
 msgstr "/var/log/faillog"
 
-#: faillog.8.xml:137(para) faillog.5.xml:43(para)
+#: faillog.8.xml:209(para) faillog.5.xml:72(para)
 msgid "Failure logging file."
 msgstr "Journal des échecs de connexion."
 
-#: faillog.8.xml:145(para)
+#: faillog.8.xml:217(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
@@ -7147,11 +7890,11 @@
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: faillog.5.xml:11(refpurpose)
+#: faillog.5.xml:40(refpurpose)
 msgid "login failure logging file"
 msgstr "journal des échecs de connexion"
 
-#: faillog.5.xml:16(para)
+#: faillog.5.xml:45(para)
 msgid ""
 "<filename>/var/log/faillog</filename> maintains a count of login failures "
 "and the limits for each account. The file is fixed length record, indexed by "
@@ -7170,11 +7913,11 @@
 "correspondant au dernier échec de connexion, la date du dernier échec, et le "
 "temps en secondes après lequel le compte sera bloqué après un échec."
 
-#: faillog.5.xml:26(para)
+#: faillog.5.xml:55(para)
 msgid "The structure of the file is:"
 msgstr "La structure du fichier est la suivante :"
 
-#: faillog.5.xml:27(programlisting)
+#: faillog.5.xml:56(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -7194,16 +7937,16 @@
 "\ttime_t  fail_time;     /* date du dernier échec */\n"
 "\tlong    fail_locktime;};"
 
-#: expiry.1.xml:11(refentrytitle) expiry.1.xml:16(refname)
-#: expiry.1.xml:22(command)
+#: expiry.1.xml:41(refentrytitle) expiry.1.xml:46(refname)
+#: expiry.1.xml:52(command)
 msgid "expiry"
 msgstr "expiry"
 
-#: expiry.1.xml:17(refpurpose)
+#: expiry.1.xml:47(refpurpose)
 msgid "check and enforce password expiration policy"
 msgstr "Vérifier et sécuriser la durée de validité des mots de passe"
 
-#: expiry.1.xml:30(para)
+#: expiry.1.xml:60(para)
 #, fuzzy
 msgid ""
 "The <command>expiry</command> command checks (<option>-c</option>) the "
@@ -7215,7 +7958,7 @@
 "<option>-f</option>) des changements quand nécessaire. Il peut être appelé "
 "par un utilisateur normal."
 
-#: expiry.1.xml:57(para) chage.1.xml:233(para)
+#: expiry.1.xml:87(para) chage.1.xml:262(para)
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -7225,11 +7968,11 @@
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: chsh.1.xml:17(refpurpose)
+#: chsh.1.xml:46(refpurpose)
 msgid "change login shell"
 msgstr "Changer l'interpréteur de commandes initial"
 
-#: chsh.1.xml:34(para)
+#: chsh.1.xml:63(para)
 #, fuzzy
 msgid ""
 "The <command>chsh</command> command changes the user login shell. This "
@@ -7243,11 +7986,11 @@
 "associé à son propre compte. Le superutilisateur peut changer l'interpréteur "
 "de commandes initial de n'importe quel compte."
 
-#: chsh.1.xml:45(para)
+#: chsh.1.xml:74(para)
 msgid "The options which apply to the <command>chsh</command> command are:"
 msgstr "Les options applicables à la commande <command>chsh</command> sont :"
 
-#: chsh.1.xml:67(para)
+#: chsh.1.xml:96(para)
 msgid ""
 "If the <option>-s</option> option is not selected, <command>chsh</command> "
 "operates in an interactive fashion, prompting the user with the current "
@@ -7263,7 +8006,7 @@
 "actuel. L'interpréteur actuel est indiqué entre crochets (<emphasis>[ ]</"
 "emphasis>)."
 
-#: chsh.1.xml:78(para)
+#: chsh.1.xml:107(para)
 #, fuzzy
 msgid ""
 "The only restriction placed on the login shell is that the command name must "
@@ -7284,15 +8027,15 @@
 "restreint empêchera alors l'utilisateur de retourner ensuite à "
 "l'interpréteur précédent."
 
-#: chsh.1.xml:113(filename)
+#: chsh.1.xml:142(filename)
 msgid "/etc/shells"
 msgstr "/etc/shells"
 
-#: chsh.1.xml:115(para)
+#: chsh.1.xml:144(para)
 msgid "List of valid login shells."
 msgstr "Liste des interpréteurs de commandes initiaux valables."
 
-#: chsh.1.xml:129(para)
+#: chsh.1.xml:158(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -7306,11 +8049,11 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chpasswd.8.xml:18(refpurpose)
+#: chpasswd.8.xml:47(refpurpose)
 msgid "update passwords in batch mode"
 msgstr "Mettre à jour des mots de passe par lot"
 
-#: chpasswd.8.xml:32(para)
+#: chpasswd.8.xml:61(para)
 #, fuzzy
 msgid ""
 "The <command>chpasswd</command> command reads a list of user name and "
@@ -7322,7 +8065,7 @@
 "pour mettre à jour un groupe d'utilisateurs existants. Chaque ligne est au "
 "format suivant :"
 
-#: chpasswd.8.xml:37(para)
+#: chpasswd.8.xml:66(para)
 msgid ""
 "<emphasis remap=\"I\">user_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -7330,7 +8073,7 @@
 "<emphasis remap=\"I\">nom_utilisateur</emphasis>:<emphasis remap=\"I"
 "\">mot_de_passe</emphasis>"
 
-#: chpasswd.8.xml:41(para)
+#: chpasswd.8.xml:70(para)
 #, fuzzy
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
@@ -7341,7 +8084,7 @@
 "chiffrement par défaut est le chiffrement DES. L'âge du mot de passe sera "
 "également mis à jour, s'il est présent."
 
-#: chpasswd.8.xml:46(para) chgpasswd.8.xml:46(para)
+#: chpasswd.8.xml:75(para) chgpasswd.8.xml:75(para)
 msgid ""
 "The default encryption algorithm can be defined for the system with the "
 "ENCRYPT_METHOD variable of <filename>/etc/login.defs</filename>, and can be "
@@ -7349,7 +8092,7 @@
 "option> options."
 msgstr ""
 
-#: chpasswd.8.xml:52(para) chgpasswd.8.xml:52(para)
+#: chpasswd.8.xml:81(para) chgpasswd.8.xml:81(para)
 msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are created at a single time."
@@ -7357,24 +8100,28 @@
 "Cette commande est destinée aux gros systèmes pour lesquels un nombre "
 "importants de comptes sont créés en une seule fois."
 
-#: chpasswd.8.xml:60(para)
+#: chpasswd.8.xml:89(para)
 msgid "The options which apply to the <command>chpasswd</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>chpasswd</command> sont :"
 
-#: chpasswd.8.xml:76(term) chgpasswd.8.xml:76(term)
+#: chpasswd.8.xml:98(para) chgpasswd.8.xml:98(para)
+msgid "The available methods are DES, MD5, and NONE."
+msgstr ""
+
+#: chpasswd.8.xml:108(term) chgpasswd.8.xml:108(term)
 msgid "<option>-e</option>, <option>--encrypted</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: chpasswd.8.xml:78(para) chgpasswd.8.xml:78(para)
+#: chpasswd.8.xml:110(para) chgpasswd.8.xml:110(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr "Indique que les mots de passe fournis sont chiffrés."
 
-#: chpasswd.8.xml:88(term) chgpasswd.8.xml:88(term)
+#: chpasswd.8.xml:120(term) chgpasswd.8.xml:120(term)
 msgid "<option>-m</option>, <option>--md5</option>"
 msgstr "<option>-m</option>, <option>--md5</option>"
 
-#: chpasswd.8.xml:90(para) chgpasswd.8.xml:90(para)
+#: chpasswd.8.xml:122(para) chgpasswd.8.xml:122(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
@@ -7382,7 +8129,7 @@
 "Permettre d'utiliser le chiffrement MD5, plutôt que DES, lorsque les mots de "
 "passe fournis ne sont pas chiffrés."
 
-#: chpasswd.8.xml:126(para) chgpasswd.8.xml:126(para)
+#: chpasswd.8.xml:158(para) chgpasswd.8.xml:158(para)
 msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
@@ -7390,7 +8137,7 @@
 "Pensez à fixer les permissions ou umask afin d'empêcher la lecture par les "
 "autres utilisateurs des fichiers non chiffrés. "
 
-#: chpasswd.8.xml:178(para)
+#: chpasswd.8.xml:210(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
@@ -7407,11 +8154,11 @@
 "citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: chgpasswd.8.xml:19(refpurpose)
+#: chgpasswd.8.xml:48(refpurpose)
 msgid "update group passwords in batch mode"
 msgstr "Mettre à jour par lot des mots de passe des groupes"
 
-#: chgpasswd.8.xml:33(para)
+#: chgpasswd.8.xml:62(para)
 #, fuzzy
 msgid ""
 "The <command>chgpasswd</command> command reads a list of group name and "
@@ -7423,7 +8170,7 @@
 "mettre à jour un ensemble de groupes existants. Chaque ligne est au format "
 "suivant :"
 
-#: chgpasswd.8.xml:38(para)
+#: chgpasswd.8.xml:67(para)
 msgid ""
 "<emphasis remap=\"I\">group_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -7431,7 +8178,7 @@
 "<emphasis remap=\"I\">nom_utilisateur</emphasis>:<emphasis remap=\"I"
 "\">mot_de_passe</emphasis>"
 
-#: chgpasswd.8.xml:42(para)
+#: chgpasswd.8.xml:71(para)
 #, fuzzy
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
@@ -7440,13 +8187,13 @@
 "Par défaut, le mot de passe doit être fourni en clair. L'algorithme de "
 "chiffrement par défaut est le chiffrement DES."
 
-#: chgpasswd.8.xml:60(para)
+#: chgpasswd.8.xml:89(para)
 msgid ""
 "The options which apply to the <command>chgpasswd</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>chgpasswd</command> sont :"
 
-#: chgpasswd.8.xml:173(para)
+#: chgpasswd.8.xml:205(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
@@ -7461,39 +8208,43 @@
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chfn.1.xml:18(refpurpose)
+#: chfn.1.xml:47(refpurpose)
 msgid "change real user name and information"
 msgstr "Modifier le nom complet et les informations associées à un utilisateur"
 
-#: chfn.1.xml:24(replaceable)
+#: chfn.1.xml:53(replaceable)
 msgid "full_name"
 msgstr "nom_complet"
 
-#: chfn.1.xml:25(replaceable)
+#: chfn.1.xml:53(arg)
+msgid "-f <placeholder-1/>"
+msgstr "-f <placeholder-1/>"
+
+#: chfn.1.xml:54(replaceable)
 msgid "room_no"
 msgstr "no_bureau"
 
-#: chfn.1.xml:26(replaceable)
+#: chfn.1.xml:55(replaceable)
 msgid "work_ph"
 msgstr "tel_bureau"
 
-#: chfn.1.xml:26(arg)
+#: chfn.1.xml:55(arg)
 msgid "-w <placeholder-1/>"
 msgstr "-w <placeholder-1/>"
 
-#: chfn.1.xml:27(replaceable)
+#: chfn.1.xml:56(replaceable)
 msgid "home_ph"
 msgstr "tel_perso"
 
-#: chfn.1.xml:28(replaceable)
+#: chfn.1.xml:57(replaceable)
 msgid "other"
 msgstr "autre"
 
-#: chfn.1.xml:28(arg)
+#: chfn.1.xml:57(arg)
 msgid "-o <placeholder-1/>"
 msgstr "-o <placeholder-1/>"
 
-#: chfn.1.xml:35(para)
+#: chfn.1.xml:64(para)
 #, fuzzy
 msgid ""
 "The <command>chfn</command> command changes user fullname, office number, "
@@ -7519,7 +8270,7 @@
 "compte. De plus, seul le superutilisateur peut utiliser l'option <option>-o</"
 "option> pour modifier les parties non spécifiées du champ GECOS."
 
-#: chfn.1.xml:49(para)
+#: chfn.1.xml:78(para)
 msgid ""
 "These fields must not contain any colons. Except for the <emphasis remap=\"I"
 "\">other</emphasis> field, they should not contain any comma or equal sign. "
@@ -7528,7 +8279,7 @@
 "field is used to store accounting information used by other applications."
 msgstr ""
 
-#: chfn.1.xml:58(para)
+#: chfn.1.xml:87(para)
 msgid ""
 "If none of the options are selected, <command>chfn</command> operates in an "
 "interactive fashion, prompting the user with the current values for all of "
@@ -7545,7 +8296,7 @@
 "En l'absence d'option, <command>chfn</command> opère sur l'utilisateur "
 "actuel."
 
-#: chfn.1.xml:103(para)
+#: chfn.1.xml:132(para)
 msgid ""
 "<citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -7559,16 +8310,16 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chage.1.xml:5(refentrytitle) chage.1.xml:10(refname)
-#: chage.1.xml:15(command)
+#: chage.1.xml:34(refentrytitle) chage.1.xml:39(refname)
+#: chage.1.xml:44(command)
 msgid "chage"
 msgstr "chage"
 
-#: chage.1.xml:11(refpurpose)
+#: chage.1.xml:40(refpurpose)
 msgid "change user password expiry information"
 msgstr "Modifier les informations de validité d'un mot de passe"
 
-#: chage.1.xml:27(para)
+#: chage.1.xml:56(para)
 msgid ""
 "The <command>chage</command> command changes the number of days between "
 "password changes and the date of the last password change. This information "
@@ -7579,12 +8330,12 @@
 "informations sont utilisées par le système pour déterminer si un utilisateur "
 "doit changer son mot de passe."
 
-#: chage.1.xml:37(para)
+#: chage.1.xml:66(para)
 msgid "The options which apply to the <command>chage</command> command are:"
 msgstr ""
 "Les options disponibles pour la commande <command>chage</command> sont :"
 
-#: chage.1.xml:42(term)
+#: chage.1.xml:71(term)
 msgid ""
 "<option>-d</option>, <option>--lastday</option><replaceable>LAST_DAY</"
 "replaceable>"
@@ -7592,7 +8343,7 @@
 "<option>-d</option>, <option>--lastday</option> <replaceable>DERNIER_JOUR</"
 "replaceable>"
 
-#: chage.1.xml:46(para)
+#: chage.1.xml:75(para)
 msgid ""
 "Set the number of days since January 1st, 1970 when the password was last "
 "changed. The date may also be expressed in the format YYYY-MM-DD (or the "
@@ -7602,7 +8353,7 @@
 "été changé la dernière fois. La date peut aussi être exprimée dans le format "
 "AAAA-MM-JJ (ou le format utilisé plus communément dans votre région)."
 
-#: chage.1.xml:54(term)
+#: chage.1.xml:83(term)
 msgid ""
 "<option>-E</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -7611,7 +8362,7 @@
 "<replaceable>DATE_FIN_VALIDITÉ</replaceable>"
 
 # NOTE: s/date//
-#: chage.1.xml:58(para)
+#: chage.1.xml:87(para)
 msgid ""
 "Set the date or number of days since January 1, 1970 on which the user's "
 "account will no longer be accessible. The date may also be expressed in the "
@@ -7626,7 +8377,7 @@
 "contacter l'administrateur système pour pouvoir utiliser à nouveau le "
 "système."
 
-#: chage.1.xml:66(para)
+#: chage.1.xml:95(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>EXPIRE_DATE</replaceable> will remove an account expiration "
@@ -7636,7 +8387,7 @@
 "<replaceable>DATE_FIN_VALIDITÉ</replaceable> aura pour effet de supprimer la "
 "date de fin de validité."
 
-#: chage.1.xml:80(term)
+#: chage.1.xml:109(term)
 msgid ""
 "<option>-I</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -7644,7 +8395,7 @@
 "<option>-I</option>, <option>--inactive</option> "
 "<replaceable>DURÉE_INACTIVITÉ</replaceable>"
 
-#: chage.1.xml:84(para)
+#: chage.1.xml:113(para)
 msgid ""
 "Set the number of days of inactivity after a password has expired before the "
 "account is locked. The <replaceable>INACTIVE</replaceable> option is the "
@@ -7657,7 +8408,7 @@
 "d'inactivité. Un utilisateur dont le compte est bloqué doit contacter "
 "l'administrateur système avant de pouvoir utiliser de nouveau le système."
 
-#: chage.1.xml:91(para)
+#: chage.1.xml:120(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>INACTIVE</replaceable> will remove an account's inactivity."
@@ -7666,15 +8417,11 @@
 "<replaceable>DURÉE_INACTIVITÉ</replaceable> supprime la durée d'inactivité "
 "pour un compte."
 
-#: chage.1.xml:99(term)
-msgid "<option>-l</option>, <option>--list</option>"
-msgstr "<option>-l</option>, <option>--list</option>"
-
-#: chage.1.xml:103(para)
+#: chage.1.xml:132(para)
 msgid "Show account aging information."
 msgstr "Afficher les informations sur l'âge des comptes."
 
-#: chage.1.xml:121(term)
+#: chage.1.xml:150(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -7682,7 +8429,7 @@
 "<option>-M</option>, <option>--maxdays</option> <replaceable>JOURS_MAX</"
 "replaceable>"
 
-#: chage.1.xml:125(para)
+#: chage.1.xml:154(para)
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
 "<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
@@ -7699,7 +8446,7 @@
 "l'option <option>-W</option> qui prévient l'utilisateur à l'avance par un "
 "message d'alerte."
 
-#: chage.1.xml:134(para)
+#: chage.1.xml:163(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as "
 "<replaceable>MAX_DAYS</replaceable> will remove checking a password's "
@@ -7708,7 +8455,7 @@
 "Une valeur de <emphasis remap=\"I\">-1</emphasis> pour "
 "<replaceable>JOURS_MAX</replaceable> supprime la vérification de validité."
 
-#: chage.1.xml:142(term)
+#: chage.1.xml:171(term)
 msgid ""
 "<option>-W</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -7716,7 +8463,7 @@
 "<option>-W</option>, <option>--warndays</option> "
 "<replaceable>DURÉE_AVERTISSEMENT</replaceable>"
 
-#: chage.1.xml:146(para)
+#: chage.1.xml:175(para)
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
@@ -7729,7 +8476,7 @@
 "lesquels un utilisateur sera prévenu que son mot de passe est sur le point "
 "d'arriver en fin de validité."
 
-#: chage.1.xml:155(para)
+#: chage.1.xml:184(para)
 msgid ""
 "If none of the options are selected, <command>chage</command> operates in an "
 "interactive fashion, prompting the user with the current values for all of "
@@ -7743,7 +8490,7 @@
 "ou laissez la ligne vide pour conserver la valeur actuelle. La valeur "
 "actuelle est affichée entre crochets."
 
-#: chage.1.xml:165(para)
+#: chage.1.xml:194(para)
 msgid ""
 "The <command>chage</command> program requires a shadow password file to be "
 "available."
@@ -7751,7 +8498,7 @@
 "Le programme <command>chage</command> nécessite l'utilisation d'un fichier "
 "de mots de passe cachés (« shadow password file »)."
 
-#: chage.1.xml:169(para)
+#: chage.1.xml:198(para)
 msgid ""
 "The <command>chage</command> command is restricted to the root user, except "
 "for the <option>-l</option> option, which may be used by an unprivileged "
@@ -7762,15 +8509,15 @@
 "non privilégié pour lui permettre de savoir quand son mot de passe ou son "
 "compte arrivera en fin de validité."
 
-#: chage.1.xml:222(replaceable)
+#: chage.1.xml:251(replaceable)
 msgid "15"
 msgstr "15"
 
-#: chage.1.xml:224(para)
+#: chage.1.xml:253(para)
 msgid "can't find the shadow password file"
 msgstr "impossible de trouver le fichier des mots de passe cachés"
 
-#: chage.1.xml:200(para)
+#: chage.1.xml:229(para)
 msgid ""
 "The <command>chage</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -7784,6 +8531,258 @@
 msgstr "Nicolas FRANÇOIS <nicolas.francois at centraliens.net>, 2005."
 
 #~ msgid ""
+#~ "The group name or number of the user's initial login group. The group "
+#~ "name must exist. A group number must refer to an already existing group. "
+#~ "The default group number is 1 or whatever is specified in <filename>/etc/"
+#~ "default/useradd</filename>."
+#~ msgstr ""
+#~ "Nom ou ou numéro du groupe de connexion initial de l'utilisateur. Le nom "
+#~ "du groupe doit exister. Un numéro de groupe doit se référer à un groupe "
+#~ "existant. Le numéro de groupe par défaut est de 1, ou la valeur indiquée "
+#~ "dans <filename>/etc/default/useradd</filename>."
+
+#~ msgid ""
+#~ "The group name or ID for a new user's initial group. The named group must "
+#~ "exist, and a numerical group ID must have an existing entry."
+#~ msgstr ""
+#~ "Nom de groupe ou identifiant numérique du groupe initial d'un nouvel "
+#~ "utilisateur. Le groupe spécifié doit exister, et un identifiant de groupe "
+#~ "numérique doit déjà exister."
+
+#~ msgid "days since Jan 1, 1970 that password was last changed"
+#~ msgstr ""
+#~ "nombre de jours, comptés à partir du 1er janvier 1970, depuis le dernier "
+#~ "changement de mot de passe"
+
+#~ msgid "days after which password must be changed"
+#~ msgstr "nombre de jours après lesquels le mot de passe doit être changé"
+
+#~ msgid "days before password is to expire that user is warned"
+#~ msgstr ""
+#~ "nombre de jours avant la fin de validité du mot de passe et pendant "
+#~ "lesquels l'utilisateur est averti"
+
+#~ msgid "days after password expires that account is disabled"
+#~ msgstr ""
+#~ "nombre de jours après la fin de validité provoquant la désactivation du "
+#~ "compte"
+
+#~ msgid "days since Jan 1, 1970 that account is disabled"
+#~ msgstr ""
+#~ "nombre de jours, comptés à partir du 1er janvier 1970, depuis que le "
+#~ "compte est désactivé"
+
+#, fuzzy
+#~ msgid ""
+#~ "The password field must be filled. The encrypted password consists of 13 "
+#~ "to 24 characters from the 64 character alphabet a thru z, A thru Z, 0 "
+#~ "thru 9, \\. and /. Optionally it can start with a \"$\" character. This "
+#~ "means the encrypted password was generated using another (not DES) "
+#~ "algorithm. For example if it starts with \"$1$\" it means the MD5-based "
+#~ "algorithm was used."
+#~ msgstr ""
+#~ "Le champ « mot de passe » doit être rempli. Le mot de passe chiffré "
+#~ "comprend 13 à 24 caractères pris dans l'alphabet de 64 caractère : a-z, A-"
+#~ "Z, 0-9, \\. et /. Il peut optionellement commencer par un caractère « $ ». "
+#~ "Ceci signifie que le mot de passe a été généré par un autre algorithme "
+#~ "(autre que DES). Par exemple, s'il commence par « $1$ », l'algorithme basé "
+#~ "sur MD5 a été utilisé."
+
+#~ msgid ""
+#~ "The date of the last password change is given as the number of days since "
+#~ "Jan 1, 1970. The password may not be changed again until the proper "
+#~ "number of days have passed, and must be changed after the maximum number "
+#~ "of days. If the minimum number of days required is greater than the "
+#~ "maximum number of day allowed, this password may not be changed by the "
+#~ "user."
+#~ msgstr ""
+#~ "La date de dernière modification du mot de passe est donnée par le nombre "
+#~ "de jours écoulés depuis le 1er janvier 1970 jusqu'au dernier changement "
+#~ "du mot de passe. Un mot de passe ne peut pas être changé de nouveau avant "
+#~ "le nombre de jours indiqués, et doit être modifié avant le nombre maximal "
+#~ "de jours spécifié. Si le nombre minimal de jours requis est plus grand "
+#~ "que le nombre maximal de jours de validité, ce mot de passe ne peut pas "
+#~ "être changé par l'utilisateur."
+
+#~ msgid ""
+#~ "An account is considered to be inactive and is disabled if the password "
+#~ "is not changed within the specified number of days after the password "
+#~ "expires. An account will also be disabled on the specified day regardless "
+#~ "of other password expiration information."
+#~ msgstr ""
+#~ "Un compte est considéré comme inactif et est désactivé si le mot de passe "
+#~ "n'est pas changé dans l'intervalle indiqué après la fin de la validité du "
+#~ "mot de passe. Un compte est également désactivé le jour indiqué quels que "
+#~ "soient les autres informations de validité."
+
+#~ msgid ""
+#~ "This information supersedes any password or password age information "
+#~ "present in <filename>/etc/passwd</filename>."
+#~ msgstr ""
+#~ "Ces informations sont prioritaires sur tous les autres champs présents "
+#~ "dans <filename>/etc/passwd</filename>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>getpwnam</"
+#~ "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>getpwnam</"
+#~ "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>."
+
+#, fuzzy
+#~ msgid ""
+#~ "This field will be checked for existence as a directory, and a new "
+#~ "directory with this name will be created if it does not already exist. "
+#~ "The ownership of the directory will be set to be that of the user being "
+#~ "created or updated."
+#~ msgstr ""
+#~ "L'existence du répertoire indiqué dans ce champ est vérifiée, et dans le "
+#~ "cas contraire, le répertoire est créé. Le propriétaire du répertoire sera "
+#~ "l'utilisateur dont le compte est créé ou mis à jour."
+
+#, fuzzy
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>."
+
+#~ msgid "-a"
+#~ msgstr "-a"
+
+#~ msgid "-d"
+#~ msgstr "-d"
+
+#~ msgid "-g"
+#~ msgstr "-g"
+
+#~ msgid "GID"
+#~ msgstr "GID"
+
+#~ msgid "-o"
+#~ msgstr "-o"
+
+#~ msgid "KEY"
+#~ msgstr "CLÉ"
+
+#~ msgid "VALUE"
+#~ msgstr "VALEUR"
+
+#~ msgid "-K <placeholder-1/>=<placeholder-2/>"
+#~ msgstr "-K <placeholder-1/>=<placeholder-2/>"
+
+#, fuzzy
+#~ msgid "-R"
+#~ msgstr "-"
+
+#, fuzzy
+#~ msgid "<option>-A</option><replaceable>user</replaceable>,..."
+#~ msgstr ""
+#~ "<option>-u</option>, <option>--uid</option> <replaceable>UID</replaceable>"
+
+#, fuzzy
+#~ msgid "<option>-M</option><replaceable>user</replaceable>,..."
+#~ msgstr ""
+#~ "<option>-u</option>, <option>--uid</option> <replaceable>UID</replaceable>"
+
+#~ msgid "Display faillog records for all users."
+#~ msgstr "Afficher les échecs de tous les utilisateurs."
+
+#~ msgid ""
+#~ "Set maximum number of login failures after the account is disabled to "
+#~ "<replaceable>MAX</replaceable>. Selecting <replaceable>MAX</replaceable> "
+#~ "value of 0 has the effect of not placing a limit on the number of failed "
+#~ "logins. The maximum failure count should always be 0 for <emphasis>root</"
+#~ "emphasis> to prevent a denial of services attack against the system."
+#~ msgstr ""
+#~ "Fixer le nombre maximum d'échecs de connexion après lesquels le compte "
+#~ "sera désactivé à <emphasis remap=\"I\">MAX</emphasis>. Une limite "
+#~ "<replaceable>MAX</replaceable> de 0 aura pour effet de ne pas placer de "
+#~ "limite d'échec. La limite pour l'utilisateur <emphasis>root</emphasis> "
+#~ "devrait toujours être 0 pour éviter tout risque de déni de service contre "
+#~ "le système."
+
+#~ msgid ""
+#~ "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
+#~ "replaceable>"
+#~ msgstr ""
+#~ "<option>-u</option>, <option>--user</option> <replaceable>IDENTIFIANT</"
+#~ "replaceable>"
+
+#~ msgid ""
 #~ "The user's home directory will be created if it does not exist. The files "
 #~ "contained in <replaceable>SKEL_DIR</replaceable> will be copied to the "
 #~ "home directory if the <option>-k</option> option is used, otherwise the "
@@ -7927,28 +8926,6 @@
 #~ msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 #~ msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 
-#, fuzzy
-#~ msgid ""
-#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>login</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
-#~ msgstr ""
-#~ "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>passwd</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pam</"
-#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
-
 #~ msgid "administer the <placeholder-1/> file"
 #~ msgstr "Administrer le fichier <placeholder-1/>"
 

Modified: upstream/trunk/man/po/it.po
===================================================================
--- upstream/trunk/man/po/it.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/man/po/it.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.3\n"
-"POT-Creation-Date: 2008-05-24 21:02+0200\n"
+"POT-Creation-Date: 2009-04-06 00:48+0200\n"
 "PO-Revision-Date: 2007-05-27 16:42+0200\n"
 "Last-Translator: Giuseppe Sacco <eppesuig at debian.org>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -16,43 +16,42 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: vipw.8.xml:9(refentrytitle) vipw.8.xml:14(refname) vipw.8.xml:23(command)
-#: login.defs.5.xml:419(term)
+#: vipw.8.xml:38(refentrytitle) vipw.8.xml:43(refname) vipw.8.xml:52(command)
 msgid "vipw"
 msgstr "vipw"
 
-#: vipw.8.xml:10(manvolnum) usermod.8.xml:11(manvolnum)
-#: userdel.8.xml:13(manvolnum) userdel.8.xml:170(replaceable)
-#: useradd.8.xml:20(manvolnum) pwconv.8.xml:13(manvolnum)
-#: pwck.8.xml:12(manvolnum) nologin.8.xml:6(manvolnum)
-#: newusers.8.xml:22(manvolnum) logoutd.8.xml:6(manvolnum)
-#: lastlog.8.xml:6(manvolnum) grpck.8.xml:10(manvolnum)
-#: groupmod.8.xml:10(manvolnum) groupmems.8.xml:10(manvolnum)
-#: groupdel.8.xml:10(manvolnum) groupdel.8.xml:100(replaceable)
-#: groupadd.8.xml:12(manvolnum) faillog.8.xml:6(manvolnum)
-#: faillog.5.xml:53(manvolnum) chpasswd.8.xml:13(manvolnum)
-#: chgpasswd.8.xml:14(manvolnum)
+#: vipw.8.xml:39(manvolnum) usermod.8.xml:40(manvolnum)
+#: userdel.8.xml:42(manvolnum) userdel.8.xml:199(replaceable)
+#: useradd.8.xml:50(manvolnum) pwconv.8.xml:43(manvolnum)
+#: pwck.8.xml:41(manvolnum) nologin.8.xml:35(manvolnum)
+#: newusers.8.xml:51(manvolnum) logoutd.8.xml:35(manvolnum)
+#: lastlog.8.xml:36(manvolnum) grpck.8.xml:39(manvolnum)
+#: groupmod.8.xml:39(manvolnum) groupmems.8.xml:39(manvolnum)
+#: groupdel.8.xml:39(manvolnum) groupdel.8.xml:129(replaceable)
+#: groupadd.8.xml:43(manvolnum) faillog.8.xml:35(manvolnum)
+#: faillog.5.xml:82(manvolnum) chpasswd.8.xml:42(manvolnum)
+#: chgpasswd.8.xml:43(manvolnum)
 msgid "8"
 msgstr "8"
 
-#: vipw.8.xml:11(refmiscinfo) usermod.8.xml:12(refmiscinfo)
-#: userdel.8.xml:14(refmiscinfo) useradd.8.xml:21(refmiscinfo)
-#: pwconv.8.xml:14(refmiscinfo) pwck.8.xml:13(refmiscinfo)
-#: nologin.8.xml:7(refmiscinfo) newusers.8.xml:23(refmiscinfo)
-#: logoutd.8.xml:7(refmiscinfo) lastlog.8.xml:7(refmiscinfo)
-#: grpck.8.xml:11(refmiscinfo) groupmod.8.xml:11(refmiscinfo)
-#: groupmems.8.xml:11(refmiscinfo) groupdel.8.xml:11(refmiscinfo)
-#: groupadd.8.xml:13(refmiscinfo) faillog.8.xml:7(refmiscinfo)
-#: chpasswd.8.xml:14(refmiscinfo) chgpasswd.8.xml:15(refmiscinfo)
+#: vipw.8.xml:40(refmiscinfo) usermod.8.xml:41(refmiscinfo)
+#: userdel.8.xml:43(refmiscinfo) useradd.8.xml:51(refmiscinfo)
+#: pwconv.8.xml:44(refmiscinfo) pwck.8.xml:42(refmiscinfo)
+#: nologin.8.xml:36(refmiscinfo) newusers.8.xml:52(refmiscinfo)
+#: logoutd.8.xml:36(refmiscinfo) lastlog.8.xml:37(refmiscinfo)
+#: grpck.8.xml:40(refmiscinfo) groupmod.8.xml:40(refmiscinfo)
+#: groupmems.8.xml:40(refmiscinfo) groupdel.8.xml:40(refmiscinfo)
+#: groupadd.8.xml:44(refmiscinfo) faillog.8.xml:36(refmiscinfo)
+#: chpasswd.8.xml:43(refmiscinfo) chgpasswd.8.xml:44(refmiscinfo)
 msgid "System Management Commands"
 msgstr ""
 
-#: vipw.8.xml:15(refname) vipw.8.xml:29(command)
+#: vipw.8.xml:44(refname) vipw.8.xml:58(command)
 msgid "vigr"
 msgstr "vigr"
 
 # type: Plain text
-#: vipw.8.xml:16(refpurpose)
+#: vipw.8.xml:45(refpurpose)
 #, fuzzy
 msgid "edit the password, group, shadow-password or shadow-group file"
 msgstr ""
@@ -63,37 +62,37 @@
 "vipw, vigr - modificano i file delle password, dei gruppi, delle shadow "
 "password o dei gruppi shadow"
 
-#: vipw.8.xml:25(replaceable) vipw.8.xml:31(replaceable)
-#: usermod.8.xml:23(replaceable) userdel.8.xml:23(arg)
-#: useradd.8.xml:31(replaceable) useradd.8.xml:43(replaceable)
-#: su.1.xml:37(replaceable) passwd.1.xml:28(replaceable)
-#: lastlog.8.xml:18(replaceable) groupmod.8.xml:22(replaceable)
-#: faillog.8.xml:18(replaceable) chsh.1.xml:24(replaceable)
-#: chpasswd.8.xml:25(replaceable) chgpasswd.8.xml:26(replaceable)
-#: chage.1.xml:17(replaceable)
+#: vipw.8.xml:54(replaceable) vipw.8.xml:60(replaceable)
+#: usermod.8.xml:52(replaceable) userdel.8.xml:52(arg)
+#: useradd.8.xml:61(replaceable) useradd.8.xml:73(replaceable)
+#: su.1.xml:66(replaceable) passwd.1.xml:57(replaceable)
+#: lastlog.8.xml:48(replaceable) groupmod.8.xml:51(replaceable)
+#: groupadd.8.xml:55(replaceable) faillog.8.xml:47(replaceable)
+#: chsh.1.xml:53(replaceable) chpasswd.8.xml:54(replaceable)
+#: chgpasswd.8.xml:55(replaceable) chage.1.xml:46(replaceable)
 msgid "options"
 msgstr "opzioni"
 
 # type: SH
-#: vipw.8.xml:37(title) usermod.8.xml:30(title) userdel.8.xml:31(title)
-#: useradd.8.xml:49(title) suauth.5.xml:21(title) su.1.xml:48(title)
-#: sg.1.xml:30(title) shadow.5.xml:15(title) shadow.3.xml:64(title)
-#: shadow.3.xml:120(title) pwconv.8.xml:40(title) pwck.8.xml:52(title)
-#: porttime.5.xml:15(title) passwd.5.xml:15(title) passwd.1.xml:37(title)
-#: nologin.8.xml:21(title) newusers.8.xml:40(title) newgrp.1.xml:26(title)
-#: logoutd.8.xml:21(title) login.defs.5.xml:76(title)
-#: login.access.5.xml:15(title) login.1.xml:72(title) limits.5.xml:16(title)
-#: lastlog.8.xml:24(title) gshadow.5.xml:15(title) grpck.8.xml:40(title)
-#: groups.1.xml:24(title) groupmod.8.xml:29(title) groupmems.8.xml:31(title)
-#: groupdel.8.xml:28(title) groupadd.8.xml:36(title) gpasswd.1.xml:40(title)
-#: faillog.8.xml:24(title) faillog.5.xml:15(title) expiry.1.xml:29(title)
-#: chsh.1.xml:33(title) chpasswd.8.xml:31(title) chgpasswd.8.xml:32(title)
-#: chfn.1.xml:34(title) chage.1.xml:26(title)
+#: vipw.8.xml:66(title) usermod.8.xml:59(title) userdel.8.xml:60(title)
+#: useradd.8.xml:79(title) suauth.5.xml:50(title) su.1.xml:77(title)
+#: sg.1.xml:59(title) shadow.5.xml:44(title) shadow.3.xml:93(title)
+#: shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:81(title)
+#: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
+#: nologin.8.xml:50(title) newusers.8.xml:69(title) newgrp.1.xml:55(title)
+#: logoutd.8.xml:50(title) login.defs.5.xml:107(title)
+#: login.access.5.xml:45(title) login.1.xml:103(title) limits.5.xml:46(title)
+#: lastlog.8.xml:54(title) gshadow.5.xml:43(title) grpck.8.xml:69(title)
+#: groups.1.xml:53(title) groupmod.8.xml:58(title) groupmems.8.xml:60(title)
+#: groupdel.8.xml:57(title) groupadd.8.xml:62(title) gpasswd.1.xml:69(title)
+#: faillog.8.xml:53(title) faillog.5.xml:44(title) expiry.1.xml:59(title)
+#: chsh.1.xml:62(title) chpasswd.8.xml:60(title) chgpasswd.8.xml:61(title)
+#: chfn.1.xml:63(title) chage.1.xml:55(title)
 msgid "DESCRIPTION"
 msgstr "DESCRIZIONE"
 
 # type: Plain text
-#: vipw.8.xml:38(para)
+#: vipw.8.xml:67(para)
 #, fuzzy
 msgid ""
 "The <command>vipw</command> and <command>vigr</command> commands edits the "
@@ -120,18 +119,18 @@
 "citerefentry>."
 
 # type: SH
-#: vipw.8.xml:55(title) usermod.8.xml:38(title) userdel.8.xml:40(title)
-#: useradd.8.xml:62(title) su.1.xml:94(title) pwck.8.xml:104(title)
-#: passwd.1.xml:123(title) newusers.8.xml:98(title) login.1.xml:157(title)
-#: lastlog.8.xml:36(title) grpck.8.xml:85(title) groupmod.8.xml:38(title)
-#: groupmems.8.xml:46(title) groupadd.8.xml:45(title) gpasswd.1.xml:80(title)
-#: faillog.8.xml:35(title) chsh.1.xml:44(title) chpasswd.8.xml:59(title)
-#: chgpasswd.8.xml:59(title) chage.1.xml:36(title)
+#: vipw.8.xml:84(title) usermod.8.xml:67(title) userdel.8.xml:69(title)
+#: useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:133(title)
+#: passwd.1.xml:151(title) newusers.8.xml:221(title) login.1.xml:188(title)
+#: lastlog.8.xml:66(title) grpck.8.xml:114(title) groupmod.8.xml:67(title)
+#: groupmems.8.xml:75(title) groupadd.8.xml:71(title) gpasswd.1.xml:109(title)
+#: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:88(title)
+#: chgpasswd.8.xml:88(title) chage.1.xml:65(title)
 msgid "OPTIONS"
 msgstr "OPZIONI"
 
 # type: Plain text
-#: vipw.8.xml:56(para)
+#: vipw.8.xml:85(para)
 #, fuzzy
 msgid ""
 "The options which apply to the <command>vipw</command> and <command>vigr</"
@@ -139,261 +138,178 @@
 msgstr "Il comando <command>chage</command> accetta le seguenti opzioni:"
 
 # type: TP
-#: vipw.8.xml:62(term)
+#: vipw.8.xml:91(term)
 msgid "<option>-g</option>, <option>--group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: vipw.8.xml:64(para)
+#: vipw.8.xml:93(para)
 msgid "Edit group database."
 msgstr ""
 
 # type: TP
-#: vipw.8.xml:68(term) userdel.8.xml:70(term) useradd.8.xml:179(term)
-#: passwd.1.xml:163(term) lastlog.8.xml:52(term) groupmod.8.xml:64(term)
-#: groupadd.8.xml:80(term) faillog.8.xml:48(term) chsh.1.xml:50(term)
-#: chpasswd.8.xml:82(term) chgpasswd.8.xml:82(term) chage.1.xml:74(term)
+#: vipw.8.xml:97(term) userdel.8.xml:99(term) useradd.8.xml:247(term)
+#: passwd.1.xml:191(term) lastlog.8.xml:82(term) groupmod.8.xml:93(term)
+#: groupadd.8.xml:106(term) faillog.8.xml:80(term) chsh.1.xml:79(term)
+#: chpasswd.8.xml:114(term) chgpasswd.8.xml:114(term) chage.1.xml:103(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr "<option>-h</option>, <option>--help</option>"
 
 # type: Plain text
-#: vipw.8.xml:70(para) userdel.8.xml:72(para) useradd.8.xml:181(para)
-#: passwd.1.xml:165(para) lastlog.8.xml:56(para) groupmod.8.xml:66(para)
-#: groupadd.8.xml:82(para) faillog.8.xml:50(para) chsh.1.xml:52(para)
-#: chpasswd.8.xml:84(para) chgpasswd.8.xml:84(para) chage.1.xml:76(para)
+#: vipw.8.xml:99(para) userdel.8.xml:101(para) useradd.8.xml:249(para)
+#: passwd.1.xml:193(para) lastlog.8.xml:86(para) groupmod.8.xml:95(para)
+#: groupadd.8.xml:108(para) faillog.8.xml:82(para) chsh.1.xml:81(para)
+#: chpasswd.8.xml:116(para) chgpasswd.8.xml:116(para) chage.1.xml:105(para)
 msgid "Display help message and exit."
 msgstr "Mostra un messaggio di aiuto ed esce."
 
 # type: IP
-#: vipw.8.xml:74(term)
+#: vipw.8.xml:103(term)
 msgid "<option>-p</option>, <option>--passwd</option>"
 msgstr "<option>-p</option>, <option>--passwd</option>"
 
-#: vipw.8.xml:76(para)
+#: vipw.8.xml:105(para)
 msgid "Edit passwd database."
 msgstr ""
 
 # type: IP
-#: vipw.8.xml:80(term) passwd.1.xml:218(term)
+#: vipw.8.xml:109(term) passwd.1.xml:258(term)
 msgid "<option>-q</option>, <option>--quiet</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:82(para) passwd.1.xml:222(para)
+#: vipw.8.xml:111(para) passwd.1.xml:262(para)
 msgid "Quiet mode."
 msgstr ""
 
 # type: IP
-#: vipw.8.xml:86(term)
+#: vipw.8.xml:115(term)
 msgid "<option>-s</option>, <option>--shadow</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: vipw.8.xml:88(para)
+#: vipw.8.xml:117(para)
 msgid "Edit shadow or gshadow database."
 msgstr ""
 
-#: vipw.8.xml:95(title) usermod.8.xml:265(title) userdel.8.xml:96(title)
-#: useradd.8.xml:471(title) su.1.xml:196(title) sg.1.xml:47(title)
-#: pwconv.8.xml:116(title) pwck.8.xml:153(title) passwd.1.xml:307(title)
-#: newusers.8.xml:174(title) newgrp.1.xml:58(title) login.1.xml:236(title)
-#: grpck.8.xml:125(title) groupmod.8.xml:109(title) groupmems.8.xml:107(title)
-#: groupdel.8.xml:47(title) groupadd.8.xml:149(title) gpasswd.1.xml:186(title)
-#: chsh.1.xml:91(title) chpasswd.8.xml:139(title) chgpasswd.8.xml:133(title)
-#: chfn.1.xml:70(title)
-msgid "CONFIGURATION"
-msgstr ""
-
-#: vipw.8.xml:96(para) usermod.8.xml:266(para) userdel.8.xml:97(para)
-#: useradd.8.xml:472(para) su.1.xml:197(para) sg.1.xml:48(para)
-#: pwck.8.xml:154(para) passwd.1.xml:308(para) newusers.8.xml:175(para)
-#: newgrp.1.xml:59(para) login.1.xml:237(para) grpck.8.xml:126(para)
-#: groupmod.8.xml:110(para) groupmems.8.xml:108(para) groupdel.8.xml:48(para)
-#: groupadd.8.xml:150(para) gpasswd.1.xml:187(para) chsh.1.xml:92(para)
-#: chpasswd.8.xml:140(para) chgpasswd.8.xml:134(para) chfn.1.xml:71(para)
-msgid ""
-"The following configuration variables in <filename>/etc/login.defs</"
-"filename> change the behavior of this tool:"
-msgstr ""
-
-#: vipw.8.xml:2(term) usermod.8.xml:2(term) userdel.8.xml:2(term)
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) newusers.8.xml:2(term)
-#: login.defs.5.xml:2(term) grpck.8.xml:2(term) groupmod.8.xml:2(term)
-#: groupmems.8.xml:2(term) groupdel.8.xml:2(term) groupadd.8.xml:2(term)
-#: gpasswd.1.xml:2(term) chgpasswd.8.xml:2(term)
-msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
-msgstr ""
-
-#: vipw.8.xml:4(para) usermod.8.xml:4(para) userdel.8.xml:4(para)
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) newusers.8.xml:4(para)
-#: login.defs.5.xml:4(para) grpck.8.xml:4(para) groupmod.8.xml:4(para)
-#: groupmems.8.xml:4(para) groupdel.8.xml:4(para) groupadd.8.xml:4(para)
-#: gpasswd.1.xml:4(para) chgpasswd.8.xml:4(para)
-msgid ""
-"Maximum members per group entry. When the maximum is reached, a new group "
-"entry (line) is started in <filename>/etc/group</filename> (with the same "
-"name, same password, and same GID)."
-msgstr ""
-
-#: vipw.8.xml:9(para) usermod.8.xml:9(para) userdel.8.xml:9(para)
-#: useradd.8.xml:9(para) pwconv.8.xml:9(para) newusers.8.xml:9(para)
-#: login.defs.5.xml:9(para) grpck.8.xml:9(para) groupmod.8.xml:9(para)
-#: groupmems.8.xml:9(para) groupdel.8.xml:9(para) groupadd.8.xml:9(para)
-#: gpasswd.1.xml:9(para) chgpasswd.8.xml:9(para)
-msgid ""
-"The default value is 0, meaning that there are no limits in the number of "
-"members in a group."
-msgstr ""
-
-#. Note: on HP, split groups have the same ID, but different
-#.                names.
-#: vipw.8.xml:15(para) usermod.8.xml:15(para) userdel.8.xml:15(para)
-#: useradd.8.xml:15(para) pwconv.8.xml:15(para) newusers.8.xml:15(para)
-#: login.defs.5.xml:15(para) grpck.8.xml:15(para) groupmod.8.xml:15(para)
-#: groupmems.8.xml:15(para) groupdel.8.xml:15(para) groupadd.8.xml:15(para)
-#: gpasswd.1.xml:15(para) chgpasswd.8.xml:15(para)
-msgid ""
-"This feature (split group) permits to limit the length of lines in the group "
-"file. This is useful to make sure that lines for NIS groups are not larger "
-"than 1024 characters."
-msgstr ""
-
-#: vipw.8.xml:20(para) usermod.8.xml:20(para) userdel.8.xml:20(para)
-#: useradd.8.xml:20(para) pwconv.8.xml:20(para) newusers.8.xml:20(para)
-#: login.defs.5.xml:20(para) grpck.8.xml:20(para) groupmod.8.xml:20(para)
-#: groupmems.8.xml:20(para) groupdel.8.xml:20(para) groupadd.8.xml:20(para)
-#: gpasswd.1.xml:20(para) chgpasswd.8.xml:20(para)
-msgid "If you need to enforce such limit, you can use 25."
-msgstr ""
-
-#: vipw.8.xml:23(para) usermod.8.xml:23(para) userdel.8.xml:23(para)
-#: useradd.8.xml:23(para) pwconv.8.xml:23(para) newusers.8.xml:23(para)
-#: login.defs.5.xml:23(para) grpck.8.xml:23(para) groupmod.8.xml:23(para)
-#: groupmems.8.xml:23(para) groupdel.8.xml:23(para) groupadd.8.xml:23(para)
-#: gpasswd.1.xml:23(para) chgpasswd.8.xml:23(para)
-msgid ""
-"Note: split groups may not be supported by all tools (even in the Shadow "
-"toolsuite. You should not use this variable unless you really need it."
-msgstr ""
-
 # type: SH
-#: vipw.8.xml:107(title) usermod.8.xml:278(title) userdel.8.xml:111(title)
-#: useradd.8.xml:493(title) suauth.5.xml:139(title) su.1.xml:224(title)
-#: sg.1.xml:59(title) shadow.5.xml:105(title) shadow.3.xml:172(title)
-#: pwconv.8.xml:138(title) pwck.8.xml:167(title) porttime.5.xml:76(title)
-#: passwd.5.xml:87(title) passwd.1.xml:325(title) newusers.8.xml:197(title)
-#: newgrp.1.xml:70(title) logoutd.8.xml:35(title) login.access.5.xml:66(title)
-#: login.1.xml:280(title) limits.5.xml:110(title) lastlog.8.xml:111(title)
-#: gshadow.5.xml:61(title) grpck.8.xml:137(title) groups.1.xml:46(title)
-#: groupmod.8.xml:121(title) groupmems.8.xml:119(title)
-#: groupdel.8.xml:59(title) groupadd.8.xml:163(title) gpasswd.1.xml:201(title)
-#: faillog.8.xml:132(title) faillog.5.xml:38(title) expiry.1.xml:38(title)
-#: chsh.1.xml:104(title) chpasswd.8.xml:153(title) chgpasswd.8.xml:148(title)
-#: chfn.1.xml:84(title) chage.1.xml:177(title)
+#: vipw.8.xml:124(title) usermod.8.xml:322(title) userdel.8.xml:140(title)
+#: useradd.8.xml:619(title) suauth.5.xml:168(title) su.1.xml:253(title)
+#: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
+#: pwconv.8.xml:168(title) pwck.8.xml:196(title) porttime.5.xml:105(title)
+#: passwd.5.xml:116(title) passwd.1.xml:367(title) newusers.8.xml:320(title)
+#: newgrp.1.xml:99(title) logoutd.8.xml:64(title) login.access.5.xml:96(title)
+#: login.1.xml:316(title) limits.5.xml:140(title) lastlog.8.xml:147(title)
+#: gshadow.5.xml:89(title) grpck.8.xml:166(title) groups.1.xml:75(title)
+#: groupmod.8.xml:150(title) groupmems.8.xml:168(title)
+#: groupdel.8.xml:88(title) groupadd.8.xml:189(title) gpasswd.1.xml:230(title)
+#: faillog.8.xml:204(title) faillog.5.xml:67(title) expiry.1.xml:68(title)
+#: chsh.1.xml:133(title) chpasswd.8.xml:185(title) chgpasswd.8.xml:180(title)
+#: chfn.1.xml:113(title) chage.1.xml:206(title)
 msgid "FILES"
 msgstr "FILE"
 
-#: vipw.8.xml:110(filename) usermod.8.xml:281(filename)
-#: userdel.8.xml:114(filename) useradd.8.xml:508(filename)
-#: sg.1.xml:74(filename) pwck.8.xml:170(filename) newusers.8.xml:212(filename)
-#: newgrp.1.xml:85(filename) gshadow.5.xml:64(filename)
-#: grpck.8.xml:140(filename) groups.1.xml:49(filename)
-#: groupmod.8.xml:124(filename) groupmems.8.xml:122(filename)
-#: groupdel.8.xml:62(filename) groupadd.8.xml:166(filename)
-#: gpasswd.1.xml:20(filename) gpasswd.1.xml:204(filename)
-#: chgpasswd.8.xml:151(filename)
+#: vipw.8.xml:127(filename) usermod.8.xml:325(filename)
+#: userdel.8.xml:143(filename) useradd.8.xml:634(filename)
+#: sg.1.xml:103(filename) pwck.8.xml:199(filename)
+#: newusers.8.xml:335(filename) newgrp.1.xml:114(filename)
+#: gshadow.5.xml:92(filename) grpck.8.xml:169(filename)
+#: groups.1.xml:78(filename) groupmod.8.xml:153(filename)
+#: groupmems.8.xml:171(filename) groupdel.8.xml:91(filename)
+#: groupadd.8.xml:192(filename) gpasswd.1.xml:49(filename)
+#: gpasswd.1.xml:233(filename) chgpasswd.8.xml:183(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
 # type: Plain text
-#: vipw.8.xml:112(para) usermod.8.xml:283(para) userdel.8.xml:116(para)
-#: useradd.8.xml:510(para) sg.1.xml:76(para) pwck.8.xml:172(para)
-#: newusers.8.xml:214(para) newgrp.1.xml:87(para) gshadow.5.xml:66(para)
-#: grpck.8.xml:142(para) groups.1.xml:51(para) groupmod.8.xml:126(para)
-#: groupmems.8.xml:124(para) groupdel.8.xml:64(para) groupadd.8.xml:168(para)
-#: gpasswd.1.xml:206(para) chgpasswd.8.xml:153(para)
+#: vipw.8.xml:129(para) usermod.8.xml:327(para) userdel.8.xml:145(para)
+#: useradd.8.xml:636(para) sg.1.xml:105(para) pwck.8.xml:201(para)
+#: newusers.8.xml:337(para) newgrp.1.xml:116(para) gshadow.5.xml:94(para)
+#: grpck.8.xml:171(para) groups.1.xml:80(para) groupmod.8.xml:155(para)
+#: groupmems.8.xml:173(para) groupdel.8.xml:93(para) groupadd.8.xml:194(para)
+#: gpasswd.1.xml:235(para) chgpasswd.8.xml:185(para)
 msgid "Group account information."
 msgstr "Informazioni sugli account di gruppo."
 
-#: vipw.8.xml:116(filename) useradd.8.xml:514(filename) sg.1.xml:80(filename)
-#: newusers.8.xml:218(filename) newgrp.1.xml:91(filename)
-#: gshadow.5.xml:70(filename) grpck.8.xml:146(filename)
-#: groupmod.8.xml:130(filename) groupmems.8.xml:128(filename)
-#: groupdel.8.xml:68(filename) groupadd.8.xml:172(filename)
-#: gpasswd.1.xml:21(filename) gpasswd.1.xml:210(filename)
-#: chgpasswd.8.xml:157(filename)
+#: vipw.8.xml:133(filename) useradd.8.xml:640(filename) sg.1.xml:109(filename)
+#: newusers.8.xml:341(filename) newgrp.1.xml:120(filename)
+#: gshadow.5.xml:98(filename) grpck.8.xml:175(filename)
+#: groupmod.8.xml:159(filename) groupmems.8.xml:177(filename)
+#: groupdel.8.xml:97(filename) groupadd.8.xml:198(filename)
+#: gpasswd.1.xml:50(filename) gpasswd.1.xml:239(filename)
+#: chgpasswd.8.xml:189(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
 # type: Plain text
-#: vipw.8.xml:118(para) useradd.8.xml:516(para) sg.1.xml:82(para)
-#: newusers.8.xml:220(para) newgrp.1.xml:93(para) gshadow.5.xml:72(para)
-#: grpck.8.xml:148(para) groupmod.8.xml:132(para) groupdel.8.xml:70(para)
-#: groupadd.8.xml:174(para) gpasswd.1.xml:212(para) chgpasswd.8.xml:159(para)
+#: vipw.8.xml:135(para) useradd.8.xml:642(para) sg.1.xml:111(para)
+#: newusers.8.xml:343(para) newgrp.1.xml:122(para) gshadow.5.xml:100(para)
+#: grpck.8.xml:177(para) groupmod.8.xml:161(para) groupdel.8.xml:99(para)
+#: groupadd.8.xml:200(para) gpasswd.1.xml:241(para) chgpasswd.8.xml:191(para)
 msgid "Secure group account information."
 msgstr "Informazioni sicure sugli account di gruppo."
 
-#: vipw.8.xml:122(filename) usermod.8.xml:287(filename)
-#: userdel.8.xml:126(filename) useradd.8.xml:496(filename)
-#: su.1.xml:227(filename) sg.1.xml:62(filename) shadow.5.xml:108(filename)
-#: pwck.8.xml:176(filename) passwd.5.xml:90(filename)
-#: passwd.1.xml:328(filename) newusers.8.xml:200(filename)
-#: newgrp.1.xml:73(filename) login.1.xml:295(filename)
-#: grpck.8.xml:152(filename) expiry.1.xml:41(filename)
-#: chsh.1.xml:107(filename) chpasswd.8.xml:156(filename)
-#: chfn.1.xml:93(filename) chage.1.xml:181(filename)
+#: vipw.8.xml:139(filename) usermod.8.xml:331(filename)
+#: userdel.8.xml:155(filename) useradd.8.xml:622(filename)
+#: su.1.xml:256(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
+#: pwck.8.xml:205(filename) passwd.5.xml:119(filename)
+#: passwd.1.xml:370(filename) newusers.8.xml:323(filename)
+#: newgrp.1.xml:102(filename) login.1.xml:331(filename)
+#: grpck.8.xml:181(filename) expiry.1.xml:71(filename)
+#: chsh.1.xml:136(filename) chpasswd.8.xml:188(filename)
+#: chfn.1.xml:122(filename) chage.1.xml:210(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
 # type: Plain text
-#: vipw.8.xml:124(para) usermod.8.xml:289(para) userdel.8.xml:128(para)
-#: useradd.8.xml:498(para) su.1.xml:229(para) sg.1.xml:64(para)
-#: shadow.5.xml:110(para) pwck.8.xml:178(para) passwd.5.xml:92(para)
-#: passwd.1.xml:330(para) newusers.8.xml:202(para) newgrp.1.xml:75(para)
-#: login.1.xml:297(para) grpck.8.xml:154(para) expiry.1.xml:43(para)
-#: chsh.1.xml:109(para) chpasswd.8.xml:158(para) chfn.1.xml:95(para)
-#: chage.1.xml:184(para)
+#: vipw.8.xml:141(para) usermod.8.xml:333(para) userdel.8.xml:157(para)
+#: useradd.8.xml:624(para) su.1.xml:258(para) sg.1.xml:93(para)
+#: shadow.5.xml:235(para) pwck.8.xml:207(para) passwd.5.xml:121(para)
+#: passwd.1.xml:372(para) newusers.8.xml:325(para) newgrp.1.xml:104(para)
+#: login.1.xml:333(para) grpck.8.xml:183(para) expiry.1.xml:73(para)
+#: chsh.1.xml:138(para) chpasswd.8.xml:190(para) chfn.1.xml:124(para)
+#: chage.1.xml:213(para)
 msgid "User account information."
 msgstr "informazioni sugli account utente."
 
-#: vipw.8.xml:128(filename) usermod.8.xml:293(filename)
-#: userdel.8.xml:132(filename) useradd.8.xml:502(filename)
-#: su.1.xml:233(filename) sg.1.xml:68(filename) shadow.5.xml:114(filename)
-#: shadow.3.xml:175(filename) pwck.8.xml:182(filename)
-#: passwd.5.xml:96(filename) passwd.1.xml:334(filename)
-#: newusers.8.xml:206(filename) newgrp.1.xml:79(filename)
-#: login.1.xml:301(filename) expiry.1.xml:47(filename)
-#: chpasswd.8.xml:162(filename) chage.1.xml:189(filename)
+#: vipw.8.xml:145(filename) usermod.8.xml:337(filename)
+#: userdel.8.xml:161(filename) useradd.8.xml:628(filename)
+#: su.1.xml:262(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
+#: shadow.3.xml:204(filename) pwck.8.xml:211(filename)
+#: passwd.5.xml:125(filename) passwd.1.xml:376(filename)
+#: newusers.8.xml:329(filename) newgrp.1.xml:108(filename)
+#: login.1.xml:337(filename) expiry.1.xml:77(filename)
+#: chpasswd.8.xml:194(filename) chage.1.xml:218(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
 # type: Plain text
-#: vipw.8.xml:130(para) usermod.8.xml:295(para) userdel.8.xml:134(para)
-#: useradd.8.xml:504(para) su.1.xml:235(para) sg.1.xml:70(para)
-#: shadow.5.xml:116(para) shadow.3.xml:177(para) pwck.8.xml:184(para)
-#: passwd.1.xml:336(para) newusers.8.xml:208(para) newgrp.1.xml:81(para)
-#: login.1.xml:303(para) expiry.1.xml:49(para) chpasswd.8.xml:164(para)
-#: chage.1.xml:192(para)
+#: vipw.8.xml:147(para) usermod.8.xml:339(para) userdel.8.xml:163(para)
+#: useradd.8.xml:630(para) su.1.xml:264(para) sg.1.xml:99(para)
+#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:213(para)
+#: passwd.1.xml:378(para) newusers.8.xml:331(para) newgrp.1.xml:110(para)
+#: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:196(para)
+#: chage.1.xml:221(para)
 msgid "Secure user account information."
 msgstr "Informazioni sicure sugli account di utenti."
 
 # type: SH
-#: vipw.8.xml:137(title) usermod.8.xml:302(title) userdel.8.xml:213(title)
-#: useradd.8.xml:610(title) suauth.5.xml:168(title) su.1.xml:242(title)
-#: sg.1.xml:89(title) shadow.5.xml:123(title) shadow.3.xml:184(title)
-#: pwconv.8.xml:150(title) pwck.8.xml:191(title) porttime.5.xml:88(title)
-#: passwd.5.xml:105(title) passwd.1.xml:394(title) nologin.8.xml:35(title)
-#: newusers.8.xml:233(title) newgrp.1.xml:100(title)
-#: login.defs.5.xml:445(title) login.access.5.xml:78(title)
-#: login.1.xml:334(title) limits.5.xml:120(title) gshadow.5.xml:79(title)
-#: grpck.8.xml:161(title) groups.1.xml:58(title) groupmod.8.xml:190(title)
-#: groupmems.8.xml:137(title) groupdel.8.xml:116(title)
-#: groupadd.8.xml:253(title) gpasswd.1.xml:219(title) faillog.8.xml:144(title)
-#: faillog.5.xml:50(title) expiry.1.xml:56(title) chsh.1.xml:128(title)
-#: chpasswd.8.xml:177(title) chgpasswd.8.xml:172(title) chfn.1.xml:102(title)
-#: chage.1.xml:232(title)
+#: vipw.8.xml:154(title) usermod.8.xml:346(title) userdel.8.xml:242(title)
+#: useradd.8.xml:736(title) suauth.5.xml:197(title) su.1.xml:271(title)
+#: sg.1.xml:118(title) shadow.5.xml:248(title) shadow.3.xml:213(title)
+#: pwconv.8.xml:180(title) pwck.8.xml:220(title) porttime.5.xml:117(title)
+#: passwd.5.xml:134(title) passwd.1.xml:436(title) nologin.8.xml:64(title)
+#: newusers.8.xml:356(title) newgrp.1.xml:129(title)
+#: login.defs.5.xml:471(title) login.access.5.xml:108(title)
+#: login.1.xml:370(title) limits.5.xml:150(title) gshadow.5.xml:107(title)
+#: grpck.8.xml:190(title) groups.1.xml:87(title) groupmod.8.xml:219(title)
+#: groupmems.8.xml:186(title) groupdel.8.xml:145(title)
+#: groupadd.8.xml:279(title) gpasswd.1.xml:248(title) faillog.8.xml:216(title)
+#: faillog.5.xml:79(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
+#: chpasswd.8.xml:209(title) chgpasswd.8.xml:204(title) chfn.1.xml:131(title)
+#: chage.1.xml:261(title)
 msgid "SEE ALSO"
 msgstr "VEDERE ANCHE"
 
 # type: Plain text
-#: vipw.8.xml:138(para)
+#: vipw.8.xml:155(para)
 msgid ""
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>group</"
@@ -413,26 +329,25 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: usermod.8.xml:10(refentrytitle) usermod.8.xml:15(refname)
-#: usermod.8.xml:21(command) login.defs.5.xml:411(term)
+#: usermod.8.xml:39(refentrytitle) usermod.8.xml:44(refname)
+#: usermod.8.xml:50(command) login.defs.5.xml:443(term)
 msgid "usermod"
 msgstr "usermod"
 
 # type: Plain text
-#: usermod.8.xml:16(refpurpose)
+#: usermod.8.xml:45(refpurpose)
 msgid "modify a user account"
 msgstr "modifica l'account di un utente"
 
 # type: TH
-#: usermod.8.xml:25(replaceable) userdel.8.xml:25(replaceable)
-#: useradd.8.xml:33(replaceable) su.1.xml:41(replaceable)
-#: passwd.1.xml:31(replaceable) chsh.1.xml:27(replaceable)
-#: chage.1.xml:20(replaceable)
+#: usermod.8.xml:54(replaceable) userdel.8.xml:54(replaceable)
+#: useradd.8.xml:63(replaceable) passwd.1.xml:60(replaceable)
+#: chsh.1.xml:56(replaceable) chage.1.xml:49(replaceable)
 msgid "LOGIN"
 msgstr "LOGIN"
 
 # type: Plain text
-#: usermod.8.xml:31(para)
+#: usermod.8.xml:60(para)
 msgid ""
 "The <command>usermod</command> command modifies the system account files to "
 "reflect the changes that are specified on the command line."
@@ -442,30 +357,30 @@
 "comando."
 
 # type: TP
-#: usermod.8.xml:39(para)
+#: usermod.8.xml:68(para)
 msgid "The options which apply to the <command>usermod</command> command are:"
 msgstr "Il comando <command>usermod</command> accetta le seguenti opzioni:"
 
 # type: IP
-#: usermod.8.xml:45(term)
+#: usermod.8.xml:74(term)
 msgid "<option>-a</option>, <option>--append</option>"
 msgstr "<option>-a</option>, <option>--append</option>"
 
-#: usermod.8.xml:49(para)
+#: usermod.8.xml:78(para)
 msgid ""
 "Add the user to the supplemental group(s). Use only with <option>-G</option> "
 "option."
 msgstr ""
 
 # type: TP
-#: usermod.8.xml:56(term) useradd.8.xml:83(term)
+#: usermod.8.xml:85(term) useradd.8.xml:125(term)
 msgid ""
 "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:61(para)
+#: usermod.8.xml:90(para)
 msgid ""
 "The new value of the user's password file comment field. It is normally "
 "modified using the <citerefentry><refentrytitle>chfn</"
@@ -476,32 +391,43 @@
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
 # type: TP
-#: usermod.8.xml:70(term) useradd.8.xml:96(term)
+#: usermod.8.xml:99(term) useradd.8.xml:138(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:75(para)
+#: usermod.8.xml:104(para)
+#, fuzzy
+msgid "The user's new login directory."
+msgstr "- una home directory valida"
+
+# type: Plain text
+#: usermod.8.xml:107(para)
+#, fuzzy
+#| msgid ""
+#| "The user's new login directory. If the <option>-m</option> option is "
+#| "given the contents of the current home directory will be moved to the new "
+#| "home directory, which is created if it does not already exist."
 msgid ""
-"The user's new login directory. If the <option>-m</option> option is given "
-"the contents of the current home directory will be moved to the new home "
-"directory, which is created if it does not already exist."
+"If the <option>-m</option> option is given the contents of the current home "
+"directory will be moved to the new home directory, which is created if it "
+"does not already exist."
 msgstr ""
 "La nuova directory di login dell'utente. Se è data l'opzione <option>-m</"
 "option> il contenuto della home directory corrente sarà spostato nella nuova "
 "home directory, che viene creata se non esiste già."
 
 # type: TP
-#: usermod.8.xml:84(term) useradd.8.xml:123(term) useradd.8.xml:394(term)
+#: usermod.8.xml:116(term) useradd.8.xml:165(term) useradd.8.xml:494(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:89(para) useradd.8.xml:128(para)
+#: usermod.8.xml:121(para) useradd.8.xml:170(para)
 msgid ""
 "The date on which the user account will be disabled. The date is specified "
 "in the format <emphasis remap=\"I\">YYYY-MM-DD</emphasis>."
@@ -510,32 +436,50 @@
 "specificata nel formato <emphasis remap=\"I\">MM/GG/AA</emphasis>."
 
 # type: TP
-#: usermod.8.xml:96(term) useradd.8.xml:135(term) useradd.8.xml:403(term)
+#: usermod.8.xml:128(term) useradd.8.xml:183(term) useradd.8.xml:507(term)
 msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:101(para) useradd.8.xml:140(para)
+#: usermod.8.xml:133(para)
+#, fuzzy
+#| msgid ""
+#| "The number of days after a password has expired before the account will "
+#| "be disabled."
 msgid ""
 "The number of days after a password expires until the account is permanently "
-"disabled. A value of 0 disables the account as soon as the password has "
-"expired, and a value of -1 disables the feature. The default value is -1."
+"disabled."
 msgstr ""
+"Il numero di giorni dopo la scadenza di una password prima che l'account "
+"venga disabilitato."
+
+# type: Plain text
+#: usermod.8.xml:137(para)
+#, fuzzy
+#| msgid ""
+#| "The number of days after a password expires until the account is "
+#| "permanently disabled. A value of 0 disables the account as soon as the "
+#| "password has expired, and a value of -1 disables the feature. The default "
+#| "value is -1."
+msgid ""
+"A value of 0 disables the account as soon as the password has expired, and a "
+"value of -1 disables the feature. The default value is -1."
+msgstr ""
 "Il numero di giorni dopo la scadenza della password prima che l'account "
 "verrà permanentemente disabilitato. Un valore pari a 0 disabilita l'account "
 "non appena la password è scaduta, ed un valore pari a -1 disabilita questa "
 "caratteristica. Il valore predefinito è -1."
 
 # type: IP
-#: usermod.8.xml:110(term) useradd.8.xml:149(term) useradd.8.xml:415(term)
+#: usermod.8.xml:145(term) useradd.8.xml:203(term) useradd.8.xml:523(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:115(para)
+#: usermod.8.xml:150(para)
 msgid ""
 "The group name or number of the user's new initial login group. The group "
 "name must exist. A group number must refer to an already existing group. The "
@@ -545,7 +489,7 @@
 "gruppo deve esistere. Un numero di gruppo deve riferirsi ad un gruppo già "
 "esistente. Il numero di gruppo predefinito è 1."
 
-#: usermod.8.xml:123(term) useradd.8.xml:163(term)
+#: usermod.8.xml:158(term) useradd.8.xml:231(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -553,17 +497,35 @@
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:128(para)
+#: usermod.8.xml:163(para)
 #, fuzzy
+#| msgid ""
+#| "A list of supplementary groups which the user is also a member of. Each "
+#| "group is separated from the next by a comma, with no intervening "
+#| "whitespace. The groups are subject to the same restrictions as the group "
+#| "given with the <option>-g</option> option. The default is for the user to "
+#| "belong only to the initial group."
 msgid ""
 "A list of supplementary groups which the user is also a member of. Each "
 "group is separated from the next by a comma, with no intervening whitespace. "
 "The groups are subject to the same restrictions as the group given with the "
-"<option>-g</option> option. If the user is currently a member of a group "
-"which is not listed, the user will be removed from the group. This behaviour "
-"can be changed via the <option>-a</option> option, which appends the user to "
-"the current supplementary group list."
+"<option>-g</option> option."
 msgstr ""
+"Una lista di gruppi supplementari di cui l'utente è altresì membro.  Ciascun "
+"gruppo è separato dal successivo da una virgola, senza spazi bianchi "
+"intermedi.  I gruppi sono soggetti alle stesse restrizioni del gruppo dato "
+"con l'opzione <option>-g</option>.  Il comportamento predefinito è che "
+"l'utente appartenga solo al gruppo iniziale."
+
+# type: Plain text
+#: usermod.8.xml:170(para)
+#, fuzzy
+msgid ""
+"If the user is currently a member of a group which is not listed, the user "
+"will be removed from the group. This behaviour can be changed via the "
+"<option>-a</option> option, which appends the user to the current "
+"supplementary group list."
+msgstr ""
 "Una lista di gruppi supplementari di cui l'utente è altresì membro. Ciascun "
 "gruppo è separato dal successivo da una virgola, senza spazi bianchi "
 "intermedi. I gruppi sono soggetti alle stesse restrizioni del gruppo dato "
@@ -571,20 +533,20 @@
 "gruppo che non è elencato, l'utente verrà rimosso dal gruppo."
 
 # type: IP
-#: usermod.8.xml:141(term)
+#: usermod.8.xml:179(term)
 msgid ""
 "<option>-l</option>, <option>--login</option><replaceable>NEW_LOGIN</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:146(para)
+#: usermod.8.xml:184(para)
 #, fuzzy
 msgid ""
-"The name of the user will be changed from <emphasis remap=\"I\">LOGIN</"
-"emphasis> to <emphasis remap=\"I\">NEW_LOGIN</emphasis>. Nothing else is "
-"changed. In particular, the user's home directory name should probably be "
-"changed manually to reflect the new login name."
+"The name of the user will be changed from <replaceable>LOGIN</replaceable> "
+"to <replaceable>NEW_LOGIN</replaceable>. Nothing else is changed. In "
+"particular, the user's home directory name should probably be changed "
+"manually to reflect the new login name."
 msgstr ""
 "Il nome dell'utente verrà cambiato da I<login> a I<nome_login>.  Niente "
 "altro viene cambiato.  In particolare, la home directory dell'utente "
@@ -592,18 +554,18 @@
 "di login."
 
 # type: IP
-#: usermod.8.xml:156(term)
+#: usermod.8.xml:194(term)
 msgid "<option>-L</option>, <option>--lock</option>"
 msgstr "<option>-L</option>, <option>--lock</option>"
 
-#: usermod.8.xml:160(para)
+#: usermod.8.xml:198(para)
 msgid ""
 "Lock a user's password. This puts a '!' in front of the encrypted password, "
 "effectively disabling the password. You can't use this option with <option>-"
 "p</option> or <option>-U</option>."
 msgstr ""
 
-#: usermod.8.xml:166(para)
+#: usermod.8.xml:204(para)
 msgid ""
 "Note: if you wish to lock the account (not only access with a password), you "
 "should also set the <replaceable>EXPIRE_DATE</replaceable> to "
@@ -611,41 +573,41 @@
 msgstr ""
 
 # type: TP
-#: usermod.8.xml:175(term) useradd.8.xml:282(term) groupmod.8.xml:82(term)
-#: groupadd.8.xml:107(term)
+#: usermod.8.xml:213(term) useradd.8.xml:364(term) groupmod.8.xml:111(term)
+#: groupadd.8.xml:133(term)
 msgid "<option>-o</option>, <option>--non-unique</option>"
 msgstr "<option>-o</option>, <option>--non-unique</option>"
 
-#: usermod.8.xml:179(para)
+#: usermod.8.xml:217(para)
 msgid ""
 "When used with the <option>-u</option> option, this option allows to change "
 "the user ID to a non-unique value."
 msgstr ""
 
 # type: TP
-#: usermod.8.xml:186(term) useradd.8.xml:290(term) groupmod.8.xml:93(term)
-#: groupadd.8.xml:117(term)
+#: usermod.8.xml:224(term) useradd.8.xml:376(term) groupmod.8.xml:122(term)
+#: groupadd.8.xml:143(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:191(para)
+#: usermod.8.xml:229(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
 msgstr ""
 
 # type: TP
-#: usermod.8.xml:199(term) useradd.8.xml:322(term) useradd.8.xml:428(term)
-#: su.1.xml:128(term) chsh.1.xml:56(term)
+#: usermod.8.xml:237(term) useradd.8.xml:416(term) useradd.8.xml:544(term)
+#: su.1.xml:157(term) chsh.1.xml:85(term)
 msgid ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
 
 # type: Plain text
-#: usermod.8.xml:204(para) chsh.1.xml:60(para)
+#: usermod.8.xml:242(para) chsh.1.xml:89(para)
 msgid ""
 "The name of the user's new login shell. Setting this field to blank causes "
 "the system to select the default login shell."
@@ -654,21 +616,53 @@
 "si fa in modo che il sistema selezioni la shell di connessione predefinita."
 
 # type: TP
-#: usermod.8.xml:211(term) useradd.8.xml:335(term)
+#: usermod.8.xml:249(term) useradd.8.xml:431(term)
 msgid ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 
+#: usermod.8.xml:254(para)
+msgid "The new numerical value of the user's ID."
+msgstr ""
+
 # type: Plain text
-#: usermod.8.xml:216(para)
+#: usermod.8.xml:257(para)
+#, fuzzy
+#| msgid ""
+#| "The numerical value of the user's ID. This value must be unique, unless "
+#| "the <option>-o</option> option is used. The value must be non-negative. "
+#| "The default is to use the smallest ID value greater than 999 and greater "
+#| "than every other user. Values between 0 and 999 are typically reserved "
+#| "for system accounts."
 msgid ""
-"The numerical value of the user's ID. This value must be unique, unless the "
-"<option>-o</option> option is used. The value must be non-negative. Values "
-"between 0 and 999 are typically reserved for system accounts. Any files "
-"which the user owns and which are located in the directory tree rooted at "
-"the user's home directory will have the file user ID changed automatically. "
-"Files outside of the user's home directory must be altered manually."
+"This value must be unique, unless the <option>-o</option> option is used. "
+"The value must be non-negative. Values between 0 and 999 are typically "
+"reserved for system accounts."
 msgstr ""
+"Il valore numerico dell'identificatore (ID) del gruppo.  Questo valore deve "
+"essere univoco, a meno che non venga usata l'opzione <option>-o</option>.  "
+"Il valore deve essere non-negativo.  La scelta predefinita è quella di usare "
+"il minimo valore di ID superiore a 999 e superiore a qualunque altro "
+"gruppo.  Valori tra 0 e 999 sono tipicamente riservati per account di "
+"sistema."
+
+# type: Plain text
+#: usermod.8.xml:263(para)
+#, fuzzy
+#| msgid ""
+#| "The numerical value of the user's ID. This value must be unique, unless "
+#| "the <option>-o</option> option is used. The value must be non-negative. "
+#| "Values between 0 and 999 are typically reserved for system accounts. Any "
+#| "files which the user owns and which are located in the directory tree "
+#| "rooted at the user's home directory will have the file user ID changed "
+#| "automatically. Files outside of the user's home directory must be altered "
+#| "manually."
+msgid ""
+"Any files which the user owns and which are located in the directory tree "
+"rooted at the user's home directory will have the file user ID changed "
+"automatically. Files outside of the user's home directory must be altered "
+"manually."
+msgstr ""
 "Il valore numerico dell'ID dell'utente.  Questo valore deve essere univoco, "
 "a meno che non venga usata l'opzione <option>-o</option>. Questo valore deve "
 "essere non-negativo. Valori tra 0 e 999 sono tipicamente riservati ad "
@@ -678,18 +672,18 @@
 "fuori della home directory dell'utente devono essere modificati manualmente."
 
 # type: IP
-#: usermod.8.xml:229(term)
+#: usermod.8.xml:273(term)
 msgid "<option>-U</option>, <option>--unlock</option>"
 msgstr "<option>-U</option>, <option>--unlock</option>"
 
-#: usermod.8.xml:233(para)
+#: usermod.8.xml:277(para)
 msgid ""
 "Unlock a user's password. This removes the '!' in front of the encrypted "
 "password. You can't use this option with <option>-p</option> or <option>-L</"
 "option>."
 msgstr ""
 
-#: usermod.8.xml:238(para)
+#: usermod.8.xml:282(para)
 msgid ""
 "Note: if you wish to unlock the account (not only access with a password), "
 "you should also set the <replaceable>EXPIRE_DATE</replaceable> (for example "
@@ -698,20 +692,20 @@
 msgstr ""
 
 # type: SH
-#: usermod.8.xml:252(title) userdel.8.xml:192(title) useradd.8.xml:451(title)
-#: su.1.xml:188(title) shadow.3.xml:164(title) passwd.1.xml:296(title)
-#: newusers.8.xml:160(title) login.1.xml:202(title) lastlog.8.xml:123(title)
-#: groupdel.8.xml:40(title) groupadd.8.xml:187(title) gpasswd.1.xml:174(title)
-#: faillog.8.xml:121(title) chpasswd.8.xml:125(title)
-#: chgpasswd.8.xml:125(title)
+#: usermod.8.xml:296(title) userdel.8.xml:221(title) useradd.8.xml:573(title)
+#: su.1.xml:217(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
+#: newusers.8.xml:283(title) login.1.xml:238(title) lastlog.8.xml:159(title)
+#: groupdel.8.xml:69(title) groupadd.8.xml:213(title) gpasswd.1.xml:203(title)
+#: faillog.8.xml:193(title) chpasswd.8.xml:157(title)
+#: chgpasswd.8.xml:157(title)
 msgid "CAVEATS"
 msgstr "AVVISI/CAVEAT"
 
 # type: Plain text
-#: usermod.8.xml:253(para)
+#: usermod.8.xml:297(para)
 #, fuzzy
 msgid ""
-"<command>usermod</command> will not allow you to change the name of a user "
+"<command>usermod</command> will not allow you to change the name of an user "
 "who is logged in. You must make certain that the named user is not executing "
 "any processes when this command is being executed if the user's numerical "
 "user ID is being changed. You must change the owner of any <command>crontab</"
@@ -727,15 +721,38 @@
 "cambiare il proprietario di ogni <command>at</command> job manualmente. "
 "Occorre fare qualunque cambiamento che riguarda NIS sul server NIS."
 
+#: usermod.8.xml:309(title) userdel.8.xml:125(title) useradd.8.xml:596(title)
+#: su.1.xml:225(title) sg.1.xml:76(title) pwconv.8.xml:146(title)
+#: pwck.8.xml:182(title) passwd.1.xml:349(title) newusers.8.xml:297(title)
+#: newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:154(title)
+#: groupmod.8.xml:138(title) groupmems.8.xml:156(title)
+#: groupdel.8.xml:76(title) groupadd.8.xml:175(title) gpasswd.1.xml:215(title)
+#: chsh.1.xml:120(title) chpasswd.8.xml:171(title) chgpasswd.8.xml:165(title)
+#: chfn.1.xml:99(title)
+msgid "CONFIGURATION"
+msgstr ""
+
+#: usermod.8.xml:310(para) userdel.8.xml:126(para) useradd.8.xml:597(para)
+#: su.1.xml:226(para) sg.1.xml:77(para) pwck.8.xml:183(para)
+#: passwd.1.xml:350(para) newusers.8.xml:298(para) newgrp.1.xml:88(para)
+#: login.1.xml:273(para) grpck.8.xml:155(para) groupmod.8.xml:139(para)
+#: groupmems.8.xml:157(para) groupdel.8.xml:77(para) groupadd.8.xml:176(para)
+#: gpasswd.1.xml:216(para) chsh.1.xml:121(para) chpasswd.8.xml:172(para)
+#: chgpasswd.8.xml:166(para) chfn.1.xml:100(para)
+msgid ""
+"The following configuration variables in <filename>/etc/login.defs</"
+"filename> change the behavior of this tool:"
+msgstr ""
+
 # type: IP
-#: usermod.8.xml:2(term) userdel.8.xml:2(term) useradd.8.xml:2(term)
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: usermod.8.xml:32(term) userdel.8.xml:32(term) useradd.8.xml:32(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>MAIL_DIR</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: usermod.8.xml:4(para) userdel.8.xml:4(para) useradd.8.xml:4(para)
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: usermod.8.xml:34(para) userdel.8.xml:34(para) useradd.8.xml:34(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "The mail spool directory. This is needed to manipulate the mailbox when its "
 "corresponding user account is modified or deleted. If not specified, a "
@@ -743,38 +760,98 @@
 msgstr ""
 
 # type: IP
-#: usermod.8.xml:11(term) userdel.8.xml:11(term) useradd.8.xml:11(term)
-#: su.1.xml:11(term) login.defs.5.xml:11(term) login.1.xml:11(term)
+#: usermod.8.xml:41(term) userdel.8.xml:41(term) useradd.8.xml:41(term)
+#: su.1.xml:41(term) login.defs.5.xml:41(term) login.1.xml:41(term)
 #, fuzzy
 msgid "<option>MAIL_FILE</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: usermod.8.xml:13(para) userdel.8.xml:13(para) useradd.8.xml:13(para)
-#: su.1.xml:13(para) login.defs.5.xml:13(para) login.1.xml:13(para)
+#: usermod.8.xml:43(para) userdel.8.xml:43(para) useradd.8.xml:43(para)
+#: su.1.xml:43(para) login.defs.5.xml:43(para) login.1.xml:43(para)
 msgid ""
 "Defines the location of the users mail spool files relatively to their home "
 "directory."
 msgstr ""
 
 #. FIXME: MAIL_FILE not used in useradd
-#: usermod.8.xml:20(para) userdel.8.xml:20(para) useradd.8.xml:20(para)
-#: su.1.xml:20(para) login.defs.5.xml:20(para) login.1.xml:20(para)
+#: usermod.8.xml:50(para) userdel.8.xml:50(para) useradd.8.xml:50(para)
+#: su.1.xml:50(para) login.defs.5.xml:50(para) login.1.xml:50(para)
 msgid ""
 "The <option>MAIL_DIR</option> and <option>MAIL_FILE</option> variables are "
 "used by <command>useradd</command>, <command>usermod</command>, and "
 "<command>userdel</command> to create, move, or delete the user's mail spool."
 msgstr ""
 
-#: usermod.8.xml:26(para) userdel.8.xml:26(para) useradd.8.xml:26(para)
-#: su.1.xml:26(para) login.defs.5.xml:26(para) login.1.xml:26(para)
+#: usermod.8.xml:56(para) userdel.8.xml:56(para) useradd.8.xml:56(para)
+#: su.1.xml:56(para) login.defs.5.xml:56(para) login.1.xml:56(para)
 msgid ""
 "If <option>MAIL_CHECK_ENAB</option> is set to <replaceable>yes</"
 "replaceable>, they are also used to define the <envar>MAIL</envar> "
 "environment variable."
 msgstr ""
 
+#: usermod.8.xml:30(term) userdel.8.xml:30(term) useradd.8.xml:30(term)
+#: pwconv.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: grpck.8.xml:30(term) groupmod.8.xml:30(term) groupmems.8.xml:30(term)
+#: groupdel.8.xml:30(term) groupadd.8.xml:30(term) gpasswd.1.xml:30(term)
+#: chgpasswd.8.xml:30(term)
+msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
+msgstr ""
+
+#: usermod.8.xml:32(para) userdel.8.xml:32(para) useradd.8.xml:32(para)
+#: pwconv.8.xml:32(para) newusers.8.xml:32(para) login.defs.5.xml:32(para)
+#: grpck.8.xml:32(para) groupmod.8.xml:32(para) groupmems.8.xml:32(para)
+#: groupdel.8.xml:32(para) groupadd.8.xml:32(para) gpasswd.1.xml:32(para)
+#: chgpasswd.8.xml:32(para)
+msgid ""
+"Maximum members per group entry. When the maximum is reached, a new group "
+"entry (line) is started in <filename>/etc/group</filename> (with the same "
+"name, same password, and same GID)."
+msgstr ""
+
+#: usermod.8.xml:37(para) userdel.8.xml:37(para) useradd.8.xml:37(para)
+#: pwconv.8.xml:37(para) newusers.8.xml:37(para) login.defs.5.xml:37(para)
+#: grpck.8.xml:37(para) groupmod.8.xml:37(para) groupmems.8.xml:37(para)
+#: groupdel.8.xml:37(para) groupadd.8.xml:37(para) gpasswd.1.xml:37(para)
+#: chgpasswd.8.xml:37(para)
+msgid ""
+"The default value is 0, meaning that there are no limits in the number of "
+"members in a group."
+msgstr ""
+
+#. Note: on HP, split groups have the same ID, but different
+#.                names.
+#: usermod.8.xml:43(para) userdel.8.xml:43(para) useradd.8.xml:43(para)
+#: pwconv.8.xml:43(para) newusers.8.xml:43(para) login.defs.5.xml:43(para)
+#: grpck.8.xml:43(para) groupmod.8.xml:43(para) groupmems.8.xml:43(para)
+#: groupdel.8.xml:43(para) groupadd.8.xml:43(para) gpasswd.1.xml:43(para)
+#: chgpasswd.8.xml:43(para)
+msgid ""
+"This feature (split group) permits to limit the length of lines in the group "
+"file. This is useful to make sure that lines for NIS groups are not larger "
+"than 1024 characters."
+msgstr ""
+
+#: usermod.8.xml:48(para) userdel.8.xml:48(para) useradd.8.xml:48(para)
+#: pwconv.8.xml:48(para) newusers.8.xml:48(para) login.defs.5.xml:48(para)
+#: grpck.8.xml:48(para) groupmod.8.xml:48(para) groupmems.8.xml:48(para)
+#: groupdel.8.xml:48(para) groupadd.8.xml:48(para) gpasswd.1.xml:48(para)
+#: chgpasswd.8.xml:48(para)
+msgid "If you need to enforce such limit, you can use 25."
+msgstr ""
+
+#: usermod.8.xml:51(para) userdel.8.xml:51(para) useradd.8.xml:51(para)
+#: pwconv.8.xml:51(para) newusers.8.xml:51(para) login.defs.5.xml:51(para)
+#: grpck.8.xml:51(para) groupmod.8.xml:51(para) groupmems.8.xml:51(para)
+#: groupdel.8.xml:51(para) groupadd.8.xml:51(para) gpasswd.1.xml:51(para)
+#: chgpasswd.8.xml:51(para)
+msgid ""
+"Note: split groups may not be supported by all tools (even in the Shadow "
+"toolsuite. You should not use this variable unless you really need it."
+msgstr ""
+
 # type: Plain text
-#: usermod.8.xml:303(para)
+#: usermod.8.xml:347(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -812,18 +889,18 @@
 "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: userdel.8.xml:12(refentrytitle) userdel.8.xml:17(refname)
-#: userdel.8.xml:22(command) login.defs.5.xml:402(term)
+#: userdel.8.xml:41(refentrytitle) userdel.8.xml:46(refname)
+#: userdel.8.xml:51(command) login.defs.5.xml:434(term)
 msgid "userdel"
 msgstr "userdel"
 
 # type: Plain text
-#: userdel.8.xml:18(refpurpose)
+#: userdel.8.xml:47(refpurpose)
 msgid "delete a user account and related files"
 msgstr "Rimuove l'account di un utente ed i file relativi"
 
 # type: Plain text
-#: userdel.8.xml:32(para)
+#: userdel.8.xml:61(para)
 #, fuzzy
 msgid ""
 "The <command>userdel</command> command modifies the system account files, "
@@ -835,16 +912,16 @@
 "\">login_name</emphasis>. L'utente nominato deve esistere."
 
 # type: TP
-#: userdel.8.xml:41(para)
+#: userdel.8.xml:70(para)
 msgid "The options which apply to the <command>userdel</command> command are:"
 msgstr "Il comando <command>userdel</command> accetta le seguenti opzioni:"
 
 # type: IP
-#: userdel.8.xml:46(term) groupadd.8.xml:52(term)
+#: userdel.8.xml:75(term) groupadd.8.xml:78(term)
 msgid "<option>-f</option>, <option>--force</option>"
 msgstr "<option>-f</option>, <option>--force</option>"
 
-#: userdel.8.xml:50(para)
+#: userdel.8.xml:79(para)
 msgid ""
 "This option forces the removal of the user account, even if the user is "
 "still logged in. It also forces <command>userdel</command> to remove the "
@@ -856,19 +933,19 @@
 "removed, even if it is still the primary group of another user."
 msgstr ""
 
-#: userdel.8.xml:63(para)
+#: userdel.8.xml:92(para)
 msgid ""
 "<emphasis>Note:</emphasis> This option is dangerous and may leave your "
 "system in an inconsistent state."
 msgstr ""
 
 # type: IP
-#: userdel.8.xml:76(term)
+#: userdel.8.xml:105(term)
 msgid "<option>-r</option>, <option>--remove</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
 # type: Plain text
-#: userdel.8.xml:80(para)
+#: userdel.8.xml:109(para)
 msgid ""
 "Files in the user's home directory will be removed along with the home "
 "directory itself and the user's mail spool. Files located in other file "
@@ -878,17 +955,17 @@
 "directory stessa. I file collocati in altri file system dovranno essere "
 "ricercati e rimossi manualmente."
 
-#: userdel.8.xml:86(para)
+#: userdel.8.xml:115(para)
 msgid ""
 "The mail spool is defined by the <emphasis>MAIL_DIR</emphasis> variable in "
 "the <filename>login.defs</filename> file."
 msgstr ""
 
-#: userdel.8.xml:2(term) login.defs.5.xml:2(term)
+#: userdel.8.xml:32(term) login.defs.5.xml:32(term)
 msgid "<option>USERDEL_CMD</option> (string)"
 msgstr ""
 
-#: userdel.8.xml:4(para) login.defs.5.xml:4(para)
+#: userdel.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "If defined, this command is run when removing a user. It should remove any "
 "at/cron/print jobs etc. owned by the user to be removed (passed as the first "
@@ -896,136 +973,141 @@
 msgstr ""
 
 # type: IP
-#: userdel.8.xml:2(term) useradd.8.xml:2(term) su.1.xml:2(term)
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: userdel.8.xml:32(term) useradd.8.xml:32(term) su.1.xml:32(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>USERGROUPS_ENAB</option> (boolean)"
 msgstr "<option>-c </option>I<commento>"
 
-#: userdel.8.xml:4(para) useradd.8.xml:4(para) su.1.xml:4(para)
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: userdel.8.xml:34(para) useradd.8.xml:34(para) su.1.xml:34(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Enable setting of the umask group bits to be the same as owner bits "
 "(examples: 022 -&gt; 002, 077 -&gt; 007) for non-root users, if the uid is "
-"the same as gid, and username is the same as the primary group name. "
-"<placeholder-1/> If set to <replaceable>yes</replaceable>, <command>userdel</"
-"command> will remove the user's group if it contains no more members, and "
+"the same as gid, and username is the same as the primary group name."
+msgstr ""
+
+#: userdel.8.xml:39(para) useradd.8.xml:39(para) su.1.xml:39(para)
+#: login.defs.5.xml:39(para) login.1.xml:39(para)
+msgid ""
+"If set to <replaceable>yes</replaceable>, <command>userdel</command> will "
+"remove the user's group if it contains no more members, and "
 "<command>useradd</command> will create by default a group with the name of "
 "the user."
 msgstr ""
 
-#: userdel.8.xml:120(filename) useradd.8.xml:532(filename)
-#: pwconv.8.xml:141(filename) newusers.8.xml:224(filename)
-#: login.access.5.xml:69(filename) groupadd.8.xml:178(filename)
-#: chsh.1.xml:119(filename) chpasswd.8.xml:168(filename)
-#: chgpasswd.8.xml:163(filename) chfn.1.xml:87(filename)
+#: userdel.8.xml:149(filename) useradd.8.xml:658(filename)
+#: pwconv.8.xml:171(filename) newusers.8.xml:347(filename)
+#: login.access.5.xml:99(filename) groupadd.8.xml:204(filename)
+#: chsh.1.xml:148(filename) chpasswd.8.xml:200(filename)
+#: chgpasswd.8.xml:195(filename) chfn.1.xml:116(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
-#: userdel.8.xml:122(para) useradd.8.xml:534(para) pwconv.8.xml:143(para)
-#: newusers.8.xml:226(para) login.access.5.xml:71(para)
-#: groupadd.8.xml:180(para) chsh.1.xml:121(para) chpasswd.8.xml:170(para)
-#: chgpasswd.8.xml:165(para) chfn.1.xml:89(para)
+#: userdel.8.xml:151(para) useradd.8.xml:660(para) pwconv.8.xml:173(para)
+#: newusers.8.xml:349(para) login.access.5.xml:101(para)
+#: groupadd.8.xml:206(para) chsh.1.xml:150(para) chpasswd.8.xml:202(para)
+#: chgpasswd.8.xml:197(para) chfn.1.xml:118(para)
 msgid "Shadow password suite configuration."
 msgstr ""
 
 # type: SH
-#: userdel.8.xml:141(title) useradd.8.xml:541(title) pwck.8.xml:208(title)
-#: passwd.1.xml:343(title) grpck.8.xml:182(title) groupmod.8.xml:139(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:208(title) chage.1.xml:199(title)
+#: userdel.8.xml:170(title) useradd.8.xml:667(title) pwck.8.xml:241(title)
+#: passwd.1.xml:385(title) grpck.8.xml:214(title) groupmod.8.xml:168(title)
+#: groupdel.8.xml:106(title) groupadd.8.xml:234(title) chage.1.xml:228(title)
 msgid "EXIT VALUES"
 msgstr "VALORI RESTITUITI"
 
 # type: IP
-#: userdel.8.xml:146(replaceable) useradd.8.xml:546(replaceable)
-#: pwck.8.xml:213(replaceable) passwd.1.xml:348(replaceable)
-#: grpck.8.xml:187(replaceable) groupmod.8.xml:144(replaceable)
-#: groupdel.8.xml:82(replaceable) groupadd.8.xml:213(replaceable)
-#: chage.1.xml:204(replaceable)
+#: userdel.8.xml:175(replaceable) useradd.8.xml:672(replaceable)
+#: pwck.8.xml:246(replaceable) passwd.1.xml:390(replaceable)
+#: grpck.8.xml:219(replaceable) groupmod.8.xml:173(replaceable)
+#: groupdel.8.xml:111(replaceable) groupadd.8.xml:239(replaceable)
+#: chage.1.xml:233(replaceable)
 msgid "0"
 msgstr "0"
 
 # type: Plain text
-#: userdel.8.xml:148(para) useradd.8.xml:548(para) pwck.8.xml:215(para)
-#: passwd.1.xml:350(para) grpck.8.xml:189(para) groupmod.8.xml:146(para)
-#: groupdel.8.xml:84(para) groupadd.8.xml:215(para) chage.1.xml:206(para)
+#: userdel.8.xml:177(para) useradd.8.xml:674(para) pwck.8.xml:248(para)
+#: passwd.1.xml:392(para) grpck.8.xml:221(para) groupmod.8.xml:175(para)
+#: groupdel.8.xml:113(para) groupadd.8.xml:241(para) chage.1.xml:235(para)
 msgid "success"
 msgstr "successo"
 
 # type: IP
-#: userdel.8.xml:152(replaceable) useradd.8.xml:552(replaceable)
-#: su.1.xml:26(manvolnum) sg.1.xml:10(manvolnum) pwck.8.xml:219(replaceable)
-#: passwd.1.xml:16(manvolnum) passwd.1.xml:354(replaceable)
-#: newgrp.1.xml:10(manvolnum) login.1.xml:42(manvolnum)
-#: grpck.8.xml:193(replaceable) groups.1.xml:6(manvolnum)
-#: gpasswd.1.xml:14(manvolnum) expiry.1.xml:12(manvolnum)
-#: chsh.1.xml:12(manvolnum) chfn.1.xml:13(manvolnum) chage.1.xml:6(manvolnum)
-#: chage.1.xml:210(replaceable)
+#: userdel.8.xml:181(replaceable) useradd.8.xml:678(replaceable)
+#: su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:252(replaceable)
+#: passwd.1.xml:45(manvolnum) passwd.1.xml:396(replaceable)
+#: newgrp.1.xml:39(manvolnum) login.1.xml:71(manvolnum)
+#: grpck.8.xml:225(replaceable) groups.1.xml:35(manvolnum)
+#: gpasswd.1.xml:43(manvolnum) expiry.1.xml:42(manvolnum)
+#: chsh.1.xml:41(manvolnum) chfn.1.xml:42(manvolnum) chage.1.xml:35(manvolnum)
+#: chage.1.xml:239(replaceable)
 msgid "1"
 msgstr "1"
 
 # type: Plain text
-#: userdel.8.xml:154(para) useradd.8.xml:554(para)
+#: userdel.8.xml:183(para) useradd.8.xml:680(para)
 #, fuzzy
 msgid "can't update password file"
 msgstr "impossibile aggiornare i file delle password"
 
 # type: IP
-#: userdel.8.xml:158(replaceable) useradd.8.xml:558(replaceable)
-#: pwck.8.xml:225(replaceable) passwd.1.xml:360(replaceable)
-#: grpck.8.xml:199(replaceable) groupmod.8.xml:150(replaceable)
-#: groupdel.8.xml:88(replaceable) groupadd.8.xml:219(replaceable)
-#: chage.1.xml:216(replaceable)
+#: userdel.8.xml:187(replaceable) useradd.8.xml:684(replaceable)
+#: pwck.8.xml:258(replaceable) passwd.1.xml:402(replaceable)
+#: grpck.8.xml:231(replaceable) groupmod.8.xml:179(replaceable)
+#: groupdel.8.xml:117(replaceable) groupadd.8.xml:245(replaceable)
+#: chage.1.xml:245(replaceable)
 msgid "2"
 msgstr "2"
 
 # type: Plain text
-#: userdel.8.xml:160(para) useradd.8.xml:560(para) pwck.8.xml:221(para)
-#: grpck.8.xml:195(para) groupmod.8.xml:152(para) groupdel.8.xml:90(para)
-#: groupadd.8.xml:221(para) chage.1.xml:218(para)
+#: userdel.8.xml:189(para) useradd.8.xml:686(para) pwck.8.xml:254(para)
+#: grpck.8.xml:227(para) groupmod.8.xml:181(para) groupdel.8.xml:119(para)
+#: groupadd.8.xml:247(para) chage.1.xml:247(para)
 msgid "invalid command syntax"
 msgstr "sintassi del comando errata"
 
-#: userdel.8.xml:164(replaceable) useradd.8.xml:576(replaceable)
-#: passwd.1.xml:384(replaceable) groupmod.8.xml:168(replaceable)
-#: groupdel.8.xml:94(replaceable)
+#: userdel.8.xml:193(replaceable) useradd.8.xml:702(replaceable)
+#: pwck.8.xml:282(replaceable) passwd.1.xml:426(replaceable)
+#: groupmod.8.xml:197(replaceable) groupdel.8.xml:123(replaceable)
 msgid "6"
 msgstr "6"
 
 # type: Plain text
-#: userdel.8.xml:166(para)
+#: userdel.8.xml:195(para)
 msgid "specified user doesn't exist"
 msgstr "il gruppo specificato non esiste"
 
-#: userdel.8.xml:172(para)
+#: userdel.8.xml:201(para)
 msgid "user currently logged in"
 msgstr ""
 
 # type: IP
-#: userdel.8.xml:176(replaceable) useradd.8.xml:588(replaceable)
-#: groupmod.8.xml:180(replaceable) groupdel.8.xml:106(replaceable)
-#: groupadd.8.xml:243(replaceable)
+#: userdel.8.xml:205(replaceable) useradd.8.xml:714(replaceable)
+#: groupmod.8.xml:209(replaceable) groupdel.8.xml:135(replaceable)
+#: groupadd.8.xml:269(replaceable)
 msgid "10"
 msgstr "10"
 
 # type: Plain text
-#: userdel.8.xml:178(para) useradd.8.xml:590(para) groupmod.8.xml:182(para)
-#: groupdel.8.xml:108(para) groupadd.8.xml:245(para)
+#: userdel.8.xml:207(para) useradd.8.xml:716(para) groupmod.8.xml:211(para)
+#: groupdel.8.xml:137(para) groupadd.8.xml:271(para)
 msgid "can't update group file"
 msgstr "non è possibile aggiornare il file group"
 
 # type: IP
-#: userdel.8.xml:182(replaceable) useradd.8.xml:594(replaceable)
+#: userdel.8.xml:211(replaceable) useradd.8.xml:720(replaceable)
 msgid "12"
 msgstr "12"
 
 # type: Plain text
-#: userdel.8.xml:184(para)
+#: userdel.8.xml:213(para)
 msgid "can't remove home directory"
 msgstr ""
 
 # type: TP
-#: userdel.8.xml:142(para)
+#: userdel.8.xml:171(para)
 #, fuzzy
 msgid ""
 "The <command>userdel</command> command exits with the following values: "
@@ -1037,7 +1119,7 @@
 "Il comando <command>grpck</command> restituisce i seguenti valori:"
 
 # type: Plain text
-#: userdel.8.xml:193(para)
+#: userdel.8.xml:222(para)
 msgid ""
 "<command>userdel</command> will not allow you to remove an account if the "
 "user is currently logged in. You must kill any running processes which "
@@ -1049,7 +1131,7 @@
 "possibile rimuovere nessun attributo NIS su un client NIS."
 
 # type: Plain text
-#: userdel.8.xml:198(para)
+#: userdel.8.xml:227(para)
 msgid ""
 "You may not remove any NIS attributes on a NIS client. This must be "
 "performed on the NIS server."
@@ -1057,7 +1139,7 @@
 "Non è possibile rimuovere nessun attributo NIS su un client NIS.  Questo "
 "deve essere fatto sul server NIS."
 
-#: userdel.8.xml:201(para)
+#: userdel.8.xml:230(para)
 msgid ""
 "If <emphasis>USERGROUPS_ENAB</emphasis> is defined to <emphasis remap=\"I"
 "\">yes</emphasis> in <filename>/etc/login.defs</filename>, <command>userdel</"
@@ -1069,7 +1151,7 @@
 msgstr ""
 
 # type: Plain text
-#: userdel.8.xml:214(para)
+#: userdel.8.xml:243(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1103,25 +1185,25 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: useradd.8.xml:19(refentrytitle) useradd.8.xml:24(refname)
-#: useradd.8.xml:29(command) useradd.8.xml:36(command)
-#: useradd.8.xml:40(command) login.defs.5.xml:389(term)
+#: useradd.8.xml:49(refentrytitle) useradd.8.xml:54(refname)
+#: useradd.8.xml:59(command) useradd.8.xml:66(command)
+#: useradd.8.xml:70(command) login.defs.5.xml:421(term)
 msgid "useradd"
 msgstr "useradd"
 
 # type: Plain text
-#: useradd.8.xml:25(refpurpose)
+#: useradd.8.xml:55(refpurpose)
 msgid "create a new user or update default new user information"
 msgstr ""
 "crea un nuovo utente o aggiorna le informazioni predefinite per i nuovi "
 "utenti"
 
-#: useradd.8.xml:37(arg) useradd.8.xml:41(arg)
+#: useradd.8.xml:67(arg) useradd.8.xml:71(arg)
 msgid "-D"
 msgstr "-D"
 
 # type: Plain text
-#: useradd.8.xml:50(para)
+#: useradd.8.xml:80(para)
 #, fuzzy
 msgid ""
 "When invoked without the <option>-D</option> option, the <command>useradd</"
@@ -1139,19 +1221,26 @@
 "iniziali, a seconda delle opzioni sulla linea di comando.  Le opzioni che si "
 "applicano al comando <command>useradd</command> sono"
 
+#: useradd.8.xml:89(para)
+msgid ""
+"By default, a group will also be created for the new user (see <option>-g</"
+"option>, <option>-N</option>, <option>-U</option>, and "
+"<option>USERGROUPS_ENAB</option>)."
+msgstr ""
+
 # type: Plain text
-#: useradd.8.xml:63(para)
+#: useradd.8.xml:98(para)
 msgid "The options which apply to the <command>useradd</command> command are:"
 msgstr "Il comando <command>useradd</command> accetta le seguenti opzioni:"
 
 # type: TP
-#: useradd.8.xml:67(term) useradd.8.xml:379(term)
+#: useradd.8.xml:102(term) useradd.8.xml:475(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
 msgstr ""
 
-#: useradd.8.xml:72(para)
+#: useradd.8.xml:107(para)
 msgid ""
 "The default base directory for the system if <option>-d</"
 "option><replaceable>HOME_DIR</replaceable> is not specified. "
@@ -1160,14 +1249,21 @@
 "<replaceable>BASE_DIR</replaceable> must exist."
 msgstr ""
 
-#: useradd.8.xml:88(para)
+#: useradd.8.xml:115(para)
 msgid ""
+"If this option is not specified, <command>useradd</command> will use the "
+"base directory specified by the <option>HOME</option> variable in <filename>/"
+"etc/default/useradd</filename>, or <filename>/home</filename> by default."
+msgstr ""
+
+#: useradd.8.xml:130(para)
+msgid ""
 "Any text string. It is generally a short description of the login, and is "
 "currently used as the field for the user's full name."
 msgstr ""
 
 # type: Plain text
-#: useradd.8.xml:101(para)
+#: useradd.8.xml:143(para)
 #, fuzzy
 msgid ""
 "The new user will be created using <replaceable>HOME_DIR</replaceable> as "
@@ -1183,33 +1279,76 @@
 "login."
 
 # type: IP
-#: useradd.8.xml:113(term)
+#: useradd.8.xml:155(term)
 #, fuzzy
 #| msgid "<option>-d</option>, <option>--delete</option>"
 msgid "<option>-D</option>, <option>--defaults</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
 # type: SS
-#: useradd.8.xml:117(para)
+#: useradd.8.xml:159(para)
 #, fuzzy
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr "Cambiare i valori predefiniti"
 
+#: useradd.8.xml:174(para)
+msgid ""
+"If not specified, <command>useradd</command> will use the default expiry "
+"date specified by the <option>EXPIRE</option> variable in <filename>/etc/"
+"default/useradd</filename>, or an empty string (no expiry) by default."
+msgstr ""
+
 # type: Plain text
-#: useradd.8.xml:154(para)
+#: useradd.8.xml:188(para)
 #, fuzzy
+#| msgid ""
+#| "The number of days after a password expires until the account is "
+#| "permanently disabled. A value of 0 disables the account as soon as the "
+#| "password has expired, and a value of -1 disables the feature. The default "
+#| "value is -1."
 msgid ""
+"The number of days after a password expires until the account is permanently "
+"disabled. A value of 0 disables the account as soon as the password has "
+"expired, and a value of -1 disables the feature."
+msgstr ""
+"Il numero di giorni dopo la scadenza della password prima che l'account "
+"verrà permanentemente disabilitato. Un valore pari a 0 disabilita l'account "
+"non appena la password è scaduta, ed un valore pari a -1 disabilita questa "
+"caratteristica. Il valore predefinito è -1."
+
+#: useradd.8.xml:194(para)
+msgid ""
+"If not specified, <command>useradd</command> will use the default inactivity "
+"period specified by the <option>INACTIVE</option> variable in the <filename>/"
+"etc/default/useradd</filename>, or -1 by default."
+msgstr ""
+
+# type: Plain text
+#: useradd.8.xml:208(para)
+msgid ""
 "The group name or number of the user's initial login group. The group name "
-"must exist. A group number must refer to an already existing group. The "
-"default group number is 1 or whatever is specified in <filename>/etc/default/"
-"useradd</filename>."
+"must exist. A group number must refer to an already existing group."
 msgstr ""
-"Il nuome o numero del nuovo gruppo di connessione dell'utente. Il nome del "
+"Il nuome o numero del nuovo gruppo di connessione dell'utente.  Il nome del "
 "gruppo deve esistere. Un numero di gruppo deve riferirsi ad un gruppo già "
-"esistente. Il numero di gruppo predefinito è 1."
+"esistente."
 
+#: useradd.8.xml:213(para)
+msgid ""
+"If not specified, the bahavior of <command>useradd</command> will depend on "
+"the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>. If this variable is set to <replaceable>yes</replaceable> (or "
+"<option>-U/--user-group</option> is specified on the command line), a group "
+"will be created for the user, with the same name as her loginname. If the "
+"variable is set to <replaceable>no</replaceable> (or <option>-N/--no-user-"
+"group</option> is specified on the command line), useradd will set the "
+"primary group of the new user to the value specified by the <option>GROUP</"
+"option> variable in <filename>/etc/default/useradd</filename>, or 100 by "
+"default."
+msgstr ""
+
 # type: Plain text
-#: useradd.8.xml:168(para)
+#: useradd.8.xml:236(para)
 msgid ""
 "A list of supplementary groups which the user is also a member of. Each "
 "group is separated from the next by a comma, with no intervening whitespace. "
@@ -1224,7 +1363,7 @@
 "l'utente appartenga solo al gruppo iniziale."
 
 # type: IP
-#: useradd.8.xml:185(term)
+#: useradd.8.xml:253(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
@@ -1235,7 +1374,7 @@
 msgstr ""
 "<option>-u</option>, <option>--user</option> <replaceable>LOGIN</replaceable>"
 
-#: useradd.8.xml:190(para)
+#: useradd.8.xml:258(para)
 msgid ""
 "The skeleton directory, which contains files and directories to be copied in "
 "the user's home directory, when the home directory is created by "
@@ -1243,7 +1382,7 @@
 msgstr ""
 
 # type: IP
-#: useradd.8.xml:195(para)
+#: useradd.8.xml:263(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
@@ -1251,23 +1390,23 @@
 "home</option>) option is specified."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:199(para)
+#: useradd.8.xml:267(para)
 msgid ""
-"If this option is not set, the skeleton directory is defined in <filename>/"
-"etc/default/useradd</filename> or, by default, <filename>/etc/skel</"
-"filename>."
+"If this option is not set, the skeleton directory is defined by the "
+"<option>SKEL</option> variable in <filename>/etc/default/useradd</filename> "
+"or, by default, <filename>/etc/skel</filename>."
 msgstr ""
 
-#: useradd.8.xml:207(term) groupadd.8.xml:86(term)
+#: useradd.8.xml:276(term) groupadd.8.xml:112(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
 msgstr ""
 
-#: useradd.8.xml:212(para)
+#: useradd.8.xml:281(para)
 msgid ""
-"Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS "
-"and others). <placeholder-1/> Example: <option>-K </"
+"Overrides <filename>/etc/login.defs</filename> defaults (UID_MIN, UID_MAX, "
+"UMASK, PASS_MAX_DAYS and others). <placeholder-1/> Example: <option>-K </"
 "option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</"
 "replaceable> can be used when creating system account to turn off password "
 "ageing, even though system account has no password at all. Multiple <option>-"
@@ -1277,71 +1416,95 @@
 "replaceable>=<replaceable>499</replaceable>"
 msgstr ""
 
-#: useradd.8.xml:226(para)
+#: useradd.8.xml:295(para)
 msgid ""
 "Note: <option>-K </option><replaceable>UID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable> doesn't work yet."
 msgstr ""
 
-#: useradd.8.xml:234(option) groupmems.8.xml:24(arg)
-#: groupmems.8.xml:79(option)
-msgid "-l"
-msgstr "-l"
+# type: IP
+#: useradd.8.xml:303(term)
+#, fuzzy
+#| msgid "<option>-l</option>, <option>--list</option>"
+msgid "<option>-l</option>, <option>--no-log-init</option>"
+msgstr "<option>-l</option>, <option>--list</option>"
 
-#: useradd.8.xml:236(para)
+#: useradd.8.xml:305(para)
 msgid "Do not add the user to the lastlog and faillog databases."
 msgstr ""
 
-#: useradd.8.xml:239(para)
+#: useradd.8.xml:308(para)
 msgid ""
 "By default, the user's entries in the lastlog and faillog databases are "
 "resetted to avoid reusing the entry from a previously deleted user."
 msgstr ""
 
 # type: IP
-#: useradd.8.xml:247(term)
+#: useradd.8.xml:316(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:251(para)
+#: useradd.8.xml:320(para)
 msgid ""
 "Create the user's home directory if it does not exist. The files and "
 "directories contained in the skeleton directory (which can be defined with "
 "the <option>-k</option> option) will be copied to the home directory."
 msgstr ""
 
-#: useradd.8.xml:257(para)
+#: useradd.8.xml:326(para)
 msgid "By default, no home directories are created."
 msgstr ""
 
+#: useradd.8.xml:333(option)
+#, fuzzy
+#| msgid "-"
+msgid "-M"
+msgstr "-"
+
+#: useradd.8.xml:336(para)
+msgid ""
+"Do no create the user's home directory, even if the system wide setting from "
+"<filename>/etc/login.defs</filename> (<option>CREATE_HOME</option>) is set "
+"to <replaceable>yes</replaceable>."
+msgstr ""
+
 # type: TP
-#: useradd.8.xml:263(term)
+#: useradd.8.xml:345(term)
 #, fuzzy
 #| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-N</option>, <option>--no-user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: useradd.8.xml:267(para)
+#: useradd.8.xml:349(para)
 msgid ""
 "Do not create a group with the same name as the user, but add the user to "
 "the group specified by the <option>-g</option> option or by the GROUP "
 "variable in <filename>/etc/default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:273(para) useradd.8.xml:358(para)
+#: useradd.8.xml:355(para) useradd.8.xml:454(para)
 msgid ""
 "The default behavior (if the <option>-g</option>, <option>-N</option>, and "
 "<option>-U</option> options are not specified) is defined by the "
-"<option>USERGROUPS_ENAB</option> variable in <filename>login.defs</filename>."
+"<option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>."
 msgstr ""
 
-#: useradd.8.xml:286(para)
+#: useradd.8.xml:368(para)
 msgid "Allow the creation of a user account with a duplicate (non-unique) UID."
 msgstr ""
 
+# type: IP
+#: useradd.8.xml:369(para)
+#, fuzzy
+#| msgid "<option>-m</option>, <option>--create-home</option>"
+msgid ""
+"This option is only valid in combination with the <option>-o</option> option."
+msgstr "<option>-m</option>, <option>--create-home</option>"
+
 # type: Plain text
-#: useradd.8.xml:295(para)
+#: useradd.8.xml:381(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
@@ -1349,38 +1512,53 @@
 msgstr ""
 
 # type: IP
-#: useradd.8.xml:303(term) newusers.8.xml:113(term) groupadd.8.xml:130(term)
+#: useradd.8.xml:389(term) newusers.8.xml:236(term) groupadd.8.xml:156(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-r</option>, <option>--system</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: useradd.8.xml:307(para) newusers.8.xml:117(para)
+#: useradd.8.xml:393(para) newusers.8.xml:240(para)
 msgid "Create a system account."
 msgstr ""
 
-#: useradd.8.xml:310(para) newusers.8.xml:120(para)
+#: useradd.8.xml:396(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are choosen in the "
 "<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
-"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<filename>/etc/login.defs</filename>, instead of <option>UID_MIN</option>-"
 "<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
 "the creation of groups)."
 msgstr ""
 
+#: useradd.8.xml:405(para)
+msgid ""
+"Note that <command>useradd</command> will not create a home directory for "
+"such an user, regardless of the default setting in <filename>/etc/login."
+"defs</filename> (<option>CREATE_HOME</option>). You have to specify the "
+"<option>-m</option> options if you want a home directory for a system "
+"account to be created."
+msgstr ""
+
 # type: Plain text
-#: useradd.8.xml:327(para)
+#: useradd.8.xml:421(para)
+#, fuzzy
+#| msgid ""
+#| "The name of the user's login shell. The default is to leave this field "
+#| "blank, which causes the system to select the default login shell."
 msgid ""
 "The name of the user's login shell. The default is to leave this field "
-"blank, which causes the system to select the default login shell."
+"blank, which causes the system to select the default login shell specified "
+"by the <option>SHELL</option> variable in <filename>/etc/default/useradd</"
+"filename>, or an empty string by default."
 msgstr ""
 "Il nome della shell di login dell'utente. Il comportamento predefinito è di "
 "lasciare vuoto questo campo, che fa sì che il sistema selezioni la shell di "
 "connessione predefinita."
 
 # type: Plain text
-#: useradd.8.xml:340(para)
+#: useradd.8.xml:436(para)
 msgid ""
 "The numerical value of the user's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. The "
@@ -1396,25 +1574,25 @@
 "sistema."
 
 # type: TP
-#: useradd.8.xml:350(term)
+#: useradd.8.xml:446(term)
 #, fuzzy
 #| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-U</option>, <option>--user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: useradd.8.xml:354(para)
+#: useradd.8.xml:450(para)
 msgid ""
 "Create a group with the same name as the user, and add the user to this "
 "group."
 msgstr ""
 
 # type: SS
-#: useradd.8.xml:369(title)
+#: useradd.8.xml:465(title)
 msgid "Changing the default values"
 msgstr "Cambiare i valori predefiniti"
 
 # type: Plain text
-#: useradd.8.xml:370(para)
+#: useradd.8.xml:466(para)
 #, fuzzy
 msgid ""
 "When invoked with only the <option>-D</option> option, <command>useradd</"
@@ -1427,7 +1605,7 @@
 "valori predefiniti dalla linea di comando. Le opzioni valide sono"
 
 # type: Plain text
-#: useradd.8.xml:384(para)
+#: useradd.8.xml:480(para)
 #, fuzzy
 msgid ""
 "The path prefix for a new user's home directory. The user's name will be "
@@ -1440,13 +1618,25 @@
 "nome della nuova directory se non viene usata l'opzione <option>-d</"
 "option>I< quando si crea un nuovo account.>"
 
+#: useradd.8.xml:487(para)
+msgid ""
+"This option sets the <option>HOME</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
 # type: Plain text
-#: useradd.8.xml:399(para)
+#: useradd.8.xml:499(para)
 msgid "The date on which the user account is disabled."
 msgstr "La data in cui l'account dell'utente verrà disabilitato."
 
+#: useradd.8.xml:500(para)
+msgid ""
+"This option sets the <option>EXPIRE</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
 # type: Plain text
-#: useradd.8.xml:408(para)
+#: useradd.8.xml:512(para)
 msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
@@ -1454,35 +1644,59 @@
 "Il numero di giorni dopo la scadenza di una password prima che l'account "
 "venga disabilitato."
 
-# type: Plain text
-#: useradd.8.xml:420(para)
+#: useradd.8.xml:516(para)
 msgid ""
-"The group name or ID for a new user's initial group. The named group must "
-"exist, and a numerical group ID must have an existing entry."
+"This option sets the <option>INACTIVE</option> variable in <filename>/etc/"
+"default/useradd</filename>."
 msgstr ""
-"Il nome o ID del gruppo iniziale per un nuovo utente.  Il gruppo nominato "
-"deve esistere, ed un ID numerico di gruppo deve avere una voce esistente."
 
-#: useradd.8.xml:433(para)
+#: useradd.8.xml:528(para)
+msgid ""
+"The group name or ID for a new user's initial group (when the <option>-N/--"
+"no-user-group</option> is used or when the <option>USERGROUPS_ENAB</option> "
+"variable is set to <replaceable>no</replaceable> in <filename>/etc/login."
+"defs</filename>. The named group must exist, and a numerical group ID must "
+"have an existing entry."
+msgstr ""
+
+#: useradd.8.xml:537(para)
+msgid ""
+"This option sets the <option>GROUP</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
+#: useradd.8.xml:549(para)
 msgid "The name of a new user's login shell."
 msgstr ""
 
+#: useradd.8.xml:552(para)
+msgid ""
+"This option sets the <option>SHELL</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
 # type: SH
-#: useradd.8.xml:444(title)
+#: useradd.8.xml:564(title)
 msgid "NOTES"
 msgstr "NOTE"
 
 # type: Plain text
-#: useradd.8.xml:445(para)
+#: useradd.8.xml:565(para)
+#, fuzzy
+#| msgid ""
+#| "The system administrator is responsible for placing the default user "
+#| "files in the <filename>/etc/skel/</filename> directory."
 msgid ""
 "The system administrator is responsible for placing the default user files "
-"in the <filename>/etc/skel/</filename> directory."
+"in the <filename>/etc/skel/</filename> directory (or any other skeleton "
+"directory specified in <filename>/etc/default/useradd</filename> or on the "
+"command line)."
 msgstr ""
 "L'amministratore di sistema è responsabile del posizionamento dei file "
 "predefiniti degli utenti nella directory <filename>/etc/skel/</filename>."
 
 # type: Plain text
-#: useradd.8.xml:452(para)
+#: useradd.8.xml:574(para)
 #, fuzzy
 msgid ""
 "You may not add a user to a NIS or LDAP group. This must be performed on the "
@@ -1491,49 +1705,70 @@
 "Non è possibile aggiungere un utente ad un gruppo NIS. Questo deve essere "
 "fatto sul server NIS."
 
-#: useradd.8.xml:457(para)
+#: useradd.8.xml:579(para)
 msgid ""
 "Similarly, if the username already exists in an external user database such "
 "as NIS or LDAP, <command>useradd</command> will deny the user account "
 "creation request."
 msgstr ""
 
-#: useradd.8.xml:463(para)
+#: useradd.8.xml:585(para)
 msgid ""
 "Usernames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
-"regular expression terms: [a-z_][a-z0-9_-]*[$]"
+"regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 
+#: useradd.8.xml:590(para)
+msgid "Usernames may only be up to 32 characters long."
+msgstr ""
+
 # type: IP
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: groupadd.8.xml:2(term)
+#: useradd.8.xml:30(term) login.defs.5.xml:30(term)
 #, fuzzy
+msgid "<option>CREATE_HOME</option> (boolean)"
+msgstr "<option>-c </option>I<commento>"
+
+#: useradd.8.xml:32(para) login.defs.5.xml:32(para)
+msgid ""
+"Indicate if a home directory should be created by default for new users."
+msgstr ""
+
+#: useradd.8.xml:36(para) login.defs.5.xml:36(para)
+msgid ""
+"This setting does not apply to system users, and can be overriden on the "
+"command line."
+msgstr ""
+
+# type: IP
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: groupadd.8.xml:32(term)
+#, fuzzy
 msgid "<option>GID_MAX</option> (number)"
 msgstr "<option>-I</option> I<inattività>"
 
 # type: IP
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
-#: groupadd.8.xml:3(term)
+#: useradd.8.xml:33(term) newusers.8.xml:33(term) login.defs.5.xml:33(term)
+#: groupadd.8.xml:33(term)
 #, fuzzy
 msgid "<option>GID_MIN</option> (number)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
-#: groupadd.8.xml:5(para)
+#: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para)
+#: groupadd.8.xml:35(para)
 msgid ""
 "Range of group IDs used for the creation of regular groups by "
 "<command>useradd</command>, <command>useradd</command>, or "
 "<command>newusers</command>."
 msgstr ""
 
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) pwck.8.xml:2(term)
-#: newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 msgid "<option>PASS_MAX_DAYS</option> (number)"
 msgstr ""
 
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) pwck.8.xml:4(para)
-#: newusers.8.xml:4(para) login.defs.5.xml:4(para)
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "The maximum number of days a password may be used. If the password is older "
 "than this, a password change will be forced. If not specified, -1 will be "
@@ -1541,27 +1776,27 @@
 msgstr ""
 
 # type: IP
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) pwck.8.xml:2(term)
-#: newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_MIN_DAYS</option> (number)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) pwck.8.xml:4(para)
-#: newusers.8.xml:4(para) login.defs.5.xml:4(para)
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "The minimum number of days allowed between password changes. Any password "
 "changes attempted sooner than this will be rejected. If not specified, -1 "
 "will be assumed (which disables the restriction)."
 msgstr ""
 
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) pwck.8.xml:2(term)
-#: newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 msgid "<option>PASS_WARN_AGE</option> (number)"
 msgstr ""
 
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) pwck.8.xml:4(para)
-#: newusers.8.xml:4(para) login.defs.5.xml:4(para)
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "The number of days warning given before a password expires. A zero means "
 "warning is given only upon the day of expiration, a negative value means no "
@@ -1569,21 +1804,21 @@
 msgstr ""
 
 # type: IP
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: groupadd.8.xml:2(term)
+#: useradd.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: groupadd.8.xml:30(term)
 #, fuzzy
 msgid "<option>SYS_GID_MAX</option> (number)"
 msgstr "<option>-I</option> I<inattività>"
 
 # type: IP
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
-#: groupadd.8.xml:3(term)
+#: useradd.8.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
+#: groupadd.8.xml:31(term)
 #, fuzzy
 msgid "<option>SYS_GID_MIN</option> (number)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
-#: groupadd.8.xml:5(para)
+#: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
+#: groupadd.8.xml:33(para)
 msgid ""
 "Range of group IDs used for the creation of system groups by "
 "<command>useradd</command>, <command>groupadd</command>, or "
@@ -1591,128 +1826,146 @@
 msgstr ""
 
 # type: IP
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
 #, fuzzy
 msgid "<option>SYS_UID_MAX</option> (number)"
 msgstr "<option>-I</option> I<inattività>"
 
 # type: IP
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
+#: useradd.8.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
 #, fuzzy
 msgid "<option>SYS_UID_MIN</option> (number)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
+#: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
 msgid ""
 "Range of user IDs used for the creation of system users by <command>useradd</"
 "command> or <command>newusers</command>."
 msgstr ""
 
 # type: IP
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>UID_MAX</option> (number)"
 msgstr "<option>-I</option> I<inattività>"
 
 # type: IP
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
+#: useradd.8.xml:33(term) newusers.8.xml:33(term) login.defs.5.xml:33(term)
 #, fuzzy
 msgid "<option>UID_MIN</option> (number)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
+#: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para)
 msgid ""
 "Range of user IDs used for the creation of regular users by "
 "<command>useradd</command> or <command>newusers</command>."
 msgstr ""
 
 # type: IP
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: login.1.xml:2(term)
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: login.1.xml:32(term)
 #, fuzzy
 msgid "<option>UMASK</option> (number)"
 msgstr "<option>-M</option> I<gg_max>"
 
-#: useradd.8.xml:4(para) newusers.8.xml:4(para) login.defs.5.xml:4(para)
-#: login.1.xml:4(para)
+#: useradd.8.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
+#: login.1.xml:34(para)
 msgid ""
-"The permission mask is initialized to this value. If not specified, the "
-"permission mask will be initialized to 022."
+"The file mode creation mask is initialized to this value. If not specified, "
+"the mask will be initialized to 022."
 msgstr ""
 
+#: useradd.8.xml:38(para) newusers.8.xml:38(para) login.defs.5.xml:38(para)
+#: login.1.xml:38(para)
+msgid ""
+"<command>useradd</command> and <command>newusers</command> use this mask to "
+"set the mode of the home directory they create"
+msgstr ""
+
+#: useradd.8.xml:42(para) newusers.8.xml:42(para) login.defs.5.xml:42(para)
+#: login.1.xml:42(para)
+msgid ""
+"It is also used by <command>login</command> to define users' initial umask. "
+"Note that this mask can be overriden by the user's GECOS line (if "
+"<option>QUOTAS_ENAB</option> is set) or by the specification of a limit with "
+"the <emphasis>K</emphasis> identifier in "
+"<citerefentry><refentrytitle>limits</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+
 # type: Plain text
-#: useradd.8.xml:520(filename)
+#: useradd.8.xml:646(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
-#: useradd.8.xml:522(para)
+#: useradd.8.xml:648(para)
 msgid "Default values for account creation."
 msgstr ""
 
-#: useradd.8.xml:526(filename)
+#: useradd.8.xml:652(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
 # type: Plain text
-#: useradd.8.xml:528(para)
+#: useradd.8.xml:654(para)
 msgid "Directory containing default files."
 msgstr "Directory contenente i file predefiniti."
 
 # type: IP
-#: useradd.8.xml:564(replaceable) shadow.3.xml:6(manvolnum)
-#: pwck.8.xml:231(replaceable) passwd.1.xml:366(replaceable)
-#: grpck.8.xml:205(replaceable) groupmod.8.xml:156(replaceable)
-#: groupadd.8.xml:225(replaceable)
+#: useradd.8.xml:690(replaceable) shadow.3.xml:35(manvolnum)
+#: pwck.8.xml:264(replaceable) passwd.1.xml:408(replaceable)
+#: grpck.8.xml:237(replaceable) groupmod.8.xml:185(replaceable)
+#: groupadd.8.xml:251(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:566(para) passwd.1.xml:386(para) groupmod.8.xml:158(para)
-#: groupadd.8.xml:227(para)
+#: useradd.8.xml:692(para) passwd.1.xml:428(para) groupmod.8.xml:187(para)
+#: groupadd.8.xml:253(para)
 msgid "invalid argument to option"
 msgstr ""
 
 # type: IP
-#: useradd.8.xml:570(replaceable) pwck.8.xml:237(replaceable)
-#: passwd.1.xml:372(replaceable) grpck.8.xml:211(replaceable)
-#: groupmod.8.xml:162(replaceable) groupadd.8.xml:231(replaceable)
+#: useradd.8.xml:696(replaceable) pwck.8.xml:270(replaceable)
+#: passwd.1.xml:414(replaceable) grpck.8.xml:243(replaceable)
+#: groupmod.8.xml:191(replaceable) groupadd.8.xml:257(replaceable)
 msgid "4"
 msgstr "4"
 
-#: useradd.8.xml:572(para)
+#: useradd.8.xml:698(para)
 msgid "UID already in use (and no <option>-o</option>)"
 msgstr ""
 
 # type: Plain text
-#: useradd.8.xml:578(para) groupmod.8.xml:164(para) groupmod.8.xml:170(para)
-#: groupdel.8.xml:96(para)
+#: useradd.8.xml:704(para) groupmod.8.xml:193(para) groupmod.8.xml:199(para)
+#: groupdel.8.xml:125(para)
 msgid "specified group doesn't exist"
 msgstr "il gruppo specificato non esiste"
 
-#: useradd.8.xml:582(replaceable) groupmod.8.xml:174(replaceable)
-#: groupadd.8.xml:237(replaceable)
+#: useradd.8.xml:708(replaceable) groupmod.8.xml:203(replaceable)
+#: groupadd.8.xml:263(replaceable)
 msgid "9"
 msgstr "9"
 
-#: useradd.8.xml:584(para)
+#: useradd.8.xml:710(para)
 msgid "username already in use"
 msgstr ""
 
 # type: Plain text
-#: useradd.8.xml:596(para)
+#: useradd.8.xml:722(para)
 msgid "can't create home directory"
 msgstr ""
 
 # type: IP
-#: useradd.8.xml:600(replaceable)
+#: useradd.8.xml:726(replaceable)
 msgid "13"
 msgstr "13"
 
-#: useradd.8.xml:602(para)
+#: useradd.8.xml:728(para)
 msgid "can't create mail spool"
 msgstr ""
 
 # type: TP
-#: useradd.8.xml:542(para)
+#: useradd.8.xml:668(para)
 #, fuzzy
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
@@ -1724,7 +1977,7 @@
 "Il comando <command>grpck</command> restituisce i seguenti valori:"
 
 # type: Plain text
-#: useradd.8.xml:611(para)
+#: useradd.8.xml:737(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1762,44 +2015,44 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: suauth.5.xml:5(refentrytitle) suauth.5.xml:10(refname)
+#: suauth.5.xml:34(refentrytitle) suauth.5.xml:39(refname)
 msgid "suauth"
 msgstr "suauth"
 
 # type: IP
-#: suauth.5.xml:6(manvolnum) shadow.5.xml:6(manvolnum)
-#: pwck.8.xml:243(replaceable) porttime.5.xml:6(manvolnum)
-#: passwd.5.xml:6(manvolnum) passwd.1.xml:378(replaceable)
-#: login.defs.5.xml:67(manvolnum) login.access.5.xml:6(manvolnum)
-#: limits.5.xml:6(manvolnum) gshadow.5.xml:6(manvolnum)
-#: grpck.8.xml:217(replaceable) faillog.5.xml:6(manvolnum)
+#: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
+#: pwck.8.xml:276(replaceable) porttime.5.xml:35(manvolnum)
+#: passwd.5.xml:35(manvolnum) passwd.1.xml:420(replaceable)
+#: login.defs.5.xml:98(manvolnum) login.access.5.xml:36(manvolnum)
+#: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
+#: grpck.8.xml:249(replaceable) faillog.5.xml:35(manvolnum)
 msgid "5"
 msgstr "5"
 
-#: suauth.5.xml:7(refmiscinfo) shadow.5.xml:7(refmiscinfo)
-#: porttime.5.xml:7(refmiscinfo) passwd.5.xml:7(refmiscinfo)
-#: login.defs.5.xml:68(refmiscinfo) login.access.5.xml:7(refmiscinfo)
-#: limits.5.xml:7(refmiscinfo) gshadow.5.xml:7(refmiscinfo)
-#: faillog.5.xml:7(refmiscinfo)
+#: suauth.5.xml:36(refmiscinfo) shadow.5.xml:36(refmiscinfo)
+#: porttime.5.xml:36(refmiscinfo) passwd.5.xml:36(refmiscinfo)
+#: login.defs.5.xml:99(refmiscinfo) login.access.5.xml:37(refmiscinfo)
+#: limits.5.xml:37(refmiscinfo) gshadow.5.xml:35(refmiscinfo)
+#: faillog.5.xml:36(refmiscinfo)
 msgid "File Formats and Conversions"
 msgstr ""
 
-#: suauth.5.xml:11(refpurpose)
+#: suauth.5.xml:40(refpurpose)
 msgid "detailed su control file"
 msgstr ""
 
-#: suauth.5.xml:16(command) suauth.5.xml:142(filename)
+#: suauth.5.xml:45(command) suauth.5.xml:171(filename)
 msgid "/etc/suauth"
 msgstr "/etc/suauth"
 
-#: suauth.5.xml:22(para)
+#: suauth.5.xml:51(para)
 msgid ""
 "The file <filename>/etc/suauth</filename> is referenced whenever the su "
 "command is called. It can change the behaviour of the su command, based upon:"
 msgstr ""
 
 #. .RS
-#: suauth.5.xml:29(literallayout)
+#: suauth.5.xml:58(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -1808,18 +2061,18 @@
 msgstr ""
 
 #. .fi
-#: suauth.5.xml:33(para)
+#: suauth.5.xml:62(para)
 msgid ""
 "2) the user executing the su command (or any groups he might be a member of)"
 msgstr ""
 
-#: suauth.5.xml:38(para)
+#: suauth.5.xml:67(para)
 msgid ""
 "The file is formatted like this, with lines starting with a # being treated "
 "as comment lines and ignored;"
 msgstr ""
 
-#: suauth.5.xml:43(literallayout)
+#: suauth.5.xml:72(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -1827,14 +2080,14 @@
 "    "
 msgstr ""
 
-#: suauth.5.xml:47(para)
+#: suauth.5.xml:76(para)
 msgid ""
 "Where to-id is either the word <emphasis>ALL</emphasis>, a list of usernames "
 "delimited by \",\" or the words <emphasis>ALL EXCEPT</emphasis> followed by "
 "a list of usernames delimited by \",\""
 msgstr ""
 
-#: suauth.5.xml:53(para)
+#: suauth.5.xml:82(para)
 msgid ""
 "from-id is formatted the same as to-id except the extra word "
 "<emphasis>GROUP</emphasis> is recognised. <emphasis>ALL EXCEPT GROUP</"
@@ -1845,40 +2098,40 @@
 "manvolnum></citerefentry> is neccessary."
 msgstr ""
 
-#: suauth.5.xml:64(para)
+#: suauth.5.xml:93(para)
 msgid "Action can be one only of the following currently supported options."
 msgstr ""
 
-#: suauth.5.xml:70(emphasis)
+#: suauth.5.xml:99(emphasis)
 msgid "DENY"
 msgstr ""
 
-#: suauth.5.xml:73(para)
+#: suauth.5.xml:102(para)
 msgid "The attempt to su is stopped before a password is even asked for."
 msgstr ""
 
 # type: SH
-#: suauth.5.xml:80(emphasis)
+#: suauth.5.xml:109(emphasis)
 msgid "NOPASS"
 msgstr ""
 
-#: suauth.5.xml:83(para)
+#: suauth.5.xml:112(para)
 msgid ""
 "The attempt to su is automatically successful; no password is asked for."
 msgstr ""
 
 # type: TH
-#: suauth.5.xml:91(emphasis)
+#: suauth.5.xml:120(emphasis)
 msgid "OWNPASS"
 msgstr ""
 
-#: suauth.5.xml:94(para)
+#: suauth.5.xml:123(para)
 msgid ""
 "For the su command to be successful, the user must enter his or her own "
 "password. They are told this."
 msgstr ""
 
-#: suauth.5.xml:102(para)
+#: suauth.5.xml:131(para)
 msgid ""
 "Note there are three separate fields delimited by a colon. No whitespace "
 "must surround this colon. Also note that the file is examined sequentially "
@@ -1888,12 +2141,12 @@
 msgstr ""
 
 # type: SH
-#: suauth.5.xml:112(title)
+#: suauth.5.xml:141(title)
 #, fuzzy
 msgid "EXAMPLE"
 msgstr "ESEMPI"
 
-#: suauth.5.xml:113(literallayout)
+#: suauth.5.xml:142(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -1921,11 +2174,11 @@
 msgstr ""
 
 # type: SH
-#: suauth.5.xml:149(title) pwconv.8.xml:105(title) login.defs.5.xml:428(title)
+#: suauth.5.xml:178(title) pwconv.8.xml:135(title) login.defs.5.xml:455(title)
 msgid "BUGS"
 msgstr "PROBLEMI"
 
-#: suauth.5.xml:150(para)
+#: suauth.5.xml:179(para)
 msgid ""
 "There could be plenty lurking. The file parser is particularly unforgiving "
 "about syntax errors, expecting no spurious whitespace (apart from beginning "
@@ -1933,12 +2186,12 @@
 msgstr ""
 
 # type: SH
-#: suauth.5.xml:159(title) shadow.3.xml:154(title)
+#: suauth.5.xml:188(title) shadow.3.xml:183(title)
 msgid "DIAGNOSTICS"
 msgstr "DIAGNOSTICA"
 
 # type: Plain text
-#: suauth.5.xml:160(para)
+#: suauth.5.xml:189(para)
 msgid ""
 "An error parsing the file is reported using "
 "<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</"
@@ -1946,7 +2199,7 @@
 msgstr ""
 
 # type: Plain text
-#: suauth.5.xml:169(para)
+#: suauth.5.xml:198(para)
 msgid ""
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -1954,28 +2207,33 @@
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: su.1.xml:25(refentrytitle) su.1.xml:30(refname) su.1.xml:35(command)
-#: login.defs.5.xml:363(term)
+#: su.1.xml:54(refentrytitle) su.1.xml:59(refname) su.1.xml:64(command)
+#: login.defs.5.xml:395(term)
 msgid "su"
 msgstr "su"
 
-#: su.1.xml:27(refmiscinfo) sg.1.xml:11(refmiscinfo)
-#: passwd.1.xml:17(refmiscinfo) newgrp.1.xml:11(refmiscinfo)
-#: login.1.xml:43(refmiscinfo) groups.1.xml:7(refmiscinfo)
-#: gpasswd.1.xml:15(refmiscinfo) expiry.1.xml:13(refmiscinfo)
-#: chsh.1.xml:13(refmiscinfo) chfn.1.xml:14(refmiscinfo)
-#: chage.1.xml:7(refmiscinfo)
+#: su.1.xml:56(refmiscinfo) sg.1.xml:40(refmiscinfo)
+#: passwd.1.xml:46(refmiscinfo) newgrp.1.xml:40(refmiscinfo)
+#: login.1.xml:72(refmiscinfo) groups.1.xml:36(refmiscinfo)
+#: gpasswd.1.xml:44(refmiscinfo) expiry.1.xml:43(refmiscinfo)
+#: chsh.1.xml:42(refmiscinfo) chfn.1.xml:43(refmiscinfo)
+#: chage.1.xml:36(refmiscinfo)
 msgid "User Commands"
 msgstr ""
 
 # type: Plain text
-#: su.1.xml:31(refpurpose)
+#: su.1.xml:60(refpurpose)
 #, fuzzy
 msgid "change user ID or become superuser"
 msgstr "cambia ID utente o diventa amministratore"
 
+#: su.1.xml:70(replaceable) login.1.xml:85(replaceable)
+#: login.1.xml:93(replaceable)
+msgid "username"
+msgstr ""
+
 # type: Plain text
-#: su.1.xml:49(para)
+#: su.1.xml:78(para)
 #, fuzzy
 msgid ""
 "The <command>su</command> command is used to become another user during a "
@@ -1991,7 +2249,7 @@
 "che l'utente troverebbe se effettuasse il login direttamente."
 
 # type: Plain text
-#: su.1.xml:58(para)
+#: su.1.xml:87(para)
 msgid ""
 "Additional arguments may be provided after the username, in which case they "
 "are supplied to the user's login shell. In particular, an argument of "
@@ -2006,14 +2264,14 @@
 "eseguito dalla shell specificata in <filename>/etc/passwd</filename> per "
 "l'utente di destinazione."
 
-#: su.1.xml:67(para)
+#: su.1.xml:96(para)
 msgid ""
 "You can use the <option>--</option> argument to separate <command>su</"
 "command> options from the arguments supplied to the shell."
 msgstr ""
 
 # type: Plain text
-#: su.1.xml:72(para)
+#: su.1.xml:101(para)
 msgid ""
 "The user will be prompted for a password, if appropriate. Invalid passwords "
 "will produce an error message. All attempts, both valid and invalid, are "
@@ -2025,7 +2283,7 @@
 "abuso del sistema."
 
 # type: Plain text
-#: su.1.xml:77(para)
+#: su.1.xml:106(para)
 #, fuzzy
 msgid ""
 "The current environment is passed to the new shell. The value of <envar>"
@@ -2043,7 +2301,7 @@
 "emphasis> in <filename>/etc/login.defs</filename>."
 
 # type: Plain text
-#: su.1.xml:86(para) login.1.xml:135(para)
+#: su.1.xml:115(para) login.1.xml:166(para)
 #, fuzzy
 msgid ""
 "A subsystem login is indicated by the presence of a \"*\" as the first "
@@ -2060,12 +2318,12 @@
 "di un nuovo file system al quale l'utente accede."
 
 # type: TP
-#: su.1.xml:95(para)
+#: su.1.xml:124(para)
 msgid "The options which apply to the <command>su</command> command are:"
 msgstr "Il comando <command>su</command> accetta le seguenti opzioni:"
 
 # type: IP
-#: su.1.xml:99(term)
+#: su.1.xml:128(term)
 #, fuzzy
 msgid ""
 "<option>-c</option>, <option>--command</option><replaceable>COMMAND</"
@@ -2074,62 +2332,62 @@
 "<option>-c</option>, <option>--command</option><replaceable>SHELL</"
 "replaceable>"
 
-#: su.1.xml:104(para)
+#: su.1.xml:133(para)
 msgid ""
 "Specify a command that will be invoked by the shell using its <option>-c</"
 "option>."
 msgstr ""
 
 # type: TP
-#: su.1.xml:111(term)
+#: su.1.xml:140(term)
 msgid "<option>-</option>, <option>-l</option>, <option>--login</option>"
 msgstr "<option>-</option>, <option>-l</option>, <option>--login</option>"
 
-#: su.1.xml:115(para)
+#: su.1.xml:144(para)
 msgid ""
 "Provide an environment similar to what the user would expect had the user "
 "logged in directly."
 msgstr ""
 
-#: su.1.xml:119(para)
+#: su.1.xml:148(para)
 msgid ""
 "When <option>-</option> is used, it must be specified as the last "
 "<command>su</command> option. The other forms (<option>-l</option> and "
 "<option>--login</option>) do not have this restriction."
 msgstr ""
 
-#: su.1.xml:133(para)
+#: su.1.xml:162(para)
 msgid "The shell that will be invoked."
 msgstr ""
 
-#: su.1.xml:138(para)
+#: su.1.xml:167(para)
 msgid "The shell specified with --shell."
 msgstr ""
 
-#: su.1.xml:141(para)
+#: su.1.xml:170(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
 msgstr ""
 
-#: su.1.xml:148(para)
+#: su.1.xml:177(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
 msgstr ""
 
-#: su.1.xml:154(para)
+#: su.1.xml:183(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
 msgstr ""
 
-#: su.1.xml:134(para)
+#: su.1.xml:163(para)
 msgid ""
 "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:161(para)
+#: su.1.xml:190(para)
 msgid ""
 "If the target user has a restricted shell (i.e. the shell field of this "
 "user's entry in <filename>/etc/passwd</filename> is not listed in <filename>/"
@@ -2139,7 +2397,7 @@
 msgstr ""
 
 # type: IP
-#: su.1.xml:172(term)
+#: su.1.xml:201(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -2148,19 +2406,19 @@
 "option>"
 
 # type: Plain text
-#: su.1.xml:177(para)
+#: su.1.xml:206(para)
 #, fuzzy
 msgid "Preserve the current environment."
 msgstr "Non modifica l'ambiente."
 
-#: su.1.xml:178(para)
+#: su.1.xml:207(para)
 msgid ""
 "If the target user has a restricted shell, this option has no effect (unless "
 "<command>su</command> is called by root)."
 msgstr ""
 
 # type: Plain text
-#: su.1.xml:189(para)
+#: su.1.xml:218(para)
 msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -2169,29 +2427,29 @@
 "solo una parte di esse potrebbe essere in uso su un determinato sistema."
 
 # type: IP
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>CONSOLE</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, either full pathname of a file containing device names or a \":"
 "\" delimited list of device names. Root logins will be allowed only upon "
 "these devices."
 msgstr ""
 
-#: su.1.xml:9(para) login.defs.5.xml:9(para) login.1.xml:9(para)
+#: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
 msgid "If not defined, root will be allowed on any device."
 msgstr ""
 
 # type: IP
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>CONSOLE_GROUPS</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "List of groups to add to the user's supplementary group set when logging in "
 "on the console (as determined by the CONSOLE setting). Default is none. "
@@ -2200,18 +2458,18 @@
 msgstr ""
 
 # type: IP
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>DEFAULT_HOME</option> (boolean)"
 msgstr "<option>-c </option>I<commento>"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Indicate if login is allowed if we can't cd to the home directory. Default "
 "in no."
 msgstr ""
 
-#: su.1.xml:8(para) login.defs.5.xml:8(para) login.1.xml:8(para)
+#: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
 msgid ""
 "If set to <replaceable>yes</replaceable>, the user will login in the root "
 "(<filename>/</filename>) directory if it is not possible to cd to her home "
@@ -2220,43 +2478,43 @@
 
 # type: IP
 #. XXX: When compiled with PAM support, only sulogin uses ENV_HZ
-#: su.1.xml:3(term) login.defs.5.xml:3(term) login.1.xml:3(term)
+#: su.1.xml:33(term) login.defs.5.xml:33(term) login.1.xml:33(term)
 #, fuzzy
 msgid "<option>ENV_HZ</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: su.1.xml:5(para) login.defs.5.xml:5(para) login.1.xml:5(para)
+#: su.1.xml:35(para) login.defs.5.xml:35(para) login.1.xml:35(para)
 msgid ""
 "If set, it will be used to define the HZ environment variable when a user "
 "login. The value must be preceded by <replaceable>HZ=</replaceable>. A "
 "common value on Linux is <replaceable>HZ=100</replaceable>."
 msgstr ""
 
-#: su.1.xml:11(para) login.defs.5.xml:11(para) login.1.xml:11(para)
+#: su.1.xml:41(para) login.defs.5.xml:41(para) login.1.xml:41(para)
 msgid ""
 "The <envar>HZ</envar> environment variable is only set when the user (the "
 "superuser) logs in with <command>sulogin</command>."
 msgstr ""
 
 # type: IP
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENVIRON_FILE</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If this file exists and is readable, login environment will be read from it. "
 "Every line should be in the form name=value."
 msgstr ""
 
 # type: IP
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_PATH</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, it will be used to define the PATH environment variable when a "
 "regular user login. The value can be preceded by <replaceable>PATH=</"
@@ -2266,12 +2524,12 @@
 msgstr ""
 
 # type: IP
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_SUPATH</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, it will be used to define the PATH environment variable when the "
 "superuser login. The value can be preceded by <replaceable>PATH=</"
@@ -2281,12 +2539,12 @@
 msgstr ""
 
 # type: IP
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_TZ</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, it will be used to define the TZ environment variable when a user "
 "login. The value can be the name of a timezone preceded by <replaceable>TZ=</"
@@ -2296,77 +2554,77 @@
 msgstr ""
 
 #. TODO: it can in fact be used to set any other variable
-#: su.1.xml:13(para) login.defs.5.xml:13(para) login.1.xml:13(para)
+#: su.1.xml:43(para) login.defs.5.xml:43(para) login.1.xml:43(para)
 msgid ""
 "If a full path is specified but the file does not exist or cannot be read, "
 "the default is to use <replaceable>TZ=CST6CDT</replaceable>."
 msgstr ""
 
 # type: IP
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
-#: chsh.1.xml:2(term) chfn.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
+#: chsh.1.xml:32(term) chfn.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOGIN_STRING</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
-#: chsh.1.xml:4(para) chfn.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
+#: chsh.1.xml:34(para) chfn.1.xml:34(para)
 msgid ""
 "The string used for prompting a password. The default is to use \"Password: "
 "\", or a translation of that string. If you set this variable, the prompt "
 "will no be translated."
 msgstr ""
 
-#: su.1.xml:9(para) login.defs.5.xml:9(para) login.1.xml:9(para)
-#: chsh.1.xml:9(para) chfn.1.xml:9(para)
+#: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
+#: chsh.1.xml:39(para) chfn.1.xml:39(para)
 msgid ""
 "If the string contains <replaceable>%s</replaceable>, this will be replaced "
 "by the user's name."
 msgstr ""
 
 # type: IP
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>MAIL_CHECK_ENAB</option> (boolean)"
 msgstr "<option>-c </option>I<commento>"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable checking and display of mailbox status upon login."
 msgstr ""
 
-#: su.1.xml:7(para) login.defs.5.xml:7(para) login.1.xml:7(para)
+#: su.1.xml:37(para) login.defs.5.xml:37(para) login.1.xml:37(para)
 msgid ""
 "You should disable it if the shell startup files already check for mail "
 "(\"mailx -e\" or equivalent)."
 msgstr ""
 
 # type: IP
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>QUOTAS_ENAB</option> (boolean)"
 msgstr "<option>-c </option>I<commento>"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable setting of ulimit, umask, and niceness from passwd gecos field."
 msgstr ""
 
 # type: IP
-#: su.1.xml:2(term) login.defs.5.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SULOG_FILE</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "If defined, all su activity is logged to this file."
 msgstr ""
 
 # type: IP
-#: su.1.xml:2(term) login.defs.5.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SU_NAME</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "If defined, the command name to display when running \"su -\". For example, "
 "if this is defined as \"su\" then a \"ps\" will display the command is \"-su"
@@ -2375,12 +2633,12 @@
 msgstr ""
 
 # type: IP
-#: su.1.xml:3(term) login.defs.5.xml:3(term)
+#: su.1.xml:33(term) login.defs.5.xml:33(term)
 #, fuzzy
 msgid "<option>SU_WHEEL_ONLY</option> (boolean)"
 msgstr "<option>-c </option>I<commento>"
 
-#: su.1.xml:5(para) login.defs.5.xml:5(para)
+#: su.1.xml:35(para) login.defs.5.xml:35(para)
 msgid ""
 "If <replaceable>yes</replaceable>, the user must be listed as a member of "
 "the first gid 0 group in <filename>/etc/group</filename> (called "
@@ -2390,19 +2648,19 @@
 msgstr ""
 
 # type: IP
-#: su.1.xml:2(term) login.defs.5.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SYSLOG_SU_ENAB</option> (boolean)"
 msgstr "<option>-c </option>I<commento>"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "Enable \"syslog\" logging of <command>su</command> activity - in addition to "
 "sulog file logging."
 msgstr ""
 
 # type: Plain text
-#: su.1.xml:243(para)
+#: su.1.xml:272(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
@@ -2419,12 +2677,12 @@
 "citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: sg.1.xml:9(refentrytitle) sg.1.xml:14(refname) sg.1.xml:20(command)
+#: sg.1.xml:38(refentrytitle) sg.1.xml:43(refname) sg.1.xml:49(command)
 msgid "sg"
 msgstr "sg"
 
 # type: Plain text
-#: sg.1.xml:15(refpurpose)
+#: sg.1.xml:44(refpurpose)
 #, fuzzy
 msgid "execute command as different group ID"
 msgstr ""
@@ -2433,20 +2691,20 @@
 "#-#-#-#-#  newgrp.1.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "sg - esegue un comando con un diverso ID di gruppo"
 
-#: sg.1.xml:21(arg) newgrp.1.xml:20(arg)
+#: sg.1.xml:50(arg) newgrp.1.xml:49(arg)
 msgid "-"
 msgstr "-"
 
-#: sg.1.xml:23(arg) expiry.1.xml:23(arg)
+#: sg.1.xml:52(arg) expiry.1.xml:53(arg)
 msgid "-c"
 msgstr "-c"
 
-#: sg.1.xml:22(arg)
+#: sg.1.xml:51(arg)
 msgid "group <placeholder-1/> command"
 msgstr ""
 
 # type: Plain text
-#: sg.1.xml:31(para)
+#: sg.1.xml:60(para)
 msgid ""
 "The <command>sg</command> command works similar to <command>newgrp</command> "
 "but accepts a command. The command will be executed with the <filename>/bin/"
@@ -2470,17 +2728,17 @@
 "di gruppo."
 
 # type: IP
-#: sg.1.xml:2(term) newgrp.1.xml:2(term) login.defs.5.xml:2(term)
+#: sg.1.xml:32(term) newgrp.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SYSLOG_SG_ENAB</option> (boolean)"
 msgstr "<option>-c </option>I<commento>"
 
-#: sg.1.xml:4(para) newgrp.1.xml:4(para) login.defs.5.xml:4(para)
+#: sg.1.xml:34(para) newgrp.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Enable \"syslog\" logging of <command>sg</command> activity."
 msgstr ""
 
 # type: Plain text
-#: sg.1.xml:90(para)
+#: sg.1.xml:119(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -2517,15 +2775,15 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
-#: shadow.5.xml:5(refentrytitle) shadow.5.xml:10(refname)
-#: shadow.3.xml:5(refentrytitle) shadow.3.xml:10(refname)
-#: pwck.8.xml:31(replaceable) pwck.8.xml:45(replaceable)
-#: grpck.8.xml:24(replaceable) grpck.8.xml:33(replaceable)
+#: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
+#: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
+#: pwck.8.xml:60(replaceable) pwck.8.xml:74(replaceable)
+#: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
 msgid "shadow"
 msgstr "shadow"
 
 # type: Plain text
-#: shadow.5.xml:11(refpurpose)
+#: shadow.5.xml:40(refpurpose)
 #, fuzzy
 msgid "encrypted password file"
 msgstr ""
@@ -2535,23 +2793,51 @@
 "shadow - file delle password cifrate"
 
 # type: Plain text
-#: shadow.5.xml:16(para)
+#: shadow.5.xml:45(para)
+#, fuzzy
+#| msgid ""
+#| "<emphasis remap=\"I\">shadow</emphasis> contains the encrypted password "
+#| "information for user's accounts and optional the password aging "
+#| "information. Included is:"
 msgid ""
-"<emphasis remap=\"I\">shadow</emphasis> contains the encrypted password "
-"information for user's accounts and optional the password aging information. "
-"Included is:"
+"<filename>shadow</filename> is a file which contains the password "
+"information for the system's accounts and optional aging information."
 msgstr ""
 "<emphasis remap=\"I\">shadow</emphasis> contiene le informazioni sulle "
 "password cifrate per gli account degli utenti e, opzionalmente, le "
 "informazioni sulla durata delle password. Sono inclusi:"
 
 # type: Plain text
-#: shadow.5.xml:23(para) passwd.5.xml:24(para)
+#: shadow.5.xml:51(para) gshadow.5.xml:82(para)
+#, fuzzy
+msgid ""
+"This file must not be readable by regular users if password security is to "
+"be maintained."
+msgstr ""
+"#-#-#-#-#  it.po (shadow 4.0.3)  #-#-#-#-#\n"
+"Questo file non deve essere leggibile dagli utenti normali se si vuole "
+"mantenere la sicurezza sulle password.\n"
+"#-#-#-#-#  shadow.5.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"Questo file non deve essere leggibile dagli utenti se si vuole mantenere la "
+"sicurezza delle password."
+
+#: shadow.5.xml:56(para)
+msgid ""
+"Each line of this file contains 9 fields, separated by colons (<quote>:</"
+"quote>), in the following order:"
+msgstr ""
+
+# type: Plain text
+#: shadow.5.xml:63(emphasis) passwd.5.xml:53(para)
 msgid "login name"
 msgstr "nome di login"
 
+#: shadow.5.xml:65(para)
+msgid "It must be a valid account name, which exist on the system."
+msgstr ""
+
 # type: Plain text
-#: shadow.5.xml:26(para) gshadow.5.xml:26(para)
+#: shadow.5.xml:71(emphasis) gshadow.5.xml:54(para)
 #, fuzzy
 msgid "encrypted password"
 msgstr ""
@@ -2561,278 +2847,353 @@
 "Password cifrata"
 
 # type: Plain text
-#: shadow.5.xml:29(para)
-msgid "days since Jan 1, 1970 that password was last changed"
+#: shadow.5.xml:73(para)
+msgid ""
+"Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+"manvolnum></citerefentry> for details on how this string is interpreted."
 msgstr ""
-"Giorni a partire dal 1 gennaio 1970 in cui la password è stata cambiata "
-"l'ultima volta"
+"Fare riferimento a <citerefentry><refentrytitle>crypt</"
+"refentrytitle><manvolnum>3</manvolnum></citerefentry> per dettagli sul modo "
+"in cui questa stringa viene interpretata."
 
 # type: Plain text
-#: shadow.5.xml:32(para)
+#: shadow.5.xml:78(para)
 #, fuzzy
-msgid "days before password may be changed"
+msgid ""
+"If the password field contains some string that is not a valid result of "
+"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
+"citerefentry>, for instance ! or *, the user will not be able to use a unix "
+"password to log in (but the user may log in the system by other means)."
 msgstr ""
-"#-#-#-#-#  it.po (shadow 4.0.3)  #-#-#-#-#\n"
-"Giorni prima che la password possa essere modificata\n"
-"#-#-#-#-#  shadow.5.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Giorni prima dei quali la password non può essere cambiata"
+"<command>gpasswd</command> invocata da un amministratore di gruppo con il "
+"solo nome del gruppo richiede solamente la password di gruppo. Se la "
+"password è impostata i membri possono ancora usare "
+"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry> senza la password, i non-membri devono fornire la password."
 
+#: shadow.5.xml:85(para)
+msgid ""
+"This field may be empty, in which case no passwords are required to "
+"authenticate as the specified login name. However, some applications which "
+"read the <filename>/etc/shadow</filename> file may decide not to permit any "
+"access at all if the password field is empty."
+msgstr ""
+
+#: shadow.5.xml:92(para)
+msgid ""
+"A password field which starts with a exclamation mark means that the "
+"password is locked. The remaining characters on the line represent the "
+"password field before the password was locked."
+msgstr ""
+
 # type: Plain text
-#: shadow.5.xml:35(para)
+#: shadow.5.xml:102(emphasis)
 #, fuzzy
-msgid "days after which password must be changed"
+msgid "date of last password change"
 msgstr ""
 "#-#-#-#-#  it.po (shadow 4.0.3)  #-#-#-#-#\n"
-"Giorni dopo i quali la password deve essere modificata\n"
+"Giorni prima che la password possa essere modificata\n"
 "#-#-#-#-#  shadow.5.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Giorni dopo i quali la password deve essere cambiata"
+"Giorni prima dei quali la password non può essere cambiata"
 
-# type: Plain text
-#: shadow.5.xml:38(para)
-msgid "days before password is to expire that user is warned"
+#: shadow.5.xml:105(para)
+msgid ""
+"The date of the last password change, expressed as the number of days since "
+"Jan 1, 1970."
 msgstr ""
-"Giorni prima della scadenza della password in cui l'utente viene avvertito"
 
-# type: Plain text
-#: shadow.5.xml:41(para)
-msgid "days after password expires that account is disabled"
+#: shadow.5.xml:109(para)
+msgid ""
+"The value 0 has a special meaning, which is that the user should change her "
+"pasword the next time she will log in the system."
 msgstr ""
-"Giorni dopo la scadenza della password in cui l'account viene disabilitato"
 
-# type: Plain text
-#: shadow.5.xml:44(para)
-msgid "days since Jan 1, 1970 that account is disabled"
+#: shadow.5.xml:114(para)
+msgid "An empty field means that password aging features are disabled."
 msgstr ""
-"Giorni a partire dal 1 gennaio 1970 dopo i quali l'account viene disabilitato"
 
-# type: Plain text
-#: shadow.5.xml:47(para)
-msgid "a reserved field"
-msgstr "Campo riservato"
+# type: SS
+#: shadow.5.xml:121(emphasis)
+#, fuzzy
+#| msgid "Password Changes"
+msgid "minimum password age"
+msgstr "Modifiche delle password"
 
-# type: Plain text
-#: shadow.5.xml:51(para)
+#: shadow.5.xml:123(para)
 msgid ""
-"The password field must be filled. The encrypted password consists of 13 to "
-"24 characters from the 64 character alphabet a thru z, A thru Z, 0 thru 9, "
-"\\. and /. Optionally it can start with a \"$\" character. This means the "
-"encrypted password was generated using another (not DES) algorithm. For "
-"example if it starts with \"$1$\" it means the MD5-based algorithm was used."
+"The minimum password age is the number of days the user will have to wait "
+"before she will be allowed to change her password again."
 msgstr ""
-"Il campo password non può essere vuoto. La password cifrata è composta da un "
-"numero compreso tra 13 a 24 di caratteri scelti da un alfabeto di 64 "
-"caratteri: da a fino a z, da A a Z, da 0 a 9, . e /. Facoltativamente, la "
-"password può iniziare con il carattere \"$\"; questo sta a indicare che la "
-"password cifrata è stata generata usando un algoritmo diverso da DES. Ad "
-"esempio, \"$1$\" significa che è stato usato un algoritmo basato su MD5."
 
-# type: Plain text
-#: shadow.5.xml:60(para)
+#: shadow.5.xml:128(para)
+msgid "An empty field and value 0 mean that there are no minimum password age."
+msgstr ""
+
+# type: SS
+#: shadow.5.xml:135(emphasis)
+#, fuzzy
+#| msgid "Password Changes"
+msgid "maximum password age"
+msgstr "Modifiche delle password"
+
+#: shadow.5.xml:137(para)
 msgid ""
-"Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry> for details on how this string is interpreted."
+"The maximum password age is the number of days after which the user will "
+"have to change her password."
 msgstr ""
-"Fare riferimento a <citerefentry><refentrytitle>crypt</"
-"refentrytitle><manvolnum>3</manvolnum></citerefentry> per dettagli sul modo "
-"in cui questa stringa viene interpretata."
 
-# type: Plain text
-#: shadow.5.xml:68(para)
+#: shadow.5.xml:141(para)
 msgid ""
-"If the password field contains some string that is not valid result of "
-"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
-"citerefentry>, for instance ! or *, the user will not be able to use a unix "
-"password to log in, subject to <citerefentry><refentrytitle>pam</"
-"refentrytitle><manvolnum>7</manvolnum></citerefentry>."
+"After this number of days is elapsed, the password may still be valid. The "
+"user should be asked to change her password the next time she will log in."
 msgstr ""
 
-# type: Plain text
-#: shadow.5.xml:77(para)
+#: shadow.5.xml:146(para)
 msgid ""
-"The date of the last password change is given as the number of days since "
-"Jan 1, 1970. The password may not be changed again until the proper number "
-"of days have passed, and must be changed after the maximum number of days. "
-"If the minimum number of days required is greater than the maximum number of "
-"day allowed, this password may not be changed by the user."
+"An empty field means that there are no maximum password age, no password "
+"warning period, and no password inactivity period (see below)."
 msgstr ""
-"La data dell'ultimo cambio della password è espressa come il numero di "
-"giorni trascorsi dal 1 gennaio 1970. La passowrd non può essere cambiata "
-"nuovamente prima che sia passato il numero di giorni previsti, ma deve "
-"obbligatoriamente essere cambiata dopo il massimo numero di giorni. Se il "
-"numero minimo di giorni richiesti è superiore al numero massimo di giorni "
-"concessi, all'utente non è permesso cambiare la password."
 
-# type: Plain text
-#: shadow.5.xml:86(para)
-#, fuzzy
+#: shadow.5.xml:151(para)
 msgid ""
-"An account is considered to be inactive and is disabled if the password is "
-"not changed within the specified number of days after the password expires. "
-"An account will also be disabled on the specified day regardless of other "
-"password expiration information."
+"If the maximum password age is lower than the minimum password age, the user "
+"cannot change her password."
 msgstr ""
-"#-#-#-#-#  it.po (shadow 4.0.3)  #-#-#-#-#\n"
-"Un account viene considerato inattivo e viene disabilitato se la password "
-"non viene modificata entro il numero di giorni specificato dopo la scadenza "
-"della password.  Un account sarà anche disabilitato il giorno specificato "
-"senza tener conto di altre informazioni sulla scadenza della password.\n"
-"#-#-#-#-#  shadow.5.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Un account viene considerato inattivo e viene disabilitato se, dopo la "
-"scadenza, la password non viene cambiata entro il numero di giorni "
-"specificato. Inoltre, un account viene disabilitato il giorno specificato, "
-"senza tener conto di altre informazioni sulla scadenza della password."
 
+# type: SS
+#: shadow.5.xml:159(emphasis)
+#, fuzzy
+#| msgid "Password Changes"
+msgid "password warning period"
+msgstr "Modifiche delle password"
+
 # type: Plain text
-#: shadow.5.xml:93(para)
+#: shadow.5.xml:162(para)
 #, fuzzy
+#| msgid ""
+#| "The number of days after a password has expired before the account will "
+#| "be disabled."
 msgid ""
-"This information supersedes any password or password age information present "
-"in <filename>/etc/passwd</filename>."
+"The number of days before a password is going to expire (see the maximum "
+"password age above) during which the user should be warned."
 msgstr ""
-"#-#-#-#-#  it.po (shadow 4.0.3)  #-#-#-#-#\n"
-"Questa informazione ha la precedenza nei confronti di qualunque informazione "
-"sulla password o sulla scadenza della password presente in <filename>/etc/"
-"passwd</filename>.\n"
-"#-#-#-#-#  shadow.5.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Queste informazioni hanno la precedenza su qualunque informazione sulle "
-"password o sulla loro durata presente in <filename>/etc/passwd</filename>."
+"Il numero di giorni dopo la scadenza di una password prima che l'account "
+"venga disabilitato."
 
+#: shadow.5.xml:167(para)
+msgid ""
+"An empty field and value 0 mean that there are no password warning period."
+msgstr ""
+
+#: shadow.5.xml:175(emphasis)
+msgid "password inactivity period"
+msgstr ""
+
+#: shadow.5.xml:178(para)
+msgid ""
+"The number of days after a password has expired (see the maximum password "
+"age above) during which the password should still be accepted (and the user "
+"should update her password during the next login)."
+msgstr ""
+
+#: shadow.5.xml:184(para)
+msgid ""
+"After expiration of the password and this expiration period is elapsed, no "
+"login is possible using the current user's password. The user should contact "
+"her administrator."
+msgstr ""
+
+#: shadow.5.xml:189(para)
+msgid ""
+"An empty field means that there are no enforcement of an inactivity period."
+msgstr ""
+
 # type: Plain text
-#: shadow.5.xml:98(para) gshadow.5.xml:54(para)
+#: shadow.5.xml:197(emphasis)
 #, fuzzy
+#| msgid "User account information."
+msgid "account expiration date"
+msgstr "informazioni sugli account utente."
+
+#: shadow.5.xml:200(para)
 msgid ""
-"This file must not be readable by regular users if password security is to "
-"be maintained."
+"The date of expiration of the account, expressed as the number of days since "
+"Jan 1, 1970."
 msgstr ""
-"#-#-#-#-#  it.po (shadow 4.0.3)  #-#-#-#-#\n"
-"Questo file non deve essere leggibile dagli utenti normali se si vuole "
-"mantenere la sicurezza sulle password.\n"
-"#-#-#-#-#  shadow.5.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"Questo file non deve essere leggibile dagli utenti se si vuole mantenere la "
-"sicurezza delle password."
 
+#: shadow.5.xml:204(para)
+msgid ""
+"Note that an account expiration differs from a password expiration. In case "
+"of an acount expiration, the user shall not be allowed to login. In case of "
+"a password expiration, the user is not allowed to login using her password."
+msgstr ""
+
+#: shadow.5.xml:210(para)
+msgid "An empty field means that the account will never expire."
+msgstr ""
+
+#: shadow.5.xml:213(para)
+msgid ""
+"The value 0 should not be used as it is interpreted as either an account "
+"with no expiration, or as an expiration on Jan 1, 1970."
+msgstr ""
+
 # type: Plain text
-#: shadow.5.xml:124(para)
+#: shadow.5.xml:221(emphasis)
+#, fuzzy
+#| msgid "a reserved field"
+msgid "reserved field"
+msgstr "Campo riservato"
+
+# type: Plain text
+#: shadow.5.xml:223(para)
+#, fuzzy
+#| msgid "sp_flag - reserved for future use"
+msgid "This field is reserved for future use."
+msgstr "sp_flag - riservato per uso futuro."
+
+# type: Plain text
+#: shadow.5.xml:249(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>"
 msgid ""
 "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>pwconv</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>login</"
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>pwconv</"
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>"
 
-#: shadow.3.xml:7(refmiscinfo)
+#: shadow.3.xml:36(refmiscinfo)
 msgid "Library Calls"
 msgstr ""
 
-#: shadow.3.xml:11(refname)
+#: shadow.3.xml:40(refname)
 msgid "getspnam"
 msgstr "getspnam"
 
 # type: Plain text
-#: shadow.3.xml:12(refpurpose)
+#: shadow.3.xml:41(refpurpose)
 msgid "encrypted password file routines"
 msgstr "gestione del file delle password cifrate"
 
 # type: SH
-#: shadow.3.xml:16(title)
+#: shadow.3.xml:45(title)
 msgid "SYNTAX"
 msgstr "SINTASSI"
 
-#: shadow.3.xml:18(emphasis)
+#: shadow.3.xml:47(emphasis)
 msgid "#include &lt;shadow.h&gt;"
 msgstr "#include &lt;shadow.h&gt;"
 
 # type: Plain text
-#: shadow.3.xml:22(emphasis)
+#: shadow.3.xml:51(emphasis)
 msgid "struct spwd *getspent();"
 msgstr "struct spwd *getspent();"
 
 # type: Plain text
-#: shadow.3.xml:26(emphasis)
+#: shadow.3.xml:55(emphasis)
 msgid "struct spwd *getspnam(char"
 msgstr "struct spwd *getspnam(char"
 
-#: shadow.3.xml:27(emphasis)
+#: shadow.3.xml:56(emphasis)
 msgid "*name"
 msgstr ""
 
-#: shadow.3.xml:27(emphasis) shadow.3.xml:40(emphasis)
-#: shadow.3.xml:45(emphasis) shadow.3.xml:51(emphasis)
+#: shadow.3.xml:56(emphasis) shadow.3.xml:69(emphasis)
+#: shadow.3.xml:74(emphasis) shadow.3.xml:80(emphasis)
 msgid ");"
 msgstr ");"
 
 # type: Plain text
-#: shadow.3.xml:31(emphasis)
+#: shadow.3.xml:60(emphasis)
 msgid "void setspent();"
 msgstr "void setspent();"
 
 # type: Plain text
-#: shadow.3.xml:35(emphasis)
+#: shadow.3.xml:64(emphasis)
 msgid "void endspent();"
 msgstr "void endspent();"
 
 # type: Plain text
-#: shadow.3.xml:39(emphasis)
+#: shadow.3.xml:68(emphasis)
 msgid "struct spwd *fgetspent(FILE"
 msgstr "struct spwd *fgetspent(FILE"
 
-#: shadow.3.xml:40(emphasis) shadow.3.xml:51(emphasis)
+#: shadow.3.xml:69(emphasis) shadow.3.xml:80(emphasis)
 msgid "*fp"
 msgstr "*fp"
 
 # type: Plain text
-#: shadow.3.xml:44(emphasis)
+#: shadow.3.xml:73(emphasis)
 msgid "struct spwd *sgetspent(char"
 msgstr "struct spwd *sgetspent(char"
 
-#: shadow.3.xml:45(emphasis)
+#: shadow.3.xml:74(emphasis)
 msgid "*cp"
 msgstr "*cp"
 
-#: shadow.3.xml:49(emphasis)
+#: shadow.3.xml:78(emphasis)
 msgid "int putspent(struct spwd"
 msgstr "int putspent(struct spwd"
 
-#: shadow.3.xml:50(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "*p,"
 msgstr "*p,"
 
 # type: SH
-#: shadow.3.xml:50(emphasis)
+#: shadow.3.xml:79(emphasis)
 #, fuzzy
 msgid "FILE"
 msgstr "FILE"
 
-#: shadow.3.xml:55(emphasis)
+#: shadow.3.xml:84(emphasis)
 msgid "int lckpwdf();"
 msgstr "int lckpwdf();"
 
-#: shadow.3.xml:59(emphasis)
+#: shadow.3.xml:88(emphasis)
 msgid "int ulckpwdf();"
 msgstr "int ulckpwdf();"
 
 # type: Plain text
-#: shadow.3.xml:65(para)
+#: shadow.3.xml:94(para)
 #, fuzzy
 msgid ""
 "<emphasis remap=\"I\">shadow</emphasis> manipulates the contents of the "
@@ -2842,7 +3203,7 @@
 "I<shadow> manipola il contenuto del file delle shadow password, <filename>/"
 "etc/shadow</filename>. La struttura nel file I<#include> è la seguente:"
 
-#: shadow.3.xml:70(programlisting)
+#: shadow.3.xml:99(programlisting)
 #, no-wrap
 msgid ""
 "struct spwd {\n"
@@ -2863,42 +3224,42 @@
 "    "
 
 # type: Plain text
-#: shadow.3.xml:82(para)
+#: shadow.3.xml:111(para)
 msgid "The meanings of each field are:"
 msgstr "Ciascun campo significa:"
 
 # type: Plain text
-#: shadow.3.xml:85(para)
+#: shadow.3.xml:114(para)
 msgid "sp_namp - pointer to null-terminated user name"
 msgstr ""
 "sp_namp - puntatore a una stringa null-terminated che contiene il nome "
 "utente."
 
 # type: Plain text
-#: shadow.3.xml:88(para)
+#: shadow.3.xml:117(para)
 msgid "sp_pwdp - pointer to null-terminated password"
 msgstr ""
 "sp_pwdp - puntatore a una stringa null-terminated che contiene la password."
 
 # type: Plain text
-#: shadow.3.xml:91(para)
+#: shadow.3.xml:120(para)
 msgid "sp_lstchg - days since Jan 1, 1970 password was last changed"
 msgstr ""
 "sp_lstchg - giorni a partire dal 1 gennaio 1970 in cui la password è stata "
 "cambiata l'ultima volta."
 
 # type: Plain text
-#: shadow.3.xml:94(para)
+#: shadow.3.xml:123(para)
 msgid "sp_min - days before which password may not be changed"
 msgstr "sp_min - giorni prima dei quali la password non può essere cambiata."
 
 # type: Plain text
-#: shadow.3.xml:97(para)
+#: shadow.3.xml:126(para)
 msgid "sp_max - days after which password must be changed"
 msgstr "sp_max - giorni dopo i quali la password deve essere cambiata."
 
 # type: Plain text
-#: shadow.3.xml:100(para)
+#: shadow.3.xml:129(para)
 msgid ""
 "sp_warn - days before password is to expire that user is warned of pending "
 "password expiration"
@@ -2907,7 +3268,7 @@
 "avvertito."
 
 # type: Plain text
-#: shadow.3.xml:105(para)
+#: shadow.3.xml:134(para)
 msgid ""
 "sp_inact - days after password expires that account is considered inactive "
 "and disabled"
@@ -2916,19 +3277,19 @@
 "considerato inattivo e disabilitato."
 
 # type: Plain text
-#: shadow.3.xml:110(para)
+#: shadow.3.xml:139(para)
 msgid "sp_expire - days since Jan 1, 1970 when account will be disabled"
 msgstr ""
 "sp_expire - giorni a partire dal 1 gennaio 1970 dopo i quali l'account viene "
 "disabilitato."
 
 # type: Plain text
-#: shadow.3.xml:113(para)
+#: shadow.3.xml:142(para)
 msgid "sp_flag - reserved for future use"
 msgstr "sp_flag - riservato per uso futuro."
 
 # type: Plain text
-#: shadow.3.xml:121(para)
+#: shadow.3.xml:150(para)
 #, fuzzy
 msgid ""
 "<emphasis>getspent</emphasis>, <emphasis>getspname</emphasis>, "
@@ -2953,7 +3314,7 @@
 "posizione corrente nel file."
 
 # type: Plain text
-#: shadow.3.xml:134(para)
+#: shadow.3.xml:163(para)
 msgid ""
 "<emphasis>setspent</emphasis> and <emphasis>endspent</emphasis> may be used "
 "to begin and end, respectively, access to the shadow password file."
@@ -2963,7 +3324,7 @@
 "password."
 
 # type: Plain text
-#: shadow.3.xml:140(para)
+#: shadow.3.xml:169(para)
 msgid ""
 "The <emphasis>lckpwdf</emphasis> and <emphasis>ulckpwdf</emphasis> routines "
 "should be used to insure exclusive access to the <filename>/etc/shadow</"
@@ -2985,7 +3346,7 @@
 "entrambi i lock."
 
 # type: Plain text
-#: shadow.3.xml:155(para)
+#: shadow.3.xml:184(para)
 msgid ""
 "Routines return NULL if no more entries are available or if an error occurs "
 "during processing. Routines which have <emphasis>int</emphasis> as the "
@@ -2997,7 +3358,7 @@
 "errore."
 
 # type: Plain text
-#: shadow.3.xml:165(para)
+#: shadow.3.xml:194(para)
 #, fuzzy
 msgid ""
 "These routines may only be used by the superuser as access to the shadow "
@@ -3007,7 +3368,7 @@
 "l'accesso al file delle shadow password è riservato."
 
 # type: Plain text
-#: shadow.3.xml:185(para)
+#: shadow.3.xml:214(para)
 msgid ""
 "<citerefentry><refentrytitle>getpwent</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -3017,31 +3378,31 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: pwconv.8.xml:12(refentrytitle) pwconv.8.xml:17(refname)
-#: pwconv.8.xml:26(command) login.defs.5.xml:356(term)
+#: pwconv.8.xml:42(refentrytitle) pwconv.8.xml:47(refname)
+#: pwconv.8.xml:56(command) login.defs.5.xml:388(term)
 msgid "pwconv"
 msgstr "pwconv"
 
-#: pwconv.8.xml:18(refname) pwconv.8.xml:29(command)
+#: pwconv.8.xml:48(refname) pwconv.8.xml:59(command)
 msgid "pwunconv"
 msgstr "pwunconv"
 
-#: pwconv.8.xml:19(refname) pwconv.8.xml:32(command)
-#: login.defs.5.xml:270(term)
+#: pwconv.8.xml:49(refname) pwconv.8.xml:62(command)
+#: login.defs.5.xml:302(term)
 msgid "grpconv"
 msgstr "grpconv"
 
-#: pwconv.8.xml:20(refname) pwconv.8.xml:35(command)
-#: login.defs.5.xml:276(term)
+#: pwconv.8.xml:50(refname) pwconv.8.xml:65(command)
+#: login.defs.5.xml:308(term)
 msgid "grpunconv"
 msgstr "grpunconv"
 
 # type: Plain text
-#: pwconv.8.xml:21(refpurpose)
+#: pwconv.8.xml:51(refpurpose)
 msgid "convert to and from shadow passwords and groups"
 msgstr "convertono a e da password e gruppi shadow."
 
-#: pwconv.8.xml:41(para)
+#: pwconv.8.xml:71(para)
 #, fuzzy
 msgid ""
 "The <command>pwconv</command> command creates <emphasis remap=\"I\">shadow</"
@@ -3052,7 +3413,7 @@
 "<emphasis remap=\"I\">passwd</emphasis> e, in modo opzionale, da un "
 "preesistente <emphasis remap=\"I\">shadow</emphasis>."
 
-#: pwconv.8.xml:47(para)
+#: pwconv.8.xml:77(para)
 #, fuzzy
 msgid ""
 "The <command>pwunconv</command> command creates <emphasis remap=\"I"
@@ -3065,7 +3426,7 @@
 "\">shadow</emphasis> and then removes <emphasis remap=\"I\">shadow</"
 "emphasis>."
 
-#: pwconv.8.xml:54(para)
+#: pwconv.8.xml:84(para)
 #, fuzzy
 msgid ""
 "The <command>grpconv</command> command creates <emphasis remap=\"I"
@@ -3076,7 +3437,7 @@
 "<emphasis remap=\"I\">group</emphasis> e, in modo opzionale, da un "
 "preesistente <emphasis remap=\"I\">gshadow</emphasis>."
 
-#: pwconv.8.xml:60(para)
+#: pwconv.8.xml:90(para)
 #, fuzzy
 msgid ""
 "The <command>grpunconv</command> command creates <emphasis remap=\"I"
@@ -3089,7 +3450,7 @@
 "emphasis> e quindi rimuove <emphasis remap=\"I\">gshadow</emphasis>."
 
 # type: Plain text
-#: pwconv.8.xml:67(para)
+#: pwconv.8.xml:97(para)
 msgid ""
 "These four programs all operate on the normal and shadow password and group "
 "files: <filename>/etc/passwd</filename>, <filename>/etc/group</filename>, "
@@ -3101,7 +3462,7 @@
 "<filename>/etc/gshadow</filename>."
 
 # type: Plain text
-#: pwconv.8.xml:74(para)
+#: pwconv.8.xml:104(para)
 msgid ""
 "Each program acquires the necessary locks before conversion. "
 "<command>pwconv</command> and <command>grpconv</command> are similar. First, "
@@ -3123,7 +3484,7 @@
 "principale viene editato a mano."
 
 # type: Plain text
-#: pwconv.8.xml:85(para)
+#: pwconv.8.xml:115(para)
 #, fuzzy
 msgid ""
 "<command>pwconv</command> will use the values of <emphasis remap=\"I"
@@ -3136,7 +3497,7 @@
 "quando si aggiungono nuove voci a <filename>/etc/shadow</filename>."
 
 # type: Plain text
-#: pwconv.8.xml:94(para)
+#: pwconv.8.xml:124(para)
 msgid ""
 "Likewise <command>pwunconv</command> and <command>grpunconv</command> are "
 "similar. Passwords in the main file are updated from the shadowed file. "
@@ -3152,7 +3513,7 @@
 "informazioni sull'invecchiamento delle password vengono perse da "
 "<command>pwunconv</command>. Convertirà solo quello che potrà."
 
-#: pwconv.8.xml:106(para)
+#: pwconv.8.xml:136(para)
 msgid ""
 "Errors in the password or group files (such as invalid or duplicate entries) "
 "may cause these programs to loop forever or fail in other strange ways. "
@@ -3160,21 +3521,21 @@
 "any such errors before converting to or from shadow passwords or groups."
 msgstr ""
 
-#: pwconv.8.xml:117(para)
+#: pwconv.8.xml:147(para)
 msgid ""
 "The following configuration variable in <filename>/etc/login.defs</filename> "
 "changes the behavior of <command>grpconv</command> and <command>grpunconv</"
 "command>:"
 msgstr ""
 
-#: pwconv.8.xml:125(para)
+#: pwconv.8.xml:155(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of <command>pwconv</command>:"
 msgstr ""
 
 # type: Plain text
-#: pwconv.8.xml:151(para)
+#: pwconv.8.xml:181(para)
 msgid ""
 "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -3188,40 +3549,40 @@
 "<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>."
 
-#: pwck.8.xml:11(refentrytitle) pwck.8.xml:16(refname) pwck.8.xml:22(command)
-#: pwck.8.xml:37(command) login.defs.5.xml:348(term)
+#: pwck.8.xml:40(refentrytitle) pwck.8.xml:45(refname) pwck.8.xml:51(command)
+#: pwck.8.xml:66(command) login.defs.5.xml:380(term)
 msgid "pwck"
 msgstr "pwck"
 
 # type: Plain text
-#: pwck.8.xml:17(refpurpose)
+#: pwck.8.xml:46(refpurpose)
 #, fuzzy
 msgid "verify integrity of password files"
 msgstr "verifica l'integrità dei file delle password"
 
-#: pwck.8.xml:23(arg) pwck.8.xml:38(arg) pwck.8.xml:111(option)
+#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:140(option)
 msgid "-q"
 msgstr "-q"
 
-#: pwck.8.xml:24(arg) pwck.8.xml:132(option) grpck.8.xml:29(arg)
-#: grpck.8.xml:101(option)
+#: pwck.8.xml:53(arg) pwck.8.xml:161(option) grpck.8.xml:58(arg)
+#: grpck.8.xml:130(option)
 msgid "-s"
 msgstr "-s"
 
-#: pwck.8.xml:27(replaceable) pwck.8.xml:42(replaceable)
-#: passwd.5.xml:5(refentrytitle) passwd.5.xml:10(refname)
-#: passwd.1.xml:15(refentrytitle) passwd.1.xml:20(refname)
-#: passwd.1.xml:26(command) login.defs.5.xml:337(term)
+#: pwck.8.xml:56(replaceable) pwck.8.xml:71(replaceable)
+#: passwd.5.xml:34(refentrytitle) passwd.5.xml:39(refname)
+#: passwd.1.xml:44(refentrytitle) passwd.1.xml:49(refname)
+#: passwd.1.xml:55(command) login.defs.5.xml:369(term)
 msgid "passwd"
 msgstr "passwd"
 
-#: pwck.8.xml:39(arg) pwck.8.xml:122(option) login.1.xml:186(option)
-#: grpck.8.xml:20(arg) grpck.8.xml:91(option) gpasswd.1.xml:120(option)
+#: pwck.8.xml:68(arg) pwck.8.xml:151(option) login.1.xml:222(option)
+#: grpck.8.xml:49(arg) grpck.8.xml:120(option)
 msgid "-r"
 msgstr "-r"
 
 # type: Plain text
-#: pwck.8.xml:53(para)
+#: pwck.8.xml:82(para)
 #, fuzzy
 msgid ""
 "The <command>pwck</command> command verifies the integrity of the system "
@@ -3239,42 +3600,42 @@
 "hanno altri errori impossibili da correggere."
 
 # type: Plain text
-#: pwck.8.xml:62(para) grpck.8.xml:51(para)
+#: pwck.8.xml:91(para) grpck.8.xml:80(para)
 msgid "Checks are made to verify that each entry has:"
 msgstr "Vengono fatti controlli per verificare che ogni voce abbia:"
 
 # type: Plain text
-#: pwck.8.xml:65(para) grpck.8.xml:55(para)
+#: pwck.8.xml:94(para) grpck.8.xml:84(para)
 msgid "the correct number of fields"
 msgstr "il corretto numero di campi"
 
 # type: Plain text
-#: pwck.8.xml:68(para)
+#: pwck.8.xml:97(para)
 msgid "a unique user name"
 msgstr "un nome utente univoco"
 
 # type: Plain text
-#: pwck.8.xml:71(para)
+#: pwck.8.xml:100(para)
 msgid "a valid user and group identifier"
 msgstr "identificatori validi dell'utente e del gruppo"
 
 # type: Plain text
-#: pwck.8.xml:74(para)
+#: pwck.8.xml:103(para)
 msgid "a valid primary group"
 msgstr "un gruppo primario valido"
 
 # type: Plain text
-#: pwck.8.xml:77(para)
+#: pwck.8.xml:106(para)
 msgid "a valid home directory"
 msgstr "una home directory valida"
 
 # type: Plain text
-#: pwck.8.xml:80(para)
+#: pwck.8.xml:109(para)
 msgid "a valid login shell"
 msgstr "una shell di login valida"
 
 # type: Plain text
-#: pwck.8.xml:84(para)
+#: pwck.8.xml:113(para)
 msgid ""
 "The checks for correct number of fields and unique user name are fatal. If "
 "the entry has the wrong number of fields, the user will be prompted to "
@@ -3294,7 +3655,7 @@
 "<command>usermod</command> per correggerli."
 
 # type: Plain text
-#: pwck.8.xml:95(para)
+#: pwck.8.xml:124(para)
 msgid ""
 "The commands which operate on the <filename>/etc/passwd</filename> file are "
 "not able to alter corrupted or duplicated entries. <command>pwck</command> "
@@ -3305,28 +3666,28 @@
 "<command>pwck</command> per rimuovere la voce scorretta."
 
 # type: Plain text
-#: pwck.8.xml:105(para)
+#: pwck.8.xml:134(para)
 msgid "The options which apply to the <command>pwck</command> command are:"
 msgstr "Il comando <command>pwck</command> accetta le seguenti opzioni:"
 
-#: pwck.8.xml:114(para)
+#: pwck.8.xml:143(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
 msgstr ""
 
 # type: TP
-#: pwck.8.xml:125(para)
+#: pwck.8.xml:154(para)
 msgid "Execute the <command>pwck</command> command in read-only mode."
 msgstr ""
 
-#: pwck.8.xml:135(para)
+#: pwck.8.xml:164(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
 msgstr ""
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:172(para)
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename>. The user may select "
@@ -3339,44 +3700,65 @@
 "\">passwd</emphasis> e <emphasis remap=\"I\">shadow</emphasis>."
 
 # type: Plain text
-#: pwck.8.xml:192(para)
+#: pwck.8.xml:221(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>group</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"citerefentry>, <citerefentry><refentrytitle>grpck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>usermod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>usermod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"citerefentry>."
 
 # type: Plain text
-#: pwck.8.xml:227(para)
+#: pwck.8.xml:260(para)
 msgid "one or more bad password entries"
 msgstr "una o più voci di password conengono errori"
 
 # type: Plain text
-#: pwck.8.xml:233(para)
+#: pwck.8.xml:266(para)
 msgid "can't open password files"
 msgstr "impossibile aprire i file delle password"
 
 # type: Plain text
-#: pwck.8.xml:239(para)
+#: pwck.8.xml:272(para)
 msgid "can't lock password files"
 msgstr "impossibile fare il lock dei file delle password"
 
 # type: Plain text
-#: pwck.8.xml:245(para)
+#: pwck.8.xml:278(para)
 msgid "can't update password files"
 msgstr "impossibile aggiornare i file delle password"
 
+# type: Plain text
+#: pwck.8.xml:284(para)
+#, fuzzy
+#| msgid "can't open password files"
+msgid "can't sort password files"
+msgstr "impossibile aprire i file delle password"
+
 # type: TP
-#: pwck.8.xml:209(para)
+#: pwck.8.xml:242(para)
 msgid ""
 "The <command>pwck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -3384,17 +3766,17 @@
 "Il comando <command>pwck</command> restituisce i seguenti valori: "
 "<placeholder-1/>"
 
-#: porttime.5.xml:5(refentrytitle) porttime.5.xml:10(refname)
+#: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
 msgid "porttime"
 msgstr "porttime"
 
 # type: Plain text
-#: porttime.5.xml:11(refpurpose)
+#: porttime.5.xml:40(refpurpose)
 msgid "port access time file"
 msgstr "file delle porte e degli orari d'accesso"
 
 # type: Plain text
-#: porttime.5.xml:16(para)
+#: porttime.5.xml:45(para)
 msgid ""
 "<emphasis remap=\"I\">porttime</emphasis> contains a list of tty devices, "
 "user names, and permitted login times."
@@ -3403,7 +3785,7 @@
 "nomi utente e orari di accesso permessi."
 
 # type: Plain text
-#: porttime.5.xml:21(para)
+#: porttime.5.xml:50(para)
 msgid ""
 "Each entry consists of three colon separated fields. The first field is a "
 "comma separated list of tty devices, or an asterisk to indicate that all tty "
@@ -3420,7 +3802,7 @@
 "separati da virgole, in cui è consentito l'accesso."
 
 # type: Plain text
-#: porttime.5.xml:30(para)
+#: porttime.5.xml:59(para)
 msgid ""
 "Each access time entry consists of zero or more days of the week, "
 "abbreviated <emphasis>Su</emphasis>, <emphasis>Mo</emphasis>, <emphasis>Tu</"
@@ -3440,12 +3822,12 @@
 "specifica alcun giorno, viene usato implicitamente <emphasis>Al</emphasis>."
 
 # type: SH
-#: porttime.5.xml:44(title)
+#: porttime.5.xml:73(title)
 msgid "EXAMPLES"
 msgstr "ESEMPI"
 
 # type: Plain text
-#: porttime.5.xml:45(para)
+#: porttime.5.xml:74(para)
 msgid ""
 "The following entry allows access to user <emphasis remap=\"B\">jfh</"
 "emphasis> on every port during weekdays from 9am to 5pm."
@@ -3454,12 +3836,12 @@
 "emphasis> da qualsiasi porta durante i giorni lavorativi dalle 9 alle 17."
 
 # type: Plain text
-#: porttime.5.xml:51(para)
+#: porttime.5.xml:80(para)
 msgid "*:jfh:Wk0900-1700"
 msgstr "*:jfh:Wk0900-1700"
 
 # type: Plain text
-#: porttime.5.xml:53(para)
+#: porttime.5.xml:82(para)
 #, fuzzy
 msgid ""
 "The following entries allow access only to the users <emphasis>root</"
@@ -3476,7 +3858,7 @@
 
 # type: Plain text
 # no-wrap
-#: porttime.5.xml:62(programlisting)
+#: porttime.5.xml:91(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3490,7 +3872,7 @@
 "    "
 
 # type: Plain text
-#: porttime.5.xml:67(para)
+#: porttime.5.xml:96(para)
 #, fuzzy
 msgid ""
 "The following entry allows access for the user <emphasis>games</emphasis> on "
@@ -3500,21 +3882,21 @@
 "durante gli orari non lavorativi."
 
 # type: Plain text
-#: porttime.5.xml:72(para)
+#: porttime.5.xml:101(para)
 msgid "*:games:Wk1700-0900,SaSu0000-2400"
 msgstr "*:games:Wk1700-0900,SaSu0000-2400"
 
-#: porttime.5.xml:79(filename) logoutd.8.xml:38(filename)
+#: porttime.5.xml:108(filename) logoutd.8.xml:67(filename)
 msgid "/etc/porttime"
 msgstr "/etc/porttime"
 
-#: porttime.5.xml:81(para) logoutd.8.xml:40(para)
+#: porttime.5.xml:110(para) logoutd.8.xml:69(para)
 #, fuzzy
 msgid "File containing port access."
 msgstr "file contenente le porte e gli orari di accesso"
 
 # type: Plain text
-#: porttime.5.xml:89(para) login.access.5.xml:79(para)
+#: porttime.5.xml:118(para) login.access.5.xml:109(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -3523,19 +3905,19 @@
 "citerefentry>."
 
 # type: Plain text
-#: passwd.5.xml:11(refpurpose)
+#: passwd.5.xml:40(refpurpose)
 #, fuzzy
 msgid "the password file"
 msgstr "impossibile aprire i file delle password"
 
-#: passwd.5.xml:16(para)
+#: passwd.5.xml:45(para)
 msgid ""
 "<filename>/etc/passwd</filename> contains one line for each user account, "
 "with seven fields delimited by colons (<quote>:</quote>). These fields are:"
 msgstr ""
 
 # type: Plain text
-#: passwd.5.xml:27(para)
+#: passwd.5.xml:56(para)
 #, fuzzy
 msgid "optional encrypted password"
 msgstr ""
@@ -3544,31 +3926,31 @@
 "#-#-#-#-#  shadow.5.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Password cifrata"
 
-#: passwd.5.xml:30(para)
+#: passwd.5.xml:59(para)
 msgid "numerical user ID"
 msgstr ""
 
-#: passwd.5.xml:33(para)
+#: passwd.5.xml:62(para)
 msgid "numerical group ID"
 msgstr ""
 
 # type: Plain text
-#: passwd.5.xml:36(para)
+#: passwd.5.xml:65(para)
 #, fuzzy
 msgid "user name or comment field"
 msgstr "Il campo commento del nuovo utente nel file password."
 
 # type: Plain text
-#: passwd.5.xml:39(para)
+#: passwd.5.xml:68(para)
 #, fuzzy
 msgid "user home directory"
 msgstr "- una home directory valida"
 
-#: passwd.5.xml:42(para)
+#: passwd.5.xml:71(para)
 msgid "optional user command interpreter"
 msgstr ""
 
-#: passwd.5.xml:46(para)
+#: passwd.5.xml:75(para)
 msgid ""
 "The encrypted password field may be blank, in which case no password is "
 "required to authenticate as the specified login name. However, some "
@@ -3587,21 +3969,21 @@
 msgstr ""
 
 # type: Plain text
-#: passwd.5.xml:65(para)
+#: passwd.5.xml:94(para)
 msgid ""
 "The comment field is used by various system utilities, such as "
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 msgstr ""
 
-#: passwd.5.xml:71(para)
+#: passwd.5.xml:100(para)
 msgid ""
 "The home directory field provides the name of the initial working directory. "
 "The <command>login</command> program uses this information to set the value "
 "of the <envar>$HOME</envar> environmental variable."
 msgstr ""
 
-#: passwd.5.xml:77(para)
+#: passwd.5.xml:106(para)
 msgid ""
 "The command interpreter field provides the name of the user's command "
 "language interpreter, or the name of the initial program to execute. The "
@@ -3611,7 +3993,7 @@
 msgstr ""
 
 # type: Plain text
-#: passwd.5.xml:98(para)
+#: passwd.5.xml:127(para)
 #, fuzzy
 msgid "optional encrypted password file"
 msgstr ""
@@ -3621,54 +4003,75 @@
 "shadow - file delle password cifrate"
 
 # type: Plain text
-#: passwd.5.xml:106(para)
+#: passwd.5.xml:135(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
+#| "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>login</"
+"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>getent</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
-"refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"citerefentry>, <citerefentry><refentrytitle>pwck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>pwconv</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>pwunconv</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>login</"
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
+"citerefentry>, <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwconv</refentrytitle><manvolnum>8</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>pwunconv</"
+"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
+"<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
 # type: Plain text
-#: passwd.1.xml:21(refpurpose)
+#: passwd.1.xml:50(refpurpose)
 msgid "change user password"
 msgstr "cambia la password utente"
 
 # type: Plain text
-#: passwd.1.xml:38(para)
+#: passwd.1.xml:67(para)
 #, fuzzy
 msgid ""
 "The <command>passwd</command> command changes passwords for user accounts. A "
 "normal user may only change the password for his/her own account, while the "
 "superuser may change the password for any account. <command>passwd</command> "
-"also changes account information, such as the full name of the user, the "
-"user's login shell, or his/her password expiry date and interval."
+"also changes the account or associated password validity period."
 msgstr ""
 "<command>passwd</command> cambia la password per account utente o di "
 "gruppo.  Un utente normale può solo cambiare la password per il proprio "
@@ -3679,12 +4082,12 @@
 "password."
 
 # type: SS
-#: passwd.1.xml:48(title)
+#: passwd.1.xml:76(title)
 msgid "Password Changes"
 msgstr "Modifiche delle password"
 
 # type: Plain text
-#: passwd.1.xml:49(para)
+#: passwd.1.xml:77(para)
 #, fuzzy
 msgid ""
 "The user is first prompted for his/her old password, if one is present. This "
@@ -3698,7 +4101,7 @@
 "Il super utente non ha questo obbligo."
 
 # type: Plain text
-#: passwd.1.xml:57(para)
+#: passwd.1.xml:85(para)
 #, fuzzy
 msgid ""
 "After the password has been entered, password aging information is checked "
@@ -3711,7 +4114,7 @@
 "command> non fa cambiare la password ed esce."
 
 # type: Plain text
-#: passwd.1.xml:64(para)
+#: passwd.1.xml:92(para)
 #, fuzzy
 msgid ""
 "The user is then prompted twice for a replacement password. The second entry "
@@ -3723,7 +4126,7 @@
 "eguali affinché la password venga accettata."
 
 # type: Plain text
-#: passwd.1.xml:70(para)
+#: passwd.1.xml:98(para)
 #, fuzzy
 msgid ""
 "Then, the password is tested for complexity. As a general guideline, "
@@ -3735,22 +4138,22 @@
 "contenere dai 6 agli 8 caratteri di uno o più dei seguenti insiemi:"
 
 # type: Plain text
-#: passwd.1.xml:78(para)
+#: passwd.1.xml:106(para)
 msgid "lower case alphabetics"
 msgstr "lettere minuscole"
 
 # type: Plain text
-#: passwd.1.xml:81(para)
+#: passwd.1.xml:109(para)
 msgid "digits 0 thru 9"
 msgstr "numeri da 0 a 9"
 
 # type: Plain text
-#: passwd.1.xml:84(para)
+#: passwd.1.xml:112(para)
 msgid "punctuation marks"
 msgstr "segni di punteggiatura"
 
 # type: Plain text
-#: passwd.1.xml:88(para)
+#: passwd.1.xml:116(para)
 #, fuzzy
 msgid ""
 "Care must be taken not to include the system default erase or kill "
@@ -3762,12 +4165,12 @@
 "password non sufficientemente complesse."
 
 # type: SS
-#: passwd.1.xml:97(title)
+#: passwd.1.xml:125(title)
 msgid "Hints for user passwords"
 msgstr "Suggerimenti per password utente"
 
 # type: Plain text
-#: passwd.1.xml:98(para)
+#: passwd.1.xml:126(para)
 #, fuzzy
 msgid ""
 "The security of a password depends upon the strength of the encryption "
@@ -3783,7 +4186,7 @@
 "della password che viene utilizzata."
 
 # type: Plain text
-#: passwd.1.xml:106(para)
+#: passwd.1.xml:134(para)
 #, fuzzy
 msgid ""
 "Compromises in password security normally result from careless password "
@@ -3799,58 +4202,58 @@
 "patente, la data di nascita o l'indirizzo.  Uno qualunque di questi potrebbe "
 "essere indovinato per violare la sicurezza del sistema."
 
-#: passwd.1.xml:115(para)
+#: passwd.1.xml:143(para)
 msgid ""
 "You can find advices on how to choose a strong password on http://en."
 "wikipedia.org/wiki/Password_strength"
 msgstr ""
 
 # type: Plain text
-#: passwd.1.xml:124(para)
+#: passwd.1.xml:152(para)
 msgid "The options which apply to the <command>passwd</command> command are:"
 msgstr "Il comando <command>passwd</command> accetta le seguenti opzioni:"
 
 # type: IP
-#: passwd.1.xml:129(term) faillog.8.xml:42(term)
+#: passwd.1.xml:157(term) faillog.8.xml:71(term)
 msgid "<option>-a</option>, <option>--all</option>"
 msgstr "<option>-a</option>, <option>--all</option>"
 
-#: passwd.1.xml:133(para)
+#: passwd.1.xml:161(para)
 msgid ""
 "This option can be used only with <option>-S</option> and causes show status "
 "for all users."
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:140(term)
+#: passwd.1.xml:168(term)
 msgid "<option>-d</option>, <option>--delete</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
-#: passwd.1.xml:144(para)
+#: passwd.1.xml:172(para)
 msgid ""
 "Delete a user's password (make it empty). This is a quick way to disable a "
 "password for an account. It will set the named account passwordless."
 msgstr ""
 
 # type: TP
-#: passwd.1.xml:152(term)
+#: passwd.1.xml:180(term)
 msgid "<option>-e</option>, <option>--expire</option>"
 msgstr "<option>-e</option>, <option>--expire</option>"
 
-#: passwd.1.xml:156(para)
+#: passwd.1.xml:184(para)
 msgid ""
 "Immediately expire an account's password. This in effect can force a user to "
 "change his/her password at the user's next login."
 msgstr ""
 
 # type: TP
-#: passwd.1.xml:169(term)
+#: passwd.1.xml:197(term)
 msgid ""
 "<option>-i</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
 msgstr ""
 
-#: passwd.1.xml:173(para)
+#: passwd.1.xml:201(para)
 msgid ""
 "This option is used to disable an account after the password has been "
 "expired for a number of days. After a user account has had an expired "
@@ -3859,11 +4262,11 @@
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:182(term)
+#: passwd.1.xml:210(term)
 msgid "<option>-k</option>, <option>--keep-tokens</option>"
 msgstr "<option>-k</option>, <option>--keep-tokens</option>"
 
-#: passwd.1.xml:186(para)
+#: passwd.1.xml:214(para)
 msgid ""
 "Indicate password change should be performed only for expired authentication "
 "tokens (passwords). The user wishes to keep their non-expired tokens as "
@@ -3871,26 +4274,38 @@
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:194(term)
+#: passwd.1.xml:222(term)
 msgid "<option>-l</option>, <option>--lock</option>"
 msgstr "<option>-l</option>, <option>--lock</option>"
 
-#: passwd.1.xml:198(para)
+#: passwd.1.xml:226(para)
 msgid ""
-"Lock the named account. This option disables an account by changing the "
-"password to a value which matches no possible encrypted value, and by "
-"setting the account expiry field to 1."
+"Lock the password of the named account. This option disables a password by "
+"changing it to a value which matches no possible encrypted value (it adds a "
+"´!´ at the beginning of the password)."
 msgstr ""
 
+#: passwd.1.xml:232(para)
+msgid ""
+"Note that this does not disable the account. The user may still be able to "
+"login using another authentication token (e.g. an SSH key). To disable the "
+"account, administrators should use <command>usermod --expiredate 1</command> "
+"(this set the account's expire date to Jan 2, 1970)."
+msgstr ""
+
+#: passwd.1.xml:239(para)
+msgid "Users with a locked password are not allowed to change their password."
+msgstr ""
+
 # type: IP
-#: passwd.1.xml:206(term) chage.1.xml:109(term)
+#: passwd.1.xml:246(term) chage.1.xml:138(term)
 msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: passwd.1.xml:210(para) chage.1.xml:113(para)
+#: passwd.1.xml:250(para) chage.1.xml:142(para)
 #, fuzzy
 msgid ""
 "Set the minimum number of days between password changes to "
@@ -3902,31 +4317,32 @@
 "momento."
 
 # type: IP
-#: passwd.1.xml:228(term)
+#: passwd.1.xml:268(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
 msgstr ""
 
-#: passwd.1.xml:232(para)
+#: passwd.1.xml:272(para)
 msgid "change password in <replaceable>REPOSITORY</replaceable> repository"
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:238(term)
+#: passwd.1.xml:278(term)
 msgid "<option>-S</option>, <option>--status</option>"
 msgstr "<option>-S</option>, <option>--status</option>"
 
 # type: Plain text
-#: passwd.1.xml:242(para)
+#: passwd.1.xml:282(para)
 #, fuzzy
 msgid ""
 "Display account status information. The status information consists of 7 "
 "fields. The first field is the user's login name. The second field indicates "
-"if the user account is locked (L), has no password (NP), or has a usable "
-"password (P). The third field gives the date of the last password change. "
-"The next four fields are the minimum age, maximum age, warning period, and "
-"inactivity period for the password. These ages are expressed in days."
+"if the user account has a locked password (L), has no password (NP), or has "
+"a usable password (P). The third field gives the date of the last password "
+"change. The next four fields are the minimum age, maximum age, warning "
+"period, and inactivity period for the password. These ages are expressed in "
+"days."
 msgstr ""
 "Lo stato attuale di un account può essere ispeziona con l\\'opzione <option>-"
 "S</option>. Lo stato consiste di 7 campi.  Il primo campo è il nome dell"
@@ -3939,26 +4355,27 @@
 "campi."
 
 # type: IP
-#: passwd.1.xml:255(term)
+#: passwd.1.xml:296(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
 msgstr "<option>-u</option>, <option>--unlock</option>"
 
-#: passwd.1.xml:259(para)
+#: passwd.1.xml:300(para)
 msgid ""
-"Unlock the named account. This option re-enables an account by changing the "
-"password back to its previous value (to value before using <option>-l</"
-"option> option), and by resetting the account expiry field."
+"Unlock the password of the named account. This option re-enables a password "
+"by changing the password back to its previous value (to the value before "
+"using the <option>-l</option> option), and by resetting the account expiry "
+"field."
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:268(term)
+#: passwd.1.xml:310(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: passwd.1.xml:272(para)
+#: passwd.1.xml:314(para)
 #, fuzzy
 msgid ""
 "Set the number of days of warning before a password change is required. The "
@@ -3972,20 +4389,20 @@
 "scadenza."
 
 # type: IP
-#: passwd.1.xml:281(term)
+#: passwd.1.xml:323(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
 msgstr ""
 
-#: passwd.1.xml:285(para)
+#: passwd.1.xml:327(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
 msgstr ""
 
 # type: Plain text
-#: passwd.1.xml:297(para)
+#: passwd.1.xml:339(para)
 msgid ""
 "Not all options may be supported. Password complexity checking may vary from "
 "site to site. The user is urged to select a password as complex as he or she "
@@ -3999,68 +4416,68 @@
 "di modificare la propria password se NIS è abilitato e loro non hanno fatto "
 "il login sul server NIS."
 
-#: passwd.1.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: gpasswd.1.xml:2(term) chpasswd.8.xml:2(term) chgpasswd.8.xml:2(term)
+#: passwd.1.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: gpasswd.1.xml:30(term) chpasswd.8.xml:30(term) chgpasswd.8.xml:30(term)
 msgid "<option>ENCRYPT_METHOD</option> (string)"
 msgstr ""
 
-#: passwd.1.xml:4(para) newusers.8.xml:4(para) login.defs.5.xml:4(para)
-#: gpasswd.1.xml:4(para) chpasswd.8.xml:4(para) chgpasswd.8.xml:4(para)
+#: passwd.1.xml:32(para) newusers.8.xml:32(para) login.defs.5.xml:32(para)
+#: gpasswd.1.xml:32(para) chpasswd.8.xml:32(para) chgpasswd.8.xml:32(para)
 msgid ""
 "This defines the system default encryption algorithm for encrypting "
 "passwords (if no algorithm are specified on the command line)."
 msgstr ""
 
-#: passwd.1.xml:12(para) newusers.8.xml:12(para) login.defs.5.xml:12(para)
-#: gpasswd.1.xml:12(para) chpasswd.8.xml:12(para) chgpasswd.8.xml:12(para)
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
 msgid "<replaceable>DES</replaceable> (default)"
 msgstr ""
 
-#: passwd.1.xml:15(replaceable) newusers.8.xml:15(replaceable)
-#: login.defs.5.xml:15(replaceable) gpasswd.1.xml:15(replaceable)
-#: chpasswd.8.xml:15(replaceable) chgpasswd.8.xml:15(replaceable)
+#: passwd.1.xml:43(replaceable) newusers.8.xml:43(replaceable)
+#: login.defs.5.xml:43(replaceable) gpasswd.1.xml:43(replaceable)
+#: chpasswd.8.xml:43(replaceable) chgpasswd.8.xml:43(replaceable)
 msgid "MD5"
 msgstr ""
 
-#: passwd.1.xml:18(replaceable) newusers.8.xml:18(replaceable)
-#: login.defs.5.xml:18(replaceable) gpasswd.1.xml:18(replaceable)
-#: chpasswd.8.xml:18(replaceable) chgpasswd.8.xml:18(replaceable)
+#: passwd.1.xml:46(replaceable) newusers.8.xml:46(replaceable)
+#: login.defs.5.xml:46(replaceable) gpasswd.1.xml:46(replaceable)
+#: chpasswd.8.xml:46(replaceable) chgpasswd.8.xml:46(replaceable)
 msgid "SHA256"
 msgstr ""
 
-#: passwd.1.xml:21(replaceable) newusers.8.xml:21(replaceable)
-#: login.defs.5.xml:21(replaceable) gpasswd.1.xml:21(replaceable)
-#: chpasswd.8.xml:21(replaceable) chgpasswd.8.xml:21(replaceable)
+#: passwd.1.xml:49(replaceable) newusers.8.xml:49(replaceable)
+#: login.defs.5.xml:49(replaceable) gpasswd.1.xml:49(replaceable)
+#: chpasswd.8.xml:49(replaceable) chgpasswd.8.xml:49(replaceable)
 msgid "SHA512"
 msgstr ""
 
-#: passwd.1.xml:8(para) newusers.8.xml:8(para) login.defs.5.xml:8(para)
-#: gpasswd.1.xml:8(para) chpasswd.8.xml:8(para) chgpasswd.8.xml:8(para)
+#: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
+#: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
 msgid "It can take one of these values: <placeholder-1/>"
 msgstr ""
 
-#: passwd.1.xml:25(para) newusers.8.xml:25(para) login.defs.5.xml:25(para)
-#: gpasswd.1.xml:25(para) chpasswd.8.xml:25(para) chgpasswd.8.xml:25(para)
+#: passwd.1.xml:53(para) newusers.8.xml:53(para) login.defs.5.xml:53(para)
+#: gpasswd.1.xml:53(para) chpasswd.8.xml:53(para) chgpasswd.8.xml:53(para)
 msgid ""
 "Note: this parameter overrides the <option>MD5_CRYPT_ENAB</option> variable."
 msgstr ""
 
-#: passwd.1.xml:29(para) passwd.1.xml:23(para) newusers.8.xml:29(para)
-#: newusers.8.xml:23(para) login.defs.5.xml:29(para) login.defs.5.xml:23(para)
-#: gpasswd.1.xml:29(para) gpasswd.1.xml:23(para) chpasswd.8.xml:29(para)
-#: chpasswd.8.xml:23(para) chgpasswd.8.xml:29(para) chgpasswd.8.xml:23(para)
+#: passwd.1.xml:57(para) passwd.1.xml:53(para) newusers.8.xml:57(para)
+#: newusers.8.xml:53(para) login.defs.5.xml:57(para) login.defs.5.xml:53(para)
+#: gpasswd.1.xml:57(para) gpasswd.1.xml:53(para) chpasswd.8.xml:57(para)
+#: chpasswd.8.xml:53(para) chgpasswd.8.xml:57(para) chgpasswd.8.xml:53(para)
 msgid ""
 "Note: if you use PAM, it is recommended to set this variable consistently "
 "with the PAM modules configuration."
 msgstr ""
 
-#: passwd.1.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: gpasswd.1.xml:2(term) chpasswd.8.xml:2(term) chgpasswd.8.xml:2(term)
+#: passwd.1.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: gpasswd.1.xml:32(term) chpasswd.8.xml:32(term) chgpasswd.8.xml:32(term)
 msgid "<option>MD5_CRYPT_ENAB</option> (boolean)"
 msgstr ""
 
-#: passwd.1.xml:4(para) newusers.8.xml:4(para) login.defs.5.xml:4(para)
-#: gpasswd.1.xml:4(para) chpasswd.8.xml:4(para) chgpasswd.8.xml:4(para)
+#: passwd.1.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
+#: gpasswd.1.xml:34(para) chpasswd.8.xml:34(para) chgpasswd.8.xml:34(para)
 msgid ""
 "Indicate if passwords must be encrypted using the MD5-based algorithm. If "
 "set to <replaceable>yes</replaceable>, new passwords will be encrypted using "
@@ -4071,62 +4488,62 @@
 "<replaceable>no</replaceable>."
 msgstr ""
 
-#: passwd.1.xml:14(para) newusers.8.xml:14(para) login.defs.5.xml:14(para)
-#: gpasswd.1.xml:14(para) chpasswd.8.xml:14(para) chgpasswd.8.xml:14(para)
+#: passwd.1.xml:44(para) newusers.8.xml:44(para) login.defs.5.xml:44(para)
+#: gpasswd.1.xml:44(para) chpasswd.8.xml:44(para) chgpasswd.8.xml:44(para)
 msgid ""
 "This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
 "or by any command line option used to configure the encryption algorithm."
 msgstr ""
 
-#: passwd.1.xml:19(para) newusers.8.xml:19(para) login.defs.5.xml:19(para)
-#: gpasswd.1.xml:19(para) chpasswd.8.xml:19(para) chgpasswd.8.xml:19(para)
+#: passwd.1.xml:49(para) newusers.8.xml:49(para) login.defs.5.xml:49(para)
+#: gpasswd.1.xml:49(para) chpasswd.8.xml:49(para) chgpasswd.8.xml:49(para)
 msgid ""
 "This variable is deprecated. You should use <option>ENCRYPT_METHOD</option>."
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>OBSCURE_CHECKS_ENAB</option> (boolean)"
 msgstr "<option>-c </option>I<commento>"
 
-#: passwd.1.xml:4(para) login.defs.5.xml:4(para)
+#: passwd.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Enable additional checks upon password changes."
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_ALWAYS_WARN</option> (boolean)"
 msgstr "<option>-c </option>I<commento>"
 
-#: passwd.1.xml:4(para) login.defs.5.xml:4(para)
+#: passwd.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Warn about weak passwords (but still allow them) if you are root."
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_CHANGE_TRIES</option> (number)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: passwd.1.xml:4(para) login.defs.5.xml:4(para)
+#: passwd.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Maximum number of attempts to change password if rejected (too easy)."
 msgstr ""
 
 # type: IP
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_MAX_LEN</option> (number)"
 msgstr "<option>-I</option> I<inattività>"
 
 # type: IP
-#: passwd.1.xml:3(term) login.defs.5.xml:3(term)
+#: passwd.1.xml:33(term) login.defs.5.xml:33(term)
 #, fuzzy
 msgid "<option>PASS_MIN_LEN</option> (number)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: passwd.1.xml:5(para) login.defs.5.xml:5(para)
+#: passwd.1.xml:35(para) login.defs.5.xml:35(para)
 msgid ""
 "Number of significant characters in the password for crypt(). "
 "<option>PASS_MAX_LEN</option> is 8 by default. Don't change unless your crypt"
@@ -4134,18 +4551,18 @@
 "<replaceable>yes</replaceable>."
 msgstr ""
 
-#: passwd.1.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: gpasswd.1.xml:2(term) chpasswd.8.xml:2(term) chgpasswd.8.xml:2(term)
+#: passwd.1.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: gpasswd.1.xml:30(term) chpasswd.8.xml:30(term) chgpasswd.8.xml:30(term)
 msgid "<option>SHA_CRYPT_MIN_ROUNDS</option> (number)"
 msgstr ""
 
-#: passwd.1.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
-#: gpasswd.1.xml:3(term) chpasswd.8.xml:3(term) chgpasswd.8.xml:3(term)
+#: passwd.1.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
+#: gpasswd.1.xml:31(term) chpasswd.8.xml:31(term) chgpasswd.8.xml:31(term)
 msgid "<option>SHA_CRYPT_MAX_ROUNDS</option> (number)"
 msgstr ""
 
-#: passwd.1.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
-#: gpasswd.1.xml:5(para) chpasswd.8.xml:5(para) chgpasswd.8.xml:5(para)
+#: passwd.1.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
+#: gpasswd.1.xml:33(para) chpasswd.8.xml:33(para) chgpasswd.8.xml:33(para)
 msgid ""
 "When <option>ENCRYPT_METHOD</option> is set to <replaceable>SHA256</"
 "replaceable> or <replaceable>SHA512</replaceable>, this defines the number "
@@ -4153,92 +4570,102 @@
 "of rounds is not specified on the command line)."
 msgstr ""
 
-#: passwd.1.xml:12(para) newusers.8.xml:12(para) login.defs.5.xml:12(para)
-#: gpasswd.1.xml:12(para) chpasswd.8.xml:12(para) chgpasswd.8.xml:12(para)
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
 msgid ""
 "With a lot of rounds, it is more difficult to brute forcing the password. "
 "But note also that more CPU resources will be needed to authenticate users."
 msgstr ""
 
-#: passwd.1.xml:17(para) newusers.8.xml:17(para) login.defs.5.xml:17(para)
-#: gpasswd.1.xml:17(para) chpasswd.8.xml:17(para) chgpasswd.8.xml:17(para)
+#: passwd.1.xml:45(para) newusers.8.xml:45(para) login.defs.5.xml:45(para)
+#: gpasswd.1.xml:45(para) chpasswd.8.xml:45(para) chgpasswd.8.xml:45(para)
 msgid ""
 "If not specified, the libc will choose the default number of rounds (5000)."
 msgstr ""
 
-#: passwd.1.xml:21(para) newusers.8.xml:21(para) login.defs.5.xml:21(para)
-#: gpasswd.1.xml:21(para) chpasswd.8.xml:21(para) chgpasswd.8.xml:21(para)
+#: passwd.1.xml:49(para) newusers.8.xml:49(para) login.defs.5.xml:49(para)
+#: gpasswd.1.xml:49(para) chpasswd.8.xml:49(para) chgpasswd.8.xml:49(para)
 msgid "The values must be inside the 1000-999999999 range."
 msgstr ""
 
-#: passwd.1.xml:24(para) newusers.8.xml:24(para) login.defs.5.xml:24(para)
-#: gpasswd.1.xml:24(para) chpasswd.8.xml:24(para) chgpasswd.8.xml:24(para)
+#: passwd.1.xml:52(para) newusers.8.xml:52(para) login.defs.5.xml:52(para)
+#: gpasswd.1.xml:52(para) chpasswd.8.xml:52(para) chgpasswd.8.xml:52(para)
 msgid ""
 "If only one of the <option>SHA_CRYPT_MIN_ROUNDS</option> or "
 "<option>SHA_CRYPT_MAX_ROUNDS</option> values is set, then this value will be "
 "used."
 msgstr ""
 
-#: passwd.1.xml:29(para) newusers.8.xml:29(para) login.defs.5.xml:29(para)
-#: gpasswd.1.xml:29(para) chpasswd.8.xml:29(para) chgpasswd.8.xml:29(para)
+#: passwd.1.xml:57(para) newusers.8.xml:57(para) login.defs.5.xml:57(para)
+#: gpasswd.1.xml:57(para) chpasswd.8.xml:57(para) chgpasswd.8.xml:57(para)
 msgid ""
 "If <option>SHA_CRYPT_MIN_ROUNDS</option> &gt; <option>SHA_CRYPT_MAX_ROUNDS</"
 "option>, the highest value will be used."
 msgstr ""
 
-#: passwd.1.xml:356(para) chage.1.xml:212(para)
+#: passwd.1.xml:398(para) chage.1.xml:241(para)
 msgid "permission denied"
 msgstr ""
 
-#: passwd.1.xml:362(para)
+#: passwd.1.xml:404(para)
 msgid "invalid combination of options"
 msgstr ""
 
-#: passwd.1.xml:368(para)
+#: passwd.1.xml:410(para)
 msgid "unexpected failure, nothing done"
 msgstr ""
 
-#: passwd.1.xml:374(para)
+#: passwd.1.xml:416(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr ""
 
 # type: TP
-#: passwd.1.xml:380(para)
+#: passwd.1.xml:422(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr ""
 
 # type: TP
-#: passwd.1.xml:344(para)
+#: passwd.1.xml:386(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
 msgstr "Il comando <command>passwd</command> restituisce i seguenti valori:"
 
 # type: Plain text
-#: passwd.1.xml:395(para)
+#: passwd.1.xml:437(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
+"citerefentry>. <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
+"citerefentry>, <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: nologin.8.xml:5(refentrytitle) nologin.8.xml:10(refname)
-#: nologin.8.xml:16(command)
+#: nologin.8.xml:34(refentrytitle) nologin.8.xml:39(refname)
+#: nologin.8.xml:45(command)
 msgid "nologin"
 msgstr "nologin"
 
-#: nologin.8.xml:11(refpurpose)
+#: nologin.8.xml:40(refpurpose)
 msgid "politely refuse a login"
 msgstr ""
 
-#: nologin.8.xml:22(para)
+#: nologin.8.xml:51(para)
 msgid ""
 "The <command>nologin</command> command displays a message that an account is "
 "not available and exits non-zero. It is intended as a replacement shell "
@@ -4246,14 +4673,14 @@
 msgstr ""
 
 # type: Plain text
-#: nologin.8.xml:27(para)
+#: nologin.8.xml:56(para)
 msgid ""
 "To disable all logins, investigate <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
 # type: Plain text
-#: nologin.8.xml:36(para)
+#: nologin.8.xml:65(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
@@ -4263,78 +4690,179 @@
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: nologin.8.xml:47(title)
-msgid "HYSTORY"
+#: nologin.8.xml:76(title)
+msgid "HISTORY"
 msgstr ""
 
 # type: TP
-#: nologin.8.xml:48(para)
+#: nologin.8.xml:77(para)
 #, fuzzy
-msgid "The <command>nologin</command> command appeared in BSD 4.4."
+msgid "The <command>nologin</command> command appearred in BSD 4.4."
 msgstr ""
 "#-#-#-#-#  it.po (shadow 4.0.3)  #-#-#-#-#\n"
 "Il comando <command>grpck</command> esce con i seguenti valori:\n"
 "#-#-#-#-#  grpck.8.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Il comando <command>grpck</command> restituisce i seguenti valori:"
 
-#: newusers.8.xml:21(refentrytitle) newusers.8.xml:26(refname)
-#: newusers.8.xml:32(command) login.defs.5.xml:321(term)
+#: newusers.8.xml:50(refentrytitle) newusers.8.xml:55(refname)
+#: newusers.8.xml:61(command) login.defs.5.xml:353(term)
 msgid "newusers"
 msgstr "newusers"
 
-#: newusers.8.xml:27(refpurpose)
+#: newusers.8.xml:56(refpurpose)
 msgid "update and create new users in batch"
 msgstr ""
 
-#: newusers.8.xml:34(replaceable)
+#: newusers.8.xml:63(replaceable)
 msgid "new_users"
 msgstr ""
 
-#: newusers.8.xml:41(para)
+#: newusers.8.xml:70(para)
 msgid ""
 "The <command>newusers</command> command reads a file of user name and clear-"
 "text password pairs and uses this information to update a group of existing "
 "users or to create new users. Each line is in the same format as the "
 "standard password file (see <citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the following "
-"exceptions:"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the exceptions "
+"explained below:"
 msgstr ""
 
-#: newusers.8.xml:53(emphasis)
+#: newusers.8.xml:78(para)
+msgid "pw_name:pw_passwd:pw_uid:pw_gid:pw_gecos:pw_dir:pw_shell"
+msgstr ""
+
+#: newusers.8.xml:83(emphasis)
+msgid "pw_name"
+msgstr ""
+
+#: newusers.8.xml:86(para)
+msgid "This is the name of the user."
+msgstr ""
+
+#: newusers.8.xml:89(para)
+msgid ""
+"It can be the name of a new user or the name of an existing user (or an user "
+"created before by <command>newusers</command>). In case of an existing user, "
+"the user's information will be changed, otherwise a new user will be created."
+msgstr ""
+
+#: newusers.8.xml:100(emphasis)
 msgid "pw_passwd"
 msgstr ""
 
-#: newusers.8.xml:56(para)
+#: newusers.8.xml:103(para)
 msgid ""
 "This field will be encrypted and used as the new value of the encrypted "
 "password."
 msgstr ""
 
-#: newusers.8.xml:64(emphasis)
+#: newusers.8.xml:111(emphasis)
+msgid "pw_uid"
+msgstr ""
+
+#: newusers.8.xml:114(para)
+msgid "This field is used to define the UID of the user."
+msgstr ""
+
+#: newusers.8.xml:117(para)
+msgid ""
+"If the field is empty, an new (unused) UID will be defined automatically by "
+"<command>newusers</command>."
+msgstr ""
+
+#: newusers.8.xml:121(para)
+msgid "If this field contains a number, this number will be used as the UID."
+msgstr ""
+
+#: newusers.8.xml:125(para)
+msgid ""
+"If this field contains the name of an existing user (or the name of an user "
+"created before by <command>newusers</command>), the UID of the specified "
+"user will be used."
+msgstr ""
+
+#: newusers.8.xml:135(emphasis)
 msgid "pw_gid"
 msgstr ""
 
-#: newusers.8.xml:67(para)
+#: newusers.8.xml:138(para)
+msgid "This field is used to define the primary group ID for the user."
+msgstr ""
+
+#: newusers.8.xml:141(para)
 msgid ""
-"This field must contain the name (or number) of a group. The user will be "
-"added as a member to this group. When a non-existent group name or number is "
-"specified, a new group will be created. In the case of a non-existent group "
-"number, both the name and the number of the new group will be this number."
+"If this field contains the name of an existing group (or a group created "
+"before by <command>newusers</command>), the GID of this group will be used "
+"as the primary group ID for the user."
 msgstr ""
 
-#: newusers.8.xml:78(emphasis)
+#: newusers.8.xml:147(para)
+msgid ""
+"If this field is a number, this number will be used as the primary group ID "
+"of the user. If no groups exist with this GID, a new group will be created "
+"with this GID, and the name of the user."
+msgstr ""
+
+#: newusers.8.xml:153(para)
+msgid ""
+"If this field is empty, a new group will be created with the name of the "
+"user and a GID will be automatically defined by <command>newusers</command> "
+"to be used as the primary group ID for the user and as the GID for the new "
+"group."
+msgstr ""
+
+#: newusers.8.xml:159(para)
+msgid ""
+"If this field contains the name of a group which does not exist (and was not "
+"created earlier wbefore by <command>newusers</command>), a new group will be "
+"created with the specified name and a GID will be automatically defined by "
+"<command>newusers</command> to be used as the primary group ID for the user "
+"and Gs the ID for the new group."
+msgstr ""
+
+#: newusers.8.xml:171(emphasis)
+msgid "pw_gecos"
+msgstr ""
+
+#: newusers.8.xml:174(para)
+msgid "This field is copied in the GECOS field of the user."
+msgstr ""
+
+#: newusers.8.xml:181(emphasis)
 msgid "pw_dir"
 msgstr ""
 
-#: newusers.8.xml:81(para)
+#: newusers.8.xml:184(para)
+msgid "This field is used to define the home directory of the user."
+msgstr ""
+
+#: newusers.8.xml:187(para)
 msgid ""
-"This field will be checked for existence as a directory, and a new directory "
-"with this name will be created if it does not already exist. The ownership "
-"of the directory will be set to be that of the user being created or updated."
+"If this field does not specify an existing directory, the specified "
+"directory is created, with ownership set to the user being created or "
+"updated and its primary group."
 msgstr ""
 
+#: newusers.8.xml:196(emphasis)
+msgid "pw_shell"
+msgstr ""
+
+#: newusers.8.xml:199(para)
+msgid ""
+"This field defines the shell of the user. No checks are performed on this "
+"field."
+msgstr ""
+
+#: newusers.8.xml:207(para)
+msgid ""
+"<command>newusers</command> first tries to create or change all the "
+"specified users, and then write these changes to the user or group "
+"databases. If an error occurs (except in the final writes to the databases), "
+"no changes are committed to the databases."
+msgstr ""
+
 # type: Plain text
-#: newusers.8.xml:91(para)
+#: newusers.8.xml:214(para)
 #, fuzzy
 msgid ""
 "This command is intended to be used in a large system environment where many "
@@ -4344,7 +4872,7 @@
 "necessità di creare molti account nello stesso momento."
 
 # type: TP
-#: newusers.8.xml:99(para)
+#: newusers.8.xml:222(para)
 #, fuzzy
 #| msgid ""
 #| "The options which apply to the <command>usermod</command> command are:"
@@ -4352,58 +4880,68 @@
 msgstr "Il comando <command>usermod</command> accetta le seguenti opzioni:"
 
 # type: IP
-#: newusers.8.xml:103(term) chpasswd.8.xml:66(term) chgpasswd.8.xml:66(term)
+#: newusers.8.xml:226(term) chpasswd.8.xml:95(term) chgpasswd.8.xml:95(term)
 #, fuzzy
 msgid "<option>-c</option>, <option>--crypt-method</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: newusers.8.xml:105(para) chpasswd.8.xml:68(para) chgpasswd.8.xml:68(para)
+#: newusers.8.xml:228(para) chpasswd.8.xml:97(para) chgpasswd.8.xml:97(para)
 msgid "Use the specified method to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:106(para) chpasswd.8.xml:69(para) chgpasswd.8.xml:69(para)
+#: newusers.8.xml:229(para) chpasswd.8.xml:101(para) chgpasswd.8.xml:101(para)
 msgid ""
 "The available methods are DES, MD5, NONE, and SHA256 or SHA512 if your libc "
 "support these methods."
 msgstr ""
 
+#: newusers.8.xml:243(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
 # type: IP
-#: newusers.8.xml:132(term) chpasswd.8.xml:97(term) chgpasswd.8.xml:97(term)
+#: newusers.8.xml:255(term) chpasswd.8.xml:129(term) chgpasswd.8.xml:129(term)
 #, fuzzy
 msgid "<option>-s</option>, <option>--sha-rounds</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: newusers.8.xml:134(para) chpasswd.8.xml:99(para) chgpasswd.8.xml:99(para)
+#: newusers.8.xml:257(para) chpasswd.8.xml:131(para) chgpasswd.8.xml:131(para)
 msgid "Use the specified number of rounds to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:137(para) chpasswd.8.xml:102(para) chgpasswd.8.xml:102(para)
+#: newusers.8.xml:260(para) chpasswd.8.xml:134(para) chgpasswd.8.xml:134(para)
 msgid ""
 "The value 0 means that the system will choose the default number of rounds "
 "for the crypt method (5000)."
 msgstr ""
 
-#: newusers.8.xml:141(para) chpasswd.8.xml:106(para) chgpasswd.8.xml:106(para)
+#: newusers.8.xml:264(para) chpasswd.8.xml:138(para) chgpasswd.8.xml:138(para)
 msgid ""
 "A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
 msgstr ""
 
-#: newusers.8.xml:145(para) chpasswd.8.xml:110(para) chgpasswd.8.xml:110(para)
+#: newusers.8.xml:268(para) chpasswd.8.xml:142(para) chgpasswd.8.xml:142(para)
 msgid "You can only use this option with the SHA256 or SHA512 crypt method."
 msgstr ""
 
-#: newusers.8.xml:149(para) chpasswd.8.xml:114(para) chgpasswd.8.xml:114(para)
+#: newusers.8.xml:272(para) chpasswd.8.xml:146(para) chgpasswd.8.xml:146(para)
 msgid ""
 "By default, the number of rounds is defined by the SHA_CRYPT_MIN_ROUNDS and "
 "SHA_CRYPT_MAX_ROUNDS variables in <filename>/etc/login.defs</filename>."
 msgstr ""
 
-#: newusers.8.xml:161(para)
+#: newusers.8.xml:284(para)
 msgid ""
 "The input file must be protected since it contains unencrypted passwords."
 msgstr ""
 
-#: newusers.8.xml:165(para) chpasswd.8.xml:130(para)
+#: newusers.8.xml:288(para) chpasswd.8.xml:162(para)
 msgid ""
 "PAM is not used to update the passwords. Only <filename>/etc/passwd</"
 "filename> and <filename>/etc/shadow</filename> are updated, and the various "
@@ -4411,7 +4949,7 @@
 msgstr ""
 
 # type: Plain text
-#: newusers.8.xml:234(para)
+#: newusers.8.xml:357(para)
 msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -4425,13 +4963,13 @@
 "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: newgrp.1.xml:9(refentrytitle) newgrp.1.xml:14(refname)
-#: newgrp.1.xml:20(command) login.defs.5.xml:313(term)
+#: newgrp.1.xml:38(refentrytitle) newgrp.1.xml:43(refname)
+#: newgrp.1.xml:49(command)
 msgid "newgrp"
 msgstr "newgrp"
 
 # type: Plain text
-#: newgrp.1.xml:15(refpurpose)
+#: newgrp.1.xml:44(refpurpose)
 #, fuzzy
 msgid "log in to a new group"
 msgstr ""
@@ -4440,14 +4978,14 @@
 "#-#-#-#-#  newgrp.1.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "newgrp - effettua l'accesso a un nuovo gruppo"
 
-#: newgrp.1.xml:21(replaceable) grpck.8.xml:22(replaceable)
-#: grpck.8.xml:31(replaceable) groupdel.8.xml:22(replaceable)
-#: groupadd.8.xml:30(replaceable) gpasswd.1.xml:34(replaceable)
+#: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
+#: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
+#: groupadd.8.xml:56(replaceable) gpasswd.1.xml:63(replaceable)
 msgid "group"
 msgstr ""
 
 # type: Plain text
-#: newgrp.1.xml:27(para)
+#: newgrp.1.xml:56(para)
 #, fuzzy
 msgid ""
 "The <command>newgrp</command> command is used to change the current group ID "
@@ -4470,7 +5008,7 @@
 "directory corrente non viene cambiata."
 
 # type: Plain text
-#: newgrp.1.xml:35(para)
+#: newgrp.1.xml:64(para)
 #, fuzzy
 msgid ""
 "<command>newgrp</command> changes the current real group ID to the named "
@@ -4491,7 +5029,7 @@
 "viene chiesta una password. Se la password di gruppo è vuota e l'utente non "
 "è elencato come me,bro del gruppo allora l\\'operazione genera un errore."
 
-#: newgrp.1.xml:49(para)
+#: newgrp.1.xml:78(para)
 msgid ""
 "If there is an entry for this group in <filename>/etc/gshadow</filename>, "
 "then the list of members and the password of this group will be taken from "
@@ -4500,7 +5038,7 @@
 msgstr ""
 
 # type: Plain text
-#: newgrp.1.xml:101(para)
+#: newgrp.1.xml:130(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -4525,18 +5063,18 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
-#: logoutd.8.xml:5(refentrytitle) logoutd.8.xml:10(refname)
-#: logoutd.8.xml:16(command)
+#: logoutd.8.xml:34(refentrytitle) logoutd.8.xml:39(refname)
+#: logoutd.8.xml:45(command)
 msgid "logoutd"
 msgstr "logoutd"
 
 # type: Plain text
-#: logoutd.8.xml:11(refpurpose)
+#: logoutd.8.xml:40(refpurpose)
 msgid "Enforce login time restrictions"
 msgstr "fa rispettare le limitazioni sugli accessi"
 
 # type: Plain text
-#: logoutd.8.xml:22(para)
+#: logoutd.8.xml:51(para)
 #, fuzzy
 msgid ""
 "<command>logoutd</command> enforces the login time and port restrictions "
@@ -4556,26 +5094,26 @@
 "violando le limitazioni in <filename>/etc/porttime</filename> viene "
 "terminata."
 
-#: logoutd.8.xml:44(filename) login.1.xml:283(filename)
+#: logoutd.8.xml:73(filename) login.1.xml:319(filename)
 msgid "/var/run/utmp"
 msgstr "/var/run/utmp"
 
 # type: Plain text
-#: logoutd.8.xml:46(para) login.1.xml:285(para)
+#: logoutd.8.xml:75(para) login.1.xml:321(para)
 msgid "List of current login sessions."
 msgstr "Elenco delle sessioni attive"
 
-#: login.defs.5.xml:66(refentrytitle) login.defs.5.xml:71(refname)
+#: login.defs.5.xml:97(refentrytitle) login.defs.5.xml:102(refname)
 msgid "login.defs"
 msgstr "login.defs"
 
 # type: Plain text
-#: login.defs.5.xml:72(refpurpose)
+#: login.defs.5.xml:103(refpurpose)
 #, fuzzy
 msgid "shadow password suite configuration"
 msgstr "shadow - gestione del file delle password cifrate"
 
-#: login.defs.5.xml:77(para)
+#: login.defs.5.xml:108(para)
 msgid ""
 "The <filename>/etc/login.defs</filename> file defines the site-specific "
 "configuration for the shadow password suite. This file is required. Absence "
@@ -4583,7 +5121,7 @@
 "undesirable operation."
 msgstr ""
 
-#: login.defs.5.xml:84(para)
+#: login.defs.5.xml:115(para)
 msgid ""
 "This file is a readable text file, each line of the file describing one "
 "configuration parameter. The lines consist of a configuration name and "
@@ -4592,7 +5130,7 @@
 "the first non-white character of the line."
 msgstr ""
 
-#: login.defs.5.xml:92(para)
+#: login.defs.5.xml:123(para)
 msgid ""
 "Parameter values may be of four types: strings, booleans, numbers, and long "
 "numbers. A string is comprised of any printable characters. A boolean should "
@@ -4605,17 +5143,17 @@
 "and long numeric parameters is machine-dependent."
 msgstr ""
 
-#: login.defs.5.xml:107(para)
+#: login.defs.5.xml:138(para)
 msgid "The following configuration items are provided:"
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) chfn.1.xml:2(term)
+#: login.defs.5.xml:32(term) chfn.1.xml:32(term)
 #, fuzzy
 msgid "<option>CHFN_AUTH</option> (boolean)"
 msgstr "<option>-c </option>I<commento>"
 
-#: login.defs.5.xml:4(para) chfn.1.xml:4(para)
+#: login.defs.5.xml:34(para) chfn.1.xml:34(para)
 msgid ""
 "If <replaceable>yes</replaceable>, the <command>chfn</command> program will "
 "require authentication before making any changes, unless run by the "
@@ -4623,12 +5161,12 @@
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) chfn.1.xml:2(term)
+#: login.defs.5.xml:32(term) chfn.1.xml:32(term)
 #, fuzzy
 msgid "<option>CHFN_RESTRICT</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: login.defs.5.xml:4(para) chfn.1.xml:4(para)
+#: login.defs.5.xml:34(para) chfn.1.xml:34(para)
 msgid ""
 "This parameter specifies which values in the <emphasis remap=\"I\">gecos</"
 "emphasis> field of the <filename>/etc/passwd</filename> file may be changed "
@@ -4644,12 +5182,12 @@
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) chsh.1.xml:2(term)
+#: login.defs.5.xml:32(term) chsh.1.xml:32(term)
 #, fuzzy
 msgid "<option>CHSH_AUTH</option> (boolean)"
 msgstr "<option>-c </option>I<commento>"
 
-#: login.defs.5.xml:4(para) chsh.1.xml:4(para)
+#: login.defs.5.xml:34(para) chsh.1.xml:34(para)
 msgid ""
 "If <replaceable>yes</replaceable>, the <command>chsh</command> program will "
 "require authentication before making any changes, unless run by the "
@@ -4657,13 +5195,13 @@
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ERASECHAR</option> (number)"
 msgstr "<option>-M</option> I<gg_max>"
 
 # type: Plain text
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 #, fuzzy
 msgid ""
 "Terminal ERASE character (<replaceable>010</replaceable> = backspace, "
@@ -4672,66 +5210,66 @@
 "Il nome del gruppo verrà modificato da <replaceable>gruppo</replaceable> a "
 "<replaceable>nome_gruppo</replaceable>."
 
-#: login.defs.5.xml:8(para) login.defs.5.xml:7(para) login.1.xml:8(para)
-#: login.1.xml:7(para)
+#: login.defs.5.xml:38(para) login.defs.5.xml:37(para) login.1.xml:38(para)
+#: login.1.xml:37(para)
 msgid ""
 "The value can be prefixed \"0\" for an octal value, or \"0x\" for an "
 "hexadecimal value."
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FAIL_DELAY</option> (number)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Delay in seconds before being allowed another attempt after a login failure."
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FAILLOG_ENAB</option> (boolean)"
 msgstr "<option>-c </option>I<commento>"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Enable logging and display of <filename>/var/log/faillog</filename> login "
 "failure info."
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FAKE_SHELL</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, <command>login</command> will execute this shell instead of the "
 "users' shell specified in <filename>/etc/passwd</filename>."
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FTMP_FILE</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, login failures will be logged in this file in a utmp format."
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>HUSHLOGIN_FILE</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, this file can inhibit all the usual chatter during the login "
 "sequence. If a full pathname is specified, then hushed mode will be enabled "
@@ -4741,72 +5279,72 @@
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ISSUE_FILE</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "If defined, this file will be displayed before each login prompt."
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>KILLCHAR</option> (number)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Terminal KILL character (<replaceable>025</replaceable> = CTRL/U)."
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LASTLOG_ENAB</option> (boolean)"
 msgstr "<option>-c </option>I<commento>"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable logging and display of /var/log/lastlog login time info."
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOG_OK_LOGINS</option> (boolean)"
 msgstr "<option>-c </option>I<commento>"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable logging of successful logins."
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOG_UNKFAIL_ENAB</option> (boolean)"
 msgstr "<option>-c </option>I<commento>"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable display of unknown usernames when login failures are recorded."
 msgstr ""
 
-#: login.defs.5.xml:8(para) login.1.xml:8(para)
+#: login.defs.5.xml:38(para) login.1.xml:38(para)
 msgid ""
 "Note: logging unknown usernames may be a security issue if an user enter her "
 "password instead of her login name."
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOGIN_RETRIES</option> (number)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Maximum number of login retries in case of bad password."
 msgstr ""
 
-#: login.defs.5.xml:7(para) login.1.xml:7(para)
+#: login.defs.5.xml:37(para) login.1.xml:37(para)
 msgid ""
 "This will most likely be overriden by PAM, since the default pam_unix module "
 "has it's own built in of 3 retries. However, this is a safe fallback in case "
@@ -4814,41 +5352,41 @@
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOGIN_TIMEOUT</option> (number)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Max time in seconds for login."
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>MOTD_FILE</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, \":\" delimited list of \"message of the day\" files to be "
 "displayed upon login."
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>NOLOGINS_FILE</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, name of file whose presence will inhibit non-root logins. The "
 "contents of this file should be a message indicating why logins are "
 "inhibited."
 msgstr ""
 
-#: login.defs.5.xml:149(para)
+#: login.defs.5.xml:181(para)
 msgid ""
 "<option>PASS_MAX_DAYS</option>, <option>PASS_MIN_DAYS</option> and "
 "<option>PASS_WARN_AGE</option> are only used at the time of account "
@@ -4856,47 +5394,47 @@
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>PORTTIME_CHECKS_ENAB</option> (boolean)"
 msgstr "<option>-c </option>I<commento>"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable checking of time restrictions specified in /etc/porttime."
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>TTYGROUP</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
 # type: IP
-#: login.defs.5.xml:3(term) login.1.xml:3(term)
+#: login.defs.5.xml:33(term) login.1.xml:33(term)
 #, fuzzy
 msgid "<option>TTYPERM</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: login.defs.5.xml:5(para) login.1.xml:5(para)
+#: login.defs.5.xml:35(para) login.1.xml:35(para)
 msgid ""
 "The terminal permissions: the login tty will be owned by the "
 "<option>TTYGROUP</option> group, and the permissions will be set to "
 "<option>TTYPERM</option>."
 msgstr ""
 
-#: login.defs.5.xml:10(para) login.1.xml:10(para)
+#: login.defs.5.xml:40(para) login.1.xml:40(para)
 msgid ""
 "By default, the ownership of the terminal is set to the user's primary group "
 "and the permissions are set to <replaceable>0600</replaceable>."
 msgstr ""
 
-#: login.defs.5.xml:15(para) login.1.xml:15(para)
+#: login.defs.5.xml:45(para) login.1.xml:45(para)
 msgid ""
 "<option>TTYGROUP</option> can be either the name of a group or a numeric "
 "group identifier."
 msgstr ""
 
-#: login.defs.5.xml:19(para) login.1.xml:19(para)
+#: login.defs.5.xml:49(para) login.1.xml:49(para)
 msgid ""
 "If you have a <command>write</command> program which is \"setgid\" to a "
 "special group which owns the terminals, define TTYGROUP to the group number "
@@ -4905,129 +5443,128 @@
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>TTYTYPE_FILE</option> (string)"
 msgstr "<option>-I</option> I<inattività>"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, file which maps tty line to TERM environment parameter. Each "
 "line of the file is in a format something like \"vt100 tty01\"."
 msgstr ""
 
 # type: IP
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ULIMIT</option> (number)"
 msgstr "<option>-I</option> I<inattività>"
 
 # type: Plain text
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 #, fuzzy
 msgid "Default <command>ulimit</command> value."
 msgstr "<command>groups</command> [I<utente>]"
 
-#: login.defs.5.xml:177(title)
+#: login.defs.5.xml:209(title)
 msgid "CROSS REFERENCES"
 msgstr ""
 
-#: login.defs.5.xml:178(para)
+#: login.defs.5.xml:210(para)
 msgid ""
 "The following cross references show which programs in the shadow password "
 "suite use which parameters."
 msgstr ""
 
-#: login.defs.5.xml:186(term) chfn.1.xml:12(refentrytitle)
-#: chfn.1.xml:17(refname) chfn.1.xml:23(command)
+#: login.defs.5.xml:218(term) chfn.1.xml:41(refentrytitle)
+#: chfn.1.xml:46(refname) chfn.1.xml:52(command)
 msgid "chfn"
 msgstr ""
 
-#: login.defs.5.xml:188(para)
+#: login.defs.5.xml:220(para)
 msgid ""
 "<phrase condition=\"no_pam\">CHFN_AUTH</phrase> CHFN_RESTRICT <phrase "
 "condition=\"no_pam\">LOGIN_STRING</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:196(term) chgpasswd.8.xml:13(refentrytitle)
-#: chgpasswd.8.xml:18(refname) chgpasswd.8.xml:24(command)
+#: login.defs.5.xml:228(term) chgpasswd.8.xml:42(refentrytitle)
+#: chgpasswd.8.xml:47(refname) chgpasswd.8.xml:53(command)
 msgid "chgpasswd"
 msgstr "chgpasswd"
 
-#: login.defs.5.xml:198(para) login.defs.5.xml:228(para)
+#: login.defs.5.xml:230(para) login.defs.5.xml:260(para)
 msgid ""
 "ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB <phrase condition="
 "\"sha_crypt\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:206(term) chpasswd.8.xml:12(refentrytitle)
-#: chpasswd.8.xml:17(refname) chpasswd.8.xml:23(command)
+#: login.defs.5.xml:238(term) chpasswd.8.xml:41(refentrytitle)
+#: chpasswd.8.xml:46(refname) chpasswd.8.xml:52(command)
 msgid "chpasswd"
 msgstr "chpasswd"
 
-#: login.defs.5.xml:208(para)
+#: login.defs.5.xml:240(para)
 msgid ""
 "ENCRYPT_METHOD MD5_CRYPT_ENAB <phrase condition=\"sha_crypt"
 "\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:216(term) chsh.1.xml:11(refentrytitle)
-#: chsh.1.xml:16(refname) chsh.1.xml:22(command)
+#: login.defs.5.xml:248(term) chsh.1.xml:40(refentrytitle)
+#: chsh.1.xml:45(refname) chsh.1.xml:51(command)
 msgid "chsh"
 msgstr ""
 
-#: login.defs.5.xml:218(para)
+#: login.defs.5.xml:250(para)
 msgid "CHSH_AUTH LOGIN_STRING"
 msgstr ""
 
-#: login.defs.5.xml:226(term) gpasswd.1.xml:13(refentrytitle)
-#: gpasswd.1.xml:18(refname) gpasswd.1.xml:29(command)
+#: login.defs.5.xml:258(term) gpasswd.1.xml:42(refentrytitle)
+#: gpasswd.1.xml:47(refname) gpasswd.1.xml:58(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
-#: login.defs.5.xml:236(term) groupadd.8.xml:11(refentrytitle)
-#: groupadd.8.xml:16(refname) groupadd.8.xml:22(command)
+#: login.defs.5.xml:268(term) groupadd.8.xml:42(refentrytitle)
+#: groupadd.8.xml:47(refname) groupadd.8.xml:53(command)
 msgid "groupadd"
 msgstr "groupadd"
 
-#: login.defs.5.xml:238(para)
+#: login.defs.5.xml:270(para)
 msgid "GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP SYS_GID_MAX SYS_GID_MIN"
 msgstr ""
 
-#: login.defs.5.xml:245(term) groupdel.8.xml:9(refentrytitle)
-#: groupdel.8.xml:14(refname) groupdel.8.xml:20(command)
+#: login.defs.5.xml:277(term) groupdel.8.xml:38(refentrytitle)
+#: groupdel.8.xml:43(refname) groupdel.8.xml:49(command)
 msgid "groupdel"
 msgstr "groupdel"
 
-#: login.defs.5.xml:247(para) login.defs.5.xml:253(para)
-#: login.defs.5.xml:259(para) login.defs.5.xml:266(para)
-#: login.defs.5.xml:272(para) login.defs.5.xml:278(para)
-#: login.defs.5.xml:421(para)
+#: login.defs.5.xml:279(para) login.defs.5.xml:285(para)
+#: login.defs.5.xml:291(para) login.defs.5.xml:298(para)
+#: login.defs.5.xml:304(para) login.defs.5.xml:310(para)
 msgid "MAX_MEMBERS_PER_GROUP"
 msgstr ""
 
-#: login.defs.5.xml:251(term) groupmems.8.xml:9(refentrytitle)
-#: groupmems.8.xml:14(refname) groupmems.8.xml:20(command)
+#: login.defs.5.xml:283(term) groupmems.8.xml:38(refentrytitle)
+#: groupmems.8.xml:43(refname) groupmems.8.xml:49(command)
 msgid "groupmems"
 msgstr "groupmems"
 
-#: login.defs.5.xml:257(term) groupmod.8.xml:9(refentrytitle)
-#: groupmod.8.xml:14(refname) groupmod.8.xml:20(command)
+#: login.defs.5.xml:289(term) groupmod.8.xml:38(refentrytitle)
+#: groupmod.8.xml:43(refname) groupmod.8.xml:49(command)
 msgid "groupmod"
 msgstr "groupmod"
 
-#: login.defs.5.xml:264(term) grpck.8.xml:9(refentrytitle)
-#: grpck.8.xml:14(refname) grpck.8.xml:20(command) grpck.8.xml:29(command)
+#: login.defs.5.xml:296(term) grpck.8.xml:38(refentrytitle)
+#: grpck.8.xml:43(refname) grpck.8.xml:49(command) grpck.8.xml:58(command)
 msgid "grpck"
 msgstr "grpck"
 
-#: login.defs.5.xml:284(term) login.1.xml:41(refentrytitle)
-#: login.1.xml:46(refname) login.1.xml:52(command) login.1.xml:59(command)
-#: login.1.xml:65(command)
+#: login.defs.5.xml:316(term) login.1.xml:70(refentrytitle)
+#: login.1.xml:75(refname) login.1.xml:81(command) login.1.xml:89(command)
+#: login.1.xml:96(command)
 msgid "login"
 msgstr "login"
 
-#: login.defs.5.xml:286(para)
+#: login.defs.5.xml:318(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENV_PATH ENV_SUPATH ENV_TZ ENVIRON_FILE</"
@@ -5042,11 +5579,17 @@
 "phrase> USERGROUPS_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:315(para)
+#: login.defs.5.xml:345(term)
+#, fuzzy
+#| msgid "newgrp"
+msgid "newgrp / sg"
+msgstr "newgrp"
+
+#: login.defs.5.xml:347(para)
 msgid "SYSLOG_SG_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:323(para)
+#: login.defs.5.xml:355(para)
 msgid ""
 "ENCRYPT_METHOD GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB "
 "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE <phrase condition=\"sha_crypt"
@@ -5054,18 +5597,18 @@
 "SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN UID_MAX UID_MIN UMASK"
 msgstr ""
 
-#: login.defs.5.xml:339(para)
+#: login.defs.5.xml:371(para)
 msgid ""
 "ENCRYPT_METHOD MD5_CRYPT_ENAB OBSCURE_CHECKS_ENAB PASS_ALWAYS_WARN "
 "PASS_CHANGE_TRIES PASS_MAX_LEN PASS_MIN_LEN <phrase condition=\"sha_crypt"
 "\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:350(para) login.defs.5.xml:358(para)
+#: login.defs.5.xml:382(para) login.defs.5.xml:390(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 msgstr ""
 
-#: login.defs.5.xml:365(para)
+#: login.defs.5.xml:397(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENVIRON_FILE</phrase> ENV_PATH "
@@ -5075,45 +5618,59 @@
 "\">USERGROUPS_ENAB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:380(term)
+#: login.defs.5.xml:412(term)
 #, fuzzy
 msgid "sulogin"
 msgstr "login"
 
-#: login.defs.5.xml:382(para)
+#: login.defs.5.xml:414(para)
 msgid "ENV_HZ <phrase condition=\"no_pam\">ENV_TZ</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:391(para)
+#: login.defs.5.xml:423(para)
 msgid ""
-"GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS PASS_MIN_DAYS "
-"PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN UID_MAX "
-"UID_MIN UMASK"
+"CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS "
+"PASS_MIN_DAYS PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN "
+"UID_MAX UID_MIN UMASK"
 msgstr ""
 
-#: login.defs.5.xml:404(para)
+#: login.defs.5.xml:436(para)
 msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:413(para)
+#: login.defs.5.xml:445(para)
 msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP"
 msgstr ""
 
 # type: Plain text
-#: login.defs.5.xml:429(para)
+#: login.defs.5.xml:456(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgid ""
 "Much of the functionality that used to be provided by the shadow password "
 "suite is now handled by PAM. Thus, <filename>/etc/login.defs</filename> is "
-"no longer used by programs such as: <citerefentry><refentrytitle>login</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>. Please refer to the corresponding PAM "
-"configuration files instead."
+"no longer used by <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, or less used by "
+"<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, and <citerefentry><refentrytitle>su</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>. Please refer to the "
+"corresponding PAM configuration files instead."
 msgstr ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 # type: Plain text
-#: login.defs.5.xml:446(para)
+#: login.defs.5.xml:472(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5135,22 +5692,22 @@
 "citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: login.access.5.xml:5(refentrytitle) login.access.5.xml:10(refname)
+#: login.access.5.xml:35(refentrytitle) login.access.5.xml:40(refname)
 msgid "login.access"
 msgstr "login.access"
 
-#: login.access.5.xml:11(refpurpose)
+#: login.access.5.xml:41(refpurpose)
 msgid "login access control table"
 msgstr ""
 
-#: login.access.5.xml:16(para)
+#: login.access.5.xml:46(para)
 msgid ""
 "The <emphasis remap=\"I\">login.access</emphasis> file specifies (user, "
 "host) combinations and/or (user, tty) combinations for which a login will be "
 "either accepted or refused."
 msgstr ""
 
-#: login.access.5.xml:22(para)
+#: login.access.5.xml:52(para)
 msgid ""
 "When someone logs in, the <emphasis remap=\"I\">login.access</emphasis> is "
 "scanned for the first entry that matches the (user, host) combination, or, "
@@ -5159,20 +5716,20 @@
 "whether the login will be accepted or refused."
 msgstr ""
 
-#: login.access.5.xml:30(para)
+#: login.access.5.xml:60(para)
 msgid ""
 "Each line of the login access control table has three fields separated by a "
 "\":\" character:"
 msgstr ""
 
 # type: Plain text
-#: login.access.5.xml:35(para)
+#: login.access.5.xml:65(para)
 msgid ""
 "<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I\">users</"
 "emphasis>:<emphasis remap=\"I\">origins</emphasis>"
 msgstr ""
 
-#: login.access.5.xml:39(para)
+#: login.access.5.xml:69(para)
 msgid ""
 "The first field should be a \"<emphasis>+</emphasis>\" (access granted) or "
 "\"<emphasis>-</emphasis>\" (access denied) character. The second field "
@@ -5186,13 +5743,13 @@
 "@netgroupname in host or user patterns."
 msgstr ""
 
-#: login.access.5.xml:53(para)
+#: login.access.5.xml:83(para)
 msgid ""
 "The <emphasis>EXCEPT</emphasis> operator makes it possible to write very "
 "compact rules."
 msgstr ""
 
-#: login.access.5.xml:58(para)
+#: login.access.5.xml:88(para)
 msgid ""
 "The group file is searched only when a name does not match that of the "
 "logged-in user. Only groups are matched in which users are explicitly "
@@ -5200,42 +5757,39 @@
 msgstr ""
 
 # type: Plain text
-#: login.1.xml:47(refpurpose)
+#: login.1.xml:76(refpurpose)
 #, fuzzy
 msgid "begin session on the system"
 msgstr "login - apre una sessione sul sistema"
 
-#: login.1.xml:53(arg) login.1.xml:60(arg) login.1.xml:66(arg)
-#: login.1.xml:178(option) groupmems.8.xml:24(arg) groupmems.8.xml:65(option)
+#: login.1.xml:82(arg) login.1.xml:90(arg) login.1.xml:97(arg)
+#: login.1.xml:214(option) groupmems.8.xml:54(arg)
 msgid "-p"
 msgstr "-p"
 
-#: login.1.xml:55(replaceable) login.1.xml:62(replaceable)
-msgid "username"
-msgstr ""
-
-#: login.1.xml:56(replaceable)
-msgid "ENV=VAR"
-msgstr ""
-
-#: login.1.xml:61(replaceable) login.1.xml:67(replaceable)
+#: login.1.xml:83(replaceable) login.1.xml:91(replaceable)
+#: login.1.xml:98(replaceable)
 msgid "host"
 msgstr ""
 
-#: login.1.xml:61(arg) chfn.1.xml:27(arg)
+#: login.1.xml:83(arg) login.1.xml:91(arg) chfn.1.xml:56(arg)
 msgid "-h <placeholder-1/>"
 msgstr "-h <placeholder-1/>"
 
-#: login.1.xml:62(arg) chfn.1.xml:24(arg)
-msgid "-f <placeholder-1/>"
-msgstr "-f <placeholder-1/>"
+#: login.1.xml:86(replaceable)
+msgid "ENV=VAR"
+msgstr ""
 
-#: login.1.xml:67(arg) chfn.1.xml:25(arg)
+#: login.1.xml:92(arg) login.1.xml:192(option) expiry.1.xml:54(arg)
+msgid "-f"
+msgstr "-f"
+
+#: login.1.xml:98(arg) chfn.1.xml:54(arg)
 msgid "-r <placeholder-1/>"
 msgstr "-r <placeholder-1/>"
 
 # type: Plain text
-#: login.1.xml:73(para)
+#: login.1.xml:104(para)
 #, fuzzy
 msgid ""
 "The <command>login</command> program is used to establish a new session with "
@@ -5259,7 +5813,7 @@
 "da una shell che non sia quella di login produce un messaggio d'errore."
 
 # type: Plain text
-#: login.1.xml:87(para)
+#: login.1.xml:118(para)
 msgid ""
 "The user is then prompted for a password, where appropriate. Echoing is "
 "disabled to prevent revealing the password. Only a small number of password "
@@ -5272,7 +5826,7 @@
 "<command>login</command> termini e che la connessione sia rallentata."
 
 # type: Plain text
-#: login.1.xml:94(para)
+#: login.1.xml:125(para)
 msgid ""
 "If password aging has been enabled for your account, you may be prompted for "
 "a new password before proceeding. You will be forced to provide your old "
@@ -5288,7 +5842,7 @@
 "citerefentry>."
 
 # type: Plain text
-#: login.1.xml:103(para)
+#: login.1.xml:134(para)
 msgid ""
 "After a successful login, you will be informed of any system messages and "
 "the presence of mail. You may turn off the printing of the system message "
@@ -5308,7 +5862,7 @@
 "dello stato della propria casella di posta."
 
 # type: Plain text
-#: login.1.xml:114(para)
+#: login.1.xml:145(para)
 #, fuzzy
 msgid ""
 "Your user and group ID will be set according to their values in the "
@@ -5334,7 +5888,7 @@
 "impostati in base al campo GECOS."
 
 # type: Plain text
-#: login.1.xml:123(para)
+#: login.1.xml:154(para)
 msgid ""
 "On some installations, the environmental variable <envar>$TERM</envar> will "
 "be initialized to the terminal type on your tty line, as specified in "
@@ -5345,7 +5899,7 @@
 "come specificato in <filename>/etc/ttytype</filename>."
 
 # type: Plain text
-#: login.1.xml:129(para)
+#: login.1.xml:160(para)
 #, fuzzy
 msgid ""
 "An initialization script for your command interpreter may also be executed. "
@@ -5362,7 +5916,7 @@
 "maggiori informazioni su questa funzione."
 
 # type: Plain text
-#: login.1.xml:141(para) login.1.xml:212(para)
+#: login.1.xml:172(para) login.1.xml:248(para)
 #, fuzzy
 msgid ""
 "The <command>login</command> program is NOT responsible for removing users "
@@ -5384,31 +5938,31 @@
 "command> dal prompt della shell, allora l'utente che si sta usando risulterà "
 "sempre connesso al sistema fino al termine della \"sottosessione\"."
 
-#: login.1.xml:161(option) groupadd.8.xml:27(arg) expiry.1.xml:24(arg)
-msgid "-f"
-msgstr "-f"
-
 # type: Plain text
-#: login.1.xml:164(para)
+#: login.1.xml:195(para)
 msgid "Do not perform authentication, user is preauthenticated."
 msgstr "Non effettua l'autenticazione, l'utente è già autenticato"
 
-#: login.1.xml:170(option)
+#: login.1.xml:198(para)
+msgid "Note: In that case, <replaceable>username</replaceable> is mandatory."
+msgstr ""
+
+#: login.1.xml:206(option)
 msgid "-h"
 msgstr "-h"
 
 # type: Plain text
-#: login.1.xml:173(para)
+#: login.1.xml:209(para)
 msgid "Name of the remote host for this login."
 msgstr "Nome dell'host remoto per questo login."
 
 # type: Plain text
-#: login.1.xml:181(para)
+#: login.1.xml:217(para)
 msgid "Preserve environment."
 msgstr "Non modifica l'ambiente."
 
 # type: Plain text
-#: login.1.xml:189(para)
+#: login.1.xml:225(para)
 #, fuzzy
 msgid "Perform autologin protocol for rlogin."
 msgstr ""
@@ -5418,7 +5972,7 @@
 "Attiva il protocollo autologin di rlogin."
 
 # type: Plain text
-#: login.1.xml:194(para)
+#: login.1.xml:230(para)
 msgid ""
 "The <option>-r</option>, <option>-h</option> and <option>-f</option> options "
 "are only used when <command>login</command> is invoked by root."
@@ -5428,7 +5982,7 @@
 "invocato da root."
 
 # type: Plain text
-#: login.1.xml:203(para)
+#: login.1.xml:239(para)
 #, fuzzy
 msgid ""
 "This version of <command>login</command> has many compilation options, only "
@@ -5443,7 +5997,7 @@
 "determinato sistema."
 
 # type: Plain text
-#: login.1.xml:208(para)
+#: login.1.xml:244(para)
 #, fuzzy
 msgid ""
 "The location of files is subject to differences in system configuration."
@@ -5455,7 +6009,7 @@
 "La posizione dei file è soggetta a differenze in base alla configurazione "
 "del sistema."
 
-#: login.1.xml:224(para)
+#: login.1.xml:260(para)
 msgid ""
 "As with any program, <command>login</command>'s appearance can be faked. If "
 "non-trusted users have physical access to a machine, an attacker could use "
@@ -5464,47 +6018,47 @@
 "trusted path and prevent this kind of attack."
 msgstr ""
 
-#: login.1.xml:289(filename)
+#: login.1.xml:325(filename)
 msgid "/var/log/wtmp"
 msgstr "/var/log/wtmp"
 
 # type: Plain text
-#: login.1.xml:291(para)
+#: login.1.xml:327(para)
 msgid "List of previous login sessions."
 msgstr "Elenco delle precedenti sessioni."
 
-#: login.1.xml:307(filename)
+#: login.1.xml:343(filename)
 msgid "/etc/motd"
 msgstr "/etc/motd"
 
-#: login.1.xml:309(para)
+#: login.1.xml:345(para)
 msgid "System message of the day file."
 msgstr ""
 
-#: login.1.xml:313(filename)
+#: login.1.xml:349(filename)
 msgid "/etc/nologin"
 msgstr "/etc/nologin"
 
 # type: Plain text
-#: login.1.xml:315(para)
+#: login.1.xml:351(para)
 msgid "Prevent non-root users from logging in."
 msgstr "Inibisce l\\'accesso al sistema per utenti diversi da root."
 
-#: login.1.xml:319(filename)
+#: login.1.xml:355(filename)
 msgid "/etc/ttytype"
 msgstr "/etc/ttytype"
 
 # type: Plain text
-#: login.1.xml:321(para)
+#: login.1.xml:357(para)
 msgid "List of terminal types."
 msgstr "Elenco di tipi di terminale."
 
-#: login.1.xml:325(filename)
+#: login.1.xml:361(filename)
 msgid "$HOME/.hushlogin"
 msgstr "$HOME/.hushlogin"
 
 # type: Plain text
-#: login.1.xml:327(para)
+#: login.1.xml:363(para)
 msgid "Suppress printing of system messages."
 msgstr ""
 "#-#-#-#-#    #-#-#-#-#\n"
@@ -5513,7 +6067,7 @@
 "Impedisce che vengano mostrati i messaggi di sistema."
 
 # type: Plain text
-#: login.1.xml:335(para)
+#: login.1.xml:371(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5543,15 +6097,15 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getty</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: limits.5.xml:5(refentrytitle) limits.5.xml:10(refname)
+#: limits.5.xml:35(refentrytitle) limits.5.xml:40(refname)
 msgid "limits"
 msgstr "limits"
 
-#: limits.5.xml:11(refpurpose)
+#: limits.5.xml:41(refpurpose)
 msgid "resource limits definition"
 msgstr ""
 
-#: limits.5.xml:17(para)
+#: limits.5.xml:47(para)
 msgid ""
 "The <emphasis remap=\"I\">limits</emphasis> file (<filename>/etc/limits</"
 "filename> by default or LIMITS_FILE defined <filename>config.h</filename>) "
@@ -5559,105 +6113,105 @@
 "and readable by root account only."
 msgstr ""
 
-#: limits.5.xml:25(para)
+#: limits.5.xml:55(para)
 msgid ""
 "By default no quota is imposed on 'root'. In fact, there is no way to impose "
 "limits via this procedure to root-equiv accounts (accounts with UID 0)."
 msgstr ""
 
-#: limits.5.xml:31(para)
+#: limits.5.xml:61(para)
 msgid "Each line describes a limit for a user in the form:"
 msgstr ""
 
-#: limits.5.xml:34(emphasis)
+#: limits.5.xml:64(emphasis)
 msgid "user LIMITS_STRING"
 msgstr ""
 
-#: limits.5.xml:37(para)
+#: limits.5.xml:67(para)
 msgid ""
 "The <emphasis>LIMITS_STRING</emphasis> is a string of a concatenated list of "
 "resource limits. Each limit consists of a letter identifier followed by a "
 "numerical limit."
 msgstr ""
 
-#: limits.5.xml:43(para)
+#: limits.5.xml:73(para)
 msgid "The valid identifiers are:"
 msgstr ""
 
-#: limits.5.xml:46(para)
+#: limits.5.xml:76(para)
 msgid "A: max address space (KB)"
 msgstr ""
 
-#: limits.5.xml:47(para)
+#: limits.5.xml:77(para)
 msgid "C: max core file size (KB)"
 msgstr ""
 
-#: limits.5.xml:48(para)
+#: limits.5.xml:78(para)
 msgid "D: max data size (KB)"
 msgstr ""
 
-#: limits.5.xml:49(para)
+#: limits.5.xml:79(para)
 msgid "F: maximum filesize (KB)"
 msgstr ""
 
-#: limits.5.xml:50(para)
+#: limits.5.xml:80(para)
 msgid "M: max locked-in-memory address space (KB)"
 msgstr ""
 
-#: limits.5.xml:51(para)
+#: limits.5.xml:81(para)
 msgid "N: max number of open files"
 msgstr ""
 
-#: limits.5.xml:52(para)
+#: limits.5.xml:82(para)
 msgid "R: max resident set size (KB)"
 msgstr ""
 
-#: limits.5.xml:53(para)
+#: limits.5.xml:83(para)
 msgid "S: max stack size (KB)"
 msgstr ""
 
-#: limits.5.xml:54(para)
+#: limits.5.xml:84(para)
 msgid "T: max CPU time (MIN)"
 msgstr ""
 
-#: limits.5.xml:55(para)
+#: limits.5.xml:85(para)
 msgid "U: max number of processes"
 msgstr ""
 
 # type: Plain text
-#: limits.5.xml:56(para)
+#: limits.5.xml:86(para)
 msgid ""
 "K: file creation mask, set by <citerefentry><refentrytitle>umask</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 msgstr ""
 
-#: limits.5.xml:61(para)
+#: limits.5.xml:91(para)
 msgid "L: max number of logins for this user"
 msgstr ""
 
 # type: Plain text
-#: limits.5.xml:62(para)
+#: limits.5.xml:92(para)
 msgid ""
 "P: process priority, set by <citerefentry><refentrytitle>setpriority</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 msgstr ""
 
-#: limits.5.xml:67(para)
+#: limits.5.xml:97(para)
 msgid "I: max nice value (0..39 which translates to 20..-19)"
 msgstr ""
 
-#: limits.5.xml:69(para)
+#: limits.5.xml:99(para)
 msgid "O: max real time priority"
 msgstr ""
 
-#: limits.5.xml:72(para)
+#: limits.5.xml:102(para)
 msgid ""
 "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
-"<emphasis>LIMITS_STRING </emphasis>. For reading convenience, the following "
+"<emphasis>LIMITS_STRING</emphasis>. For reading convenience, the following "
 "entries are equivalent:"
 msgstr ""
 
-#: limits.5.xml:78(programlisting)
+#: limits.5.xml:108(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -5666,7 +6220,7 @@
 "    "
 msgstr ""
 
-#: limits.5.xml:83(para)
+#: limits.5.xml:113(para)
 msgid ""
 "Be aware that after <emphasis remap=\"I\">username</emphasis> the rest of "
 "the line is considered a limit string, thus comments are not allowed. A "
@@ -5674,7 +6228,7 @@
 "<command>login</command> program."
 msgstr ""
 
-#: limits.5.xml:90(para)
+#: limits.5.xml:120(para)
 msgid ""
 "The default entry is denoted by username \"<emphasis>*</emphasis>\". If you "
 "have multiple <emphasis remap=\"I\">default</emphasis> entries in your "
@@ -5682,25 +6236,25 @@
 "default entry."
 msgstr ""
 
-#: limits.5.xml:97(para)
+#: limits.5.xml:127(para)
 msgid ""
 "To completely disable limits for a user, a single dash \"<emphasis>-</"
 "emphasis>\" will do."
 msgstr ""
 
-#: limits.5.xml:102(para)
+#: limits.5.xml:132(para)
 msgid ""
 "Also, please note that all limit settings are set PER LOGIN. They are not "
 "global, nor are they permanent. Perhaps global limits will come, but for now "
 "this will have to do ;)"
 msgstr ""
 
-#: limits.5.xml:113(filename)
+#: limits.5.xml:143(filename)
 msgid "/etc/limits"
 msgstr ""
 
 # type: Plain text
-#: limits.5.xml:121(para)
+#: limits.5.xml:151(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>setpriority</"
@@ -5714,17 +6268,17 @@
 "<citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</"
 "manvolnum></citerefentry>."
 
-#: lastlog.8.xml:5(refentrytitle) lastlog.8.xml:10(refname)
-#: lastlog.8.xml:16(command)
+#: lastlog.8.xml:35(refentrytitle) lastlog.8.xml:40(refname)
+#: lastlog.8.xml:46(command)
 msgid "lastlog"
 msgstr "lastlog"
 
-#: lastlog.8.xml:11(refpurpose)
+#: lastlog.8.xml:41(refpurpose)
 msgid "reports the most recent login of all users or of a given user"
 msgstr ""
 
 # type: Plain text
-#: lastlog.8.xml:25(para)
+#: lastlog.8.xml:55(para)
 msgid ""
 "<command>lastlog</command> formats and prints the contents of the last login "
 "log <filename>/var/log/lastlog</filename> file. The <emphasis>login-name</"
@@ -5741,18 +6295,18 @@
 "filename>."
 
 # type: TP
-#: lastlog.8.xml:37(para)
+#: lastlog.8.xml:67(para)
 msgid "The options which apply to the <command>lastlog</command> command are:"
 msgstr "Il comando <command>lastlog</command> accetta le seguenti opzioni:"
 
 # type: IP
-#: lastlog.8.xml:42(term)
+#: lastlog.8.xml:72(term)
 msgid ""
 "<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
 msgstr ""
 
 # type: Plain text
-#: lastlog.8.xml:46(para)
+#: lastlog.8.xml:76(para)
 #, fuzzy
 msgid ""
 "Print only lastlog records older than <emphasis remap=\"I\">DAYS</emphasis>."
@@ -5760,14 +6314,14 @@
 "Mostra solo i record di ultimo accesso più recenti di un numero di I<GIORNI>."
 
 # type: IP
-#: lastlog.8.xml:60(term) faillog.8.xml:93(term)
+#: lastlog.8.xml:90(term) faillog.8.xml:142(term)
 msgid ""
 "<option>-t</option>, <option>--time</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>GIORNI</replaceable>"
 
 # type: Plain text
-#: lastlog.8.xml:65(para)
+#: lastlog.8.xml:95(para)
 msgid ""
 "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</"
 "emphasis>."
@@ -5776,7 +6330,7 @@
 "remap=\"I\">GIORNI</emphasis>."
 
 # type: IP
-#: lastlog.8.xml:72(term)
+#: lastlog.8.xml:102(term) faillog.8.xml:153(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
@@ -5788,7 +6342,7 @@
 "<option>-u</option>, <option>--user</option> <replaceable>LOGIN</replaceable>"
 
 # type: Plain text
-#: lastlog.8.xml:77(para)
+#: lastlog.8.xml:107(para)
 #, fuzzy
 #| msgid ""
 #| "Print the lastlog record for user with specified <emphasis remap=\"I"
@@ -5798,7 +6352,7 @@
 "Mostra il record di ultimo accesso per l'utente specificato da <emphasis "
 "remap=\"I\">LOGIN</emphasis>."
 
-#: lastlog.8.xml:80(para)
+#: lastlog.8.xml:110(para) faillog.8.xml:163(para)
 msgid ""
 "The users can be specified by a login name, a numerical user ID, or a "
 "<replaceable>RANGE</replaceable> of users. This <replaceable>RANGE</"
@@ -5808,7 +6362,7 @@
 msgstr ""
 
 # type: Plain text
-#: lastlog.8.xml:92(para)
+#: lastlog.8.xml:122(para)
 #, fuzzy
 msgid ""
 "If the user has never logged in the message <emphasis>** Never logged in**</"
@@ -5823,13 +6377,19 @@
 "posto della porta e della data, il messaggio <emphasis>\"**Nessun accesso "
 "effettuato**\"</emphasis>."
 
+#: lastlog.8.xml:127(para)
+msgid ""
+"Only the entries for the current users of the system will be displayed. "
+"Other entries may exist for users that were deleted previously."
+msgstr ""
+
 # type: SH
-#: lastlog.8.xml:99(title) groups.1.xml:36(title) chsh.1.xml:77(title)
-#: chage.1.xml:164(title)
+#: lastlog.8.xml:135(title) groups.1.xml:65(title) chsh.1.xml:106(title)
+#: chage.1.xml:193(title)
 msgid "NOTE"
 msgstr "NOTA"
 
-#: lastlog.8.xml:100(para)
+#: lastlog.8.xml:136(para)
 msgid ""
 "The <filename>lastlog</filename> file is a database which contains info on "
 "the last login of each user. You should not rotate it. It is a sparse file, "
@@ -5839,16 +6399,16 @@
 "its real size with \"<command>ls -s</command>\"."
 msgstr ""
 
-#: lastlog.8.xml:114(filename)
+#: lastlog.8.xml:150(filename)
 msgid "/var/log/lastlog"
 msgstr ""
 
-#: lastlog.8.xml:116(para)
+#: lastlog.8.xml:152(para)
 msgid "Database times of previous user logins."
 msgstr ""
 
 # type: Plain text
-#: lastlog.8.xml:124(para)
+#: lastlog.8.xml:160(para)
 #, fuzzy
 msgid ""
 "Large gaps in UID numbers will cause the lastlog program to run longer with "
@@ -5867,28 +6427,28 @@
 "schermo (ad es. se mmdf=800 e l'ultimo UID vale 170, il programma sembrerà "
 "bloccato come se esaminasse gli UID tra 171 e 799)."
 
-#: gshadow.5.xml:5(refentrytitle) gshadow.5.xml:10(refname)
+#: gshadow.5.xml:33(refentrytitle) gshadow.5.xml:38(refname)
 msgid "gshadow"
 msgstr "gshadow"
 
 # type: Plain text
-#: gshadow.5.xml:11(refpurpose)
+#: gshadow.5.xml:39(refpurpose)
 msgid "shadowed group file"
 msgstr ""
 
-#: gshadow.5.xml:16(para)
+#: gshadow.5.xml:44(para)
 msgid ""
 "<filename>/etc/gshadow</filename> contains the shadowed information for "
 "group accounts. It contains lines with the following colon-separated fields:"
 msgstr ""
 
 # type: Plain text
-#: gshadow.5.xml:23(para)
+#: gshadow.5.xml:51(para)
 msgid "group name"
 msgstr ""
 
 # type: Plain text
-#: gshadow.5.xml:29(para)
+#: gshadow.5.xml:57(para)
 #, fuzzy
 msgid "comma-separated list of group administrators"
 msgstr ""
@@ -5897,12 +6457,12 @@
 "#-#-#-#-#  grpck.8.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "- una lista valida di membri e amministratori"
 
-#: gshadow.5.xml:32(para)
+#: gshadow.5.xml:60(para)
 msgid "comma-separated list of group members"
 msgstr ""
 
 # type: Plain text
-#: gshadow.5.xml:36(para)
+#: gshadow.5.xml:64(para)
 msgid ""
 "The group name and password fields must be filled. The encrypted password "
 "consists of characters from the 64-character alphabet a thru z, A thru Z, 0 "
@@ -5917,7 +6477,7 @@
 msgstr ""
 
 # type: Plain text
-#: gshadow.5.xml:49(para)
+#: gshadow.5.xml:77(para)
 #, fuzzy
 msgid ""
 "This information supersedes any password present in <filename>/etc/group</"
@@ -5932,28 +6492,43 @@
 "password o sulla loro durata presente in <filename>/etc/passwd</filename>."
 
 # type: Plain text
-#: gshadow.5.xml:80(para)
+#: gshadow.5.xml:108(para)
 #, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>group</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>grpconv</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</manvolnum></"
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
 # type: Plain text
-#: grpck.8.xml:15(refpurpose)
+#: grpck.8.xml:44(refpurpose)
 msgid "verify integrity of group files"
 msgstr "verifica l'integrità dei file di gruppo"
 
 # type: Plain text
-#: grpck.8.xml:41(para)
+#: grpck.8.xml:70(para)
 #, fuzzy
 msgid ""
 "The <command>grpck</command> command verifies the integrity of the system "
@@ -5971,12 +6546,12 @@
 "hanno altri errori impossibili da correggere."
 
 # type: Plain text
-#: grpck.8.xml:58(para)
+#: grpck.8.xml:87(para)
 msgid "a unique group name"
 msgstr "un nome univoco di gruppo"
 
 # type: Plain text
-#: grpck.8.xml:61(para)
+#: grpck.8.xml:90(para)
 #, fuzzy
 msgid "a valid list of members and administrators"
 msgstr ""
@@ -5986,7 +6561,7 @@
 "- una lista valida di membri e amministratori"
 
 # type: Plain text
-#: grpck.8.xml:65(para)
+#: grpck.8.xml:94(para)
 msgid ""
 "The checks for correct number of fields and unique group name are fatal. If "
 "the entry has the wrong number of fields, the user will be prompted to "
@@ -6006,7 +6581,7 @@
 "<command>groupmod</command> per correggerli."
 
 # type: Plain text
-#: grpck.8.xml:76(para)
+#: grpck.8.xml:105(para)
 msgid ""
 "The commands which operate on the <filename>/etc/group</filename> file are "
 "not able to alter corrupted or duplicated entries. <command>grpck</command> "
@@ -6017,26 +6592,26 @@
 "<command>grpck</command> per rimuovere la voce scorretta."
 
 # type: Plain text
-#: grpck.8.xml:86(para)
+#: grpck.8.xml:115(para)
 #, fuzzy
 #| msgid "The options which apply to the <command>pwck</command> command are:"
 msgid "The options which apply to the <command>grpck</command> command are:"
 msgstr "Il comando <command>pwck</command> accetta le seguenti opzioni:"
 
-#: grpck.8.xml:93(para)
+#: grpck.8.xml:122(para)
 msgid ""
 "Execute the <command>grpck</command> command in read-only mode. This causes "
 "all questions regarding changes to be answered <emphasis>no</emphasis> "
 "without user intervention."
 msgstr ""
 
-#: grpck.8.xml:103(para)
+#: grpck.8.xml:132(para)
 msgid ""
 "Sort entries in <filename>/etc/group</filename><phrase condition=\"gshadow"
 "\">and <filename>/etc/gshadow</filename></phrase> by GID."
 msgstr ""
 
-#: grpck.8.xml:112(para)
+#: grpck.8.xml:141(para)
 #, fuzzy
 #| msgid ""
 #| "By default, <command>pwck</command> operates on the files <filename>/etc/"
@@ -6057,58 +6632,61 @@
 "\">passwd</emphasis> e <emphasis remap=\"I\">shadow</emphasis>."
 
 # type: Plain text
-#: grpck.8.xml:162(para)
+#: grpck.8.xml:191(para)
 #, fuzzy
 #| msgid ""
-#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
-#| "citerefentry>, <citerefentry><refentrytitle>group</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>."
+#| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>login</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum>, </"
-"citerefentry><citerefentry><refentrytitle>passwd</"
+"citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
+"condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum>, </citerefentry><citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>groupmod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>shadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>group</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
+"<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gshadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 # type: Plain text
-#: grpck.8.xml:201(para)
+#: grpck.8.xml:233(para)
 msgid "one or more bad group entries"
 msgstr "una o più voci di gruppo contengono errori"
 
 # type: Plain text
-#: grpck.8.xml:207(para)
+#: grpck.8.xml:239(para)
 msgid "can't open group files"
 msgstr "impossibile aprire i file dei gruppi"
 
 # type: Plain text
-#: grpck.8.xml:213(para)
+#: grpck.8.xml:245(para)
 msgid "can't lock group files"
 msgstr "impossibile fare il lock dei file dei gruppi"
 
 # type: Plain text
-#: grpck.8.xml:219(para)
+#: grpck.8.xml:251(para)
 msgid "can't update group files"
 msgstr "impossibile aggiornare i file dei gruppi"
 
 # type: TP
-#: grpck.8.xml:183(para)
+#: grpck.8.xml:215(para)
 #, fuzzy
 msgid ""
 "The <command>grpck</command> command exits with the following values: "
@@ -6119,23 +6697,22 @@
 "#-#-#-#-#  grpck.8.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Il comando <command>grpck</command> restituisce i seguenti valori:"
 
-#: groups.1.xml:5(refentrytitle) groups.1.xml:10(refname)
-#: groups.1.xml:16(command)
+#: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
+#: groups.1.xml:45(command)
 msgid "groups"
 msgstr "groups"
 
 # type: Plain text
-#: groups.1.xml:11(refpurpose)
+#: groups.1.xml:40(refpurpose)
 msgid "display current group names"
 msgstr "mostra i nomi dei gruppi correnti"
 
-#: groups.1.xml:18(replaceable) gpasswd.1.xml:94(replaceable)
-#: gpasswd.1.xml:107(replaceable) chfn.1.xml:29(replaceable)
+#: groups.1.xml:47(replaceable) chfn.1.xml:58(replaceable)
 msgid "user"
 msgstr ""
 
 # type: Plain text
-#: groups.1.xml:25(para)
+#: groups.1.xml:54(para)
 #, fuzzy
 msgid ""
 "The <command>groups</command> command displays the current group names or ID "
@@ -6152,7 +6729,7 @@
 "emphasis>."
 
 # type: Plain text
-#: groups.1.xml:37(para)
+#: groups.1.xml:66(para)
 msgid ""
 "Systems which do not support concurrent group sets will have the information "
 "from <filename>/etc/group</filename> reported. The user must use "
@@ -6165,7 +6742,7 @@
 "<command>sg</command> per cambiare gli ID dei gruppi reale ed efficace."
 
 # type: Plain text
-#: groups.1.xml:59(para)
+#: groups.1.xml:88(para)
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getgid</"
@@ -6182,16 +6759,16 @@
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 
 # type: Plain text
-#: groupmod.8.xml:15(refpurpose)
+#: groupmod.8.xml:44(refpurpose)
 msgid "modify a group definition on the system"
 msgstr ""
 
 # type: TH
-#: groupmod.8.xml:24(replaceable)
+#: groupmod.8.xml:53(replaceable)
 msgid "GROUP"
 msgstr ""
 
-#: groupmod.8.xml:30(para)
+#: groupmod.8.xml:59(para)
 msgid ""
 "The <command>groupmod</command> command modifies the definition of the "
 "specified <replaceable>GROUP</replaceable> by modifying the appropriate "
@@ -6199,17 +6776,17 @@
 msgstr ""
 
 # type: Plain text
-#: groupmod.8.xml:39(para)
+#: groupmod.8.xml:68(para)
 msgid "The options which apply to the <command>groupmod</command> command are:"
 msgstr "Il comando <command>groupmod</command> accetta le seguenti opzioni:"
 
 # type: TP
-#: groupmod.8.xml:45(term) groupadd.8.xml:66(term)
+#: groupmod.8.xml:74(term) groupadd.8.xml:92(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgstr ""
 
-#: groupmod.8.xml:49(para)
+#: groupmod.8.xml:78(para)
 msgid ""
 "The group ID of the given <replaceable>GROUP</replaceable> will be changed "
 "to <replaceable>GID</replaceable>. The value of <replaceable>GID</"
@@ -6221,14 +6798,14 @@
 msgstr ""
 
 # type: TP
-#: groupmod.8.xml:70(term)
+#: groupmod.8.xml:99(term)
 msgid ""
 "<option>-n</option>, <option>--new-name</option><replaceable>NEW_GROUP</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: groupmod.8.xml:75(para)
+#: groupmod.8.xml:104(para)
 msgid ""
 "The name of the group will be changed from <replaceable>GROUP</replaceable> "
 "to <replaceable>NEW_GROUP</replaceable> name."
@@ -6236,14 +6813,14 @@
 "Il nome del gruppo verrà modificato da <replaceable>gruppo</replaceable> a "
 "<replaceable>nome_gruppo</replaceable>."
 
-#: groupmod.8.xml:86(para)
+#: groupmod.8.xml:115(para)
 msgid ""
 "When used with the <option>-g</option> option, allow to change the group "
 "<replaceable>GID</replaceable> to a non-unique value."
 msgstr ""
 
 # type: Plain text
-#: groupmod.8.xml:98(para) groupadd.8.xml:122(para)
+#: groupmod.8.xml:127(para) groupadd.8.xml:148(para)
 #, fuzzy
 #| msgid ""
 #| "Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
@@ -6257,12 +6834,12 @@
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> per dettagli sul modo "
 "in cui questa stringa viene interpretata."
 
-#: groupmod.8.xml:176(para)
+#: groupmod.8.xml:205(para)
 msgid "group name already in use"
 msgstr ""
 
 # type: TP
-#: groupmod.8.xml:140(para)
+#: groupmod.8.xml:169(para)
 #, fuzzy
 msgid ""
 "The <command>groupmod</command> command exits with the following values: "
@@ -6274,7 +6851,7 @@
 "Il comando <command>grpck</command> restituisce i seguenti valori:"
 
 # type: Plain text
-#: groupmod.8.xml:191(para)
+#: groupmod.8.xml:220(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6307,32 +6884,35 @@
 "manvolnum></citerefentry>."
 
 # type: Plain text
-#: groupmems.8.xml:15(refpurpose)
+#: groupmems.8.xml:44(refpurpose)
 msgid "administer members of a user's primary group"
 msgstr ""
 
-#: groupmems.8.xml:22(replaceable) groupmems.8.xml:23(replaceable)
-#: groupmems.8.xml:53(replaceable) groupmems.8.xml:59(replaceable)
+#: groupmems.8.xml:51(replaceable) groupmems.8.xml:52(replaceable)
 msgid "user_name"
 msgstr ""
 
-#: groupmems.8.xml:22(arg)
+#: groupmems.8.xml:51(arg)
 msgid "-a <placeholder-1/>"
 msgstr "-a <placeholder-1/>"
 
-#: groupmems.8.xml:23(arg)
+#: groupmems.8.xml:52(arg)
 msgid "-d <placeholder-1/>"
 msgstr "-d <placeholder-1/>"
 
-#: groupmems.8.xml:25(replaceable) groupmems.8.xml:71(replaceable)
+#: groupmems.8.xml:53(replaceable)
 msgid "group_name"
 msgstr ""
 
-#: groupmems.8.xml:25(arg) groupadd.8.xml:24(arg)
+#: groupmems.8.xml:53(arg)
 msgid "-g <placeholder-1/>"
 msgstr "-g <placeholder-1/>"
 
-#: groupmems.8.xml:32(para)
+#: groupmems.8.xml:54(arg)
+msgid "-l"
+msgstr "-l"
+
+#: groupmems.8.xml:61(para)
 msgid ""
 "The <command>groupmems</command> command allows a user to administer his/her "
 "own group membership list without the requirement of superuser privileges. "
@@ -6340,55 +6920,105 @@
 "users to be in their own name sake primary group (i.e., guest / guest)."
 msgstr ""
 
-#: groupmems.8.xml:40(para)
+#: groupmems.8.xml:69(para)
 msgid ""
 "Only the superuser, as administrator, can use <command>groupmems</command> "
 "to alter the memberships of other groups."
 msgstr ""
 
 # type: Plain text
-#: groupmems.8.xml:47(para)
+#: groupmems.8.xml:76(para)
 msgid ""
 "The options which apply to the <command>groupmems</command> command are:"
 msgstr "Il comando <command>groupmems</command> accetta le seguenti opzioni:"
 
-#: groupmems.8.xml:53(option) gpasswd.1.xml:94(option)
-msgid "-a"
-msgstr "-a"
+# type: IP
+#: groupmems.8.xml:82(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-m</option>, <option>--maximum</option><replaceable>MAX</"
+#| "replaceable>"
+msgid ""
+"<option>-a</option>, <option>--add</option><replaceable>user_name</"
+"replaceable>"
+msgstr ""
+"<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 
-#: groupmems.8.xml:55(para)
-msgid "Add a new user to the group membership list."
+#: groupmems.8.xml:84(para)
+msgid "Add an user to the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:59(option) gpasswd.1.xml:107(option)
-msgid "-d"
-msgstr "-d"
+#: groupmems.8.xml:85(para) groupmems.8.xml:101(para)
+#: groupmems.8.xml:126(para)
+msgid ""
+"If the <filename>/etc/gshadow</filename> file exist, and the group has no "
+"entry in the <filename>/etc/gshadow</filename> file, a new entry will be "
+"created."
+msgstr ""
 
-#: groupmems.8.xml:61(para)
+# type: IP
+#: groupmems.8.xml:93(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-d</option>, <option>--delete</option><replaceable>user_name</"
+"replaceable>"
+msgstr ""
+"<option>-t</option>, <option>--time</option><replaceable>GIORNI</replaceable>"
+
+#: groupmems.8.xml:95(para)
 msgid "Delete a user from the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:67(para)
-msgid "Purge all users from the group membership list."
+#: groupmems.8.xml:96(para)
+msgid ""
+"If the <filename>/etc/gshadow</filename> file exist, the user will be "
+"removed from the list of members and administrators of the group."
 msgstr ""
 
-#: groupmems.8.xml:71(option)
-msgid "-g"
-msgstr "-g"
+# type: IP
+#: groupmems.8.xml:109(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
+#| "replaceable>"
+msgid ""
+"<option>-g</option>, <option>--group</option><replaceable>group_name</"
+"replaceable>"
+msgstr ""
+"<option>-u</option>, <option>--user</option> <replaceable>LOGIN</replaceable>"
 
-#: groupmems.8.xml:73(para)
+#: groupmems.8.xml:111(para)
 msgid "The superuser can specify which group membership list to modify."
 msgstr ""
 
-#: groupmems.8.xml:81(para)
+# type: IP
+#: groupmems.8.xml:117(term) chage.1.xml:128(term)
+msgid "<option>-l</option>, <option>--list</option>"
+msgstr "<option>-l</option>, <option>--list</option>"
+
+#: groupmems.8.xml:119(para)
 msgid "List the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:88(title)
+# type: TP
+#: groupmems.8.xml:123(term)
+#, fuzzy
+#| msgid "<option>-e</option>, <option>--expire</option>"
+msgid "<option>-p</option>, <option>--purge</option>"
+msgstr "<option>-e</option>, <option>--expire</option>"
+
+#: groupmems.8.xml:125(para)
+msgid "Purge all users from the group membership list."
+msgstr ""
+
+#: groupmems.8.xml:137(title)
 msgid "SETUP"
 msgstr ""
 
-#: groupmems.8.xml:89(para)
+#: groupmems.8.xml:138(para)
 msgid ""
 "The <command>groupmems</command> executable should be in mode <literal>2770</"
 "literal> as user <emphasis>root</emphasis> and in group <emphasis>groups</"
@@ -6397,7 +7027,7 @@
 "utility to manage their own group membership list."
 msgstr ""
 
-#: groupmems.8.xml:98(programlisting)
+#: groupmems.8.xml:147(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -6409,12 +7039,12 @@
 msgstr ""
 
 # type: Plain text
-#: groupmems.8.xml:130(para)
+#: groupmems.8.xml:179(para)
 msgid "secure group account information"
 msgstr "informazioni sicure sugli account di gruppo"
 
 # type: Plain text
-#: groupmems.8.xml:138(para)
+#: groupmems.8.xml:187(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6443,12 +7073,12 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 # type: Plain text
-#: groupdel.8.xml:15(refpurpose)
+#: groupdel.8.xml:44(refpurpose)
 msgid "delete a group"
 msgstr "Rimuove un gruppo"
 
 # type: Plain text
-#: groupdel.8.xml:29(para)
+#: groupdel.8.xml:58(para)
 msgid ""
 "The <command>groupdel</command> command modifies the system account files, "
 "deleting all entries that refer to <emphasis remap=\"I\">group</emphasis>. "
@@ -6459,7 +7089,7 @@
 "\">gruppo</emphasis>.  Il gruppo nominato deve esistere."
 
 # type: Plain text
-#: groupdel.8.xml:34(para)
+#: groupdel.8.xml:63(para)
 msgid ""
 "You must manually check all file systems to insure that no files remain with "
 "the named group as the file group ID."
@@ -6468,7 +7098,7 @@
 "rimanga alcun file avente come ID di gruppo il gruppo specificato."
 
 # type: Plain text
-#: groupdel.8.xml:41(para)
+#: groupdel.8.xml:70(para)
 msgid ""
 "You may not remove the primary group of any existing user. You must remove "
 "the user before you remove the group."
@@ -6477,12 +7107,12 @@
 "rimuovere l'utente prima di rimuovere il gruppo."
 
 # type: Plain text
-#: groupdel.8.xml:102(para)
+#: groupdel.8.xml:131(para)
 msgid "can't remove user's primary group"
 msgstr "operazione impossibile perché il gruppo è primario per un utente"
 
 # type: TP
-#: groupdel.8.xml:78(para)
+#: groupdel.8.xml:107(para)
 #, fuzzy
 msgid ""
 "The <command>groupdel</command> command exits with the following values: "
@@ -6494,7 +7124,7 @@
 "Il comando <command>grpck</command> restituisce i seguenti valori:"
 
 # type: Plain text
-#: groupdel.8.xml:117(para)
+#: groupdel.8.xml:146(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6527,35 +7157,12 @@
 "manvolnum></citerefentry>"
 
 # type: Plain text
-#: groupadd.8.xml:17(refpurpose)
+#: groupadd.8.xml:48(refpurpose)
 msgid "create a new group"
 msgstr "Crea un nuovo gruppo"
 
-# type: TH
-#: groupadd.8.xml:24(replaceable)
-msgid "GID"
-msgstr ""
-
-#: groupadd.8.xml:25(arg)
-msgid "-o"
-msgstr "-o"
-
-#: groupadd.8.xml:28(replaceable)
-msgid "KEY"
-msgstr ""
-
-# type: SH
-#: groupadd.8.xml:28(replaceable)
-#, fuzzy
-msgid "VALUE"
-msgstr "VALORI RESTITUITI"
-
-#: groupadd.8.xml:28(arg)
-msgid "-K <placeholder-1/>=<placeholder-2/>"
-msgstr "-K <placeholder-1/>=<placeholder-2/>"
-
 # type: Plain text
-#: groupadd.8.xml:37(para)
+#: groupadd.8.xml:63(para)
 #, fuzzy
 msgid ""
 "The <command>groupadd</command> command creates a new group account using "
@@ -6568,11 +7175,11 @@
 "necessitano."
 
 # type: Plain text
-#: groupadd.8.xml:46(para)
+#: groupadd.8.xml:72(para)
 msgid "The options which apply to the <command>groupadd</command> command are:"
 msgstr "Il comando <command>groupadd</command> accetta le seguenti opzioni:"
 
-#: groupadd.8.xml:56(para)
+#: groupadd.8.xml:82(para)
 msgid ""
 "This option causes the command to simply exit with success status if the "
 "specified group already exists. When used with <option>-g</option>, and the "
@@ -6581,7 +7188,7 @@
 msgstr ""
 
 # type: Plain text
-#: groupadd.8.xml:70(para)
+#: groupadd.8.xml:96(para)
 msgid ""
 "The numerical value of the group's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. The "
@@ -6596,38 +7203,38 @@
 "gruppo.  Valori tra 0 e 999 sono tipicamente riservati per account di "
 "sistema."
 
-#: groupadd.8.xml:90(para)
+#: groupadd.8.xml:116(para)
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (GID_MIN, GID_MAX "
 "and others). Multiple <option>-K</option> options can be specified."
 msgstr ""
 
-#: groupadd.8.xml:95(para)
+#: groupadd.8.xml:121(para)
 msgid ""
 "Example: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>100</replaceable><option> -K </"
 "option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 msgstr ""
 
-#: groupadd.8.xml:99(para)
+#: groupadd.8.xml:125(para)
 msgid ""
 "Note: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</"
 "replaceable>=<replaceable>499</replaceable> doesn't work yet."
 msgstr ""
 
-#: groupadd.8.xml:111(para)
+#: groupadd.8.xml:137(para)
 msgid "This option permits to add a group with a non-unique GID."
 msgstr ""
 
 # type: Plain text
-#: groupadd.8.xml:134(para)
+#: groupadd.8.xml:160(para)
 #, fuzzy
 #| msgid "create a new group"
 msgid "Create a system group."
 msgstr "Crea un nuovo gruppo"
 
-#: groupadd.8.xml:137(para)
+#: groupadd.8.xml:163(para)
 msgid ""
 "The numeric identifiers of new system groups are choosen in the "
 "<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
@@ -6635,19 +7242,19 @@
 "<option>GID_MAX</option>."
 msgstr ""
 
-#: groupadd.8.xml:188(para)
+#: groupadd.8.xml:214(para)
 msgid ""
 "Groupnames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
-"regular expression terms: [a-z_][a-z0-9_-]*[$]"
+"regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 
-#: groupadd.8.xml:193(para)
-msgid "Groupnames may only be up to 16 characters long."
+#: groupadd.8.xml:219(para)
+msgid "Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long."
 msgstr ""
 
 # type: Plain text
-#: groupadd.8.xml:196(para)
+#: groupadd.8.xml:222(para)
 #, fuzzy
 msgid ""
 "You may not add a NIS or LDAP group. This must be performed on the "
@@ -6656,22 +7263,22 @@
 "Non è possibile aggiungere un utente ad un gruppo NIS. Questo deve essere "
 "fatto sul server NIS."
 
-#: groupadd.8.xml:200(para)
+#: groupadd.8.xml:226(para)
 msgid ""
 "If the groupname already exists in an external group database such as NIS or "
 "LDAP, <command>groupadd</command> will deny the group creation request."
 msgstr ""
 
-#: groupadd.8.xml:233(para)
+#: groupadd.8.xml:259(para)
 msgid "GID not unique (when <option>-o</option> not used)"
 msgstr ""
 
-#: groupadd.8.xml:239(para)
+#: groupadd.8.xml:265(para)
 msgid "group name not unique"
 msgstr ""
 
 # type: TP
-#: groupadd.8.xml:209(para)
+#: groupadd.8.xml:235(para)
 #, fuzzy
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
@@ -6683,7 +7290,7 @@
 "Il comando <command>grpck</command> restituisce i seguenti valori:"
 
 # type: Plain text
-#: groupadd.8.xml:254(para)
+#: groupadd.8.xml:280(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6717,26 +7324,26 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:21(phrase)
+#: gpasswd.1.xml:50(phrase)
 #, fuzzy
 msgid "and <placeholder-1/> files"
 msgstr "-a <placeholder-1/>"
 
-#: gpasswd.1.xml:23(phrase)
+#: gpasswd.1.xml:52(phrase)
 msgid "file"
 msgstr ""
 
-#: gpasswd.1.xml:19(refpurpose)
+#: gpasswd.1.xml:48(refpurpose)
 #, fuzzy
 msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
 msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
-#: gpasswd.1.xml:31(replaceable)
+#: gpasswd.1.xml:60(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "opzioni"
 
-#: gpasswd.1.xml:41(para)
+#: gpasswd.1.xml:70(para)
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
 "group</filename><phrase condition=\"gshadow\">, and <filename>/etc/gshadow</"
@@ -6745,7 +7352,7 @@
 msgstr ""
 
 # type: Plain text
-#: gpasswd.1.xml:49(para)
+#: gpasswd.1.xml:78(para)
 #, fuzzy
 msgid ""
 "System administrator can use the <option>-A</option> option to define group "
@@ -6760,7 +7367,7 @@
 "gruppo e l'opzione <option>-M</option> per definire i membri ed ha tutti i "
 "diritti degli amministratori di gruppo e dei membri."
 
-#: gpasswd.1.xml:54(para)
+#: gpasswd.1.xml:83(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -6769,7 +7376,7 @@
 msgstr ""
 
 # type: Plain text
-#: gpasswd.1.xml:61(para)
+#: gpasswd.1.xml:90(para)
 #, fuzzy
 msgid ""
 "If a password is set the members can still "
@@ -6783,12 +7390,12 @@
 "citerefentry> senza la password, i non-membri devono fornire la password."
 
 # type: SS
-#: gpasswd.1.xml:69(title)
+#: gpasswd.1.xml:98(title)
 msgid "Notes about group passwords"
 msgstr "Note sulle password di gruppo"
 
 # type: Plain text
-#: gpasswd.1.xml:70(para)
+#: gpasswd.1.xml:99(para)
 msgid ""
 "Group passwords are an inherent security problem since more than one person "
 "is permitted to know the password. However, groups are a useful tool for "
@@ -6799,7 +7406,7 @@
 "la cooperazione tra vari utenti."
 
 # type: Plain text
-#: gpasswd.1.xml:81(para)
+#: gpasswd.1.xml:110(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
@@ -6809,18 +7416,29 @@
 "possono essere utilizzate solo quando <command>login</command> viene "
 "invocato da root."
 
-#: gpasswd.1.xml:85(para)
+#: gpasswd.1.xml:114(para)
 msgid "The options cannot be combined."
 msgstr ""
 
 # type: Plain text
-#: gpasswd.1.xml:88(para)
+#: gpasswd.1.xml:117(para)
 #, fuzzy
 msgid "The options which apply to the <command>gpasswd</command> command are:"
 msgstr "Il comando <command>passwd</command> accetta le seguenti opzioni:"
 
+# type: IP
+#: gpasswd.1.xml:122(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-m</option>, <option>--maximum</option><replaceable>MAX</"
+#| "replaceable>"
+msgid ""
+"<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
+msgstr ""
+"<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
+
 # type: Plain text
-#: gpasswd.1.xml:97(para)
+#: gpasswd.1.xml:126(para)
 #, fuzzy
 msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
@@ -6829,8 +7447,19 @@
 "Il nome del gruppo verrà modificato da <replaceable>gruppo</replaceable> a "
 "<replaceable>nome_gruppo</replaceable>."
 
+# type: IP
+#: gpasswd.1.xml:135(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
+msgstr ""
+"<option>-t</option>, <option>--time</option><replaceable>GIORNI</replaceable>"
+
 # type: Plain text
-#: gpasswd.1.xml:110(para)
+#: gpasswd.1.xml:139(para)
 #, fuzzy
 msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
@@ -6839,19 +7468,28 @@
 "Il nome del gruppo verrà modificato da <replaceable>gruppo</replaceable> a "
 "<replaceable>nome_gruppo</replaceable>."
 
-#: gpasswd.1.xml:123(para)
+# type: IP
+#: gpasswd.1.xml:148(term)
+#, fuzzy
+#| msgid "<option>-r</option>, <option>--remove</option>"
+msgid "<option>-r</option>, <option>--remove-password</option>"
+msgstr "<option>-r</option>, <option>--remove</option>"
+
+#: gpasswd.1.xml:152(para)
 msgid ""
 "Remove the password from the named <replaceable>group</replaceable>. Only "
 "group members will be allowed to use <command>newgrp</command> to join the "
 "named <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:135(option)
+# type: IP
+#: gpasswd.1.xml:163(term)
 #, fuzzy
-msgid "-R"
-msgstr "-"
+#| msgid "<option>-r</option>, <option>--reset</option>"
+msgid "<option>-R</option>, <option>--restrict</option>"
+msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: gpasswd.1.xml:138(para)
+#: gpasswd.1.xml:167(para)
 msgid ""
 "Restrict the access to the named <replaceable>group</replaceable>. Only "
 "group members will be allowed to use <command>newgrp</command> to join the "
@@ -6859,14 +7497,19 @@
 msgstr ""
 
 # type: IP
-#: gpasswd.1.xml:149(term)
+#: gpasswd.1.xml:178(term)
 #, fuzzy
-msgid "<option>-A</option><replaceable>user</replaceable>,..."
+#| msgid ""
+#| "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
+#| "replaceable>"
+msgid ""
+"<option>-A</option>, <option>--administrators</option><replaceable>user</"
+"replaceable>,..."
 msgstr ""
-"<option>-t</option>, <option>--time</option><replaceable>GIORNI</replaceable>"
+"<option>-u</option>, <option>--user</option> <replaceable>LOGIN</replaceable>"
 
 # type: Plain text
-#: gpasswd.1.xml:153(para)
+#: gpasswd.1.xml:182(para)
 #, fuzzy
 msgid "Set the list of administrative users."
 msgstr ""
@@ -6876,17 +7519,22 @@
 "- una lista valida di membri e amministratori"
 
 # type: IP
-#: gpasswd.1.xml:161(term)
+#: gpasswd.1.xml:190(term)
 #, fuzzy
-msgid "<option>-M</option><replaceable>user</replaceable>,..."
+#| msgid ""
+#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-M</option>, <option>--members</option><replaceable>user</"
+"replaceable>,..."
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>GIORNI</replaceable>"
 
-#: gpasswd.1.xml:165(para)
+#: gpasswd.1.xml:194(para)
 msgid "Set the list of group members."
 msgstr ""
 
-#: gpasswd.1.xml:175(para)
+#: gpasswd.1.xml:204(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -6896,7 +7544,7 @@
 msgstr ""
 
 # type: Plain text
-#: gpasswd.1.xml:220(para)
+#: gpasswd.1.xml:249(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
@@ -6923,19 +7571,19 @@
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: faillog.8.xml:5(refentrytitle) faillog.8.xml:10(refname)
-#: faillog.8.xml:16(command) faillog.5.xml:5(refentrytitle)
-#: faillog.5.xml:10(refname) faillog.5.xml:53(refentrytitle)
+#: faillog.8.xml:34(refentrytitle) faillog.8.xml:39(refname)
+#: faillog.8.xml:45(command) faillog.5.xml:34(refentrytitle)
+#: faillog.5.xml:39(refname) faillog.5.xml:82(refentrytitle)
 msgid "faillog"
 msgstr "faillog"
 
 # type: Plain text
-#: faillog.8.xml:11(refpurpose)
+#: faillog.8.xml:40(refpurpose)
 msgid "display faillog records or set login failure limits"
 msgstr "mostra i conteggi e imposta i limiti degli accessi falliti"
 
 # type: Plain text
-#: faillog.8.xml:25(para)
+#: faillog.8.xml:54(para)
 msgid ""
 "<command>faillog</command> formats the contents of the failure log from "
 "<filename>/var/log/faillog</filename> database. It also can be used for "
@@ -6950,17 +7598,18 @@
 "utenti che hanno fallito almeno un tentativo di accesso."
 
 # type: Plain text
-#: faillog.8.xml:36(para)
+#: faillog.8.xml:65(para)
 msgid "The options which apply to the <command>faillog</command> command are:"
 msgstr "Il comando <command>faillog</command> accetta le seguenti opzioni:"
 
-# type: Plain text
-#: faillog.8.xml:44(para)
-msgid "Display faillog records for all users."
-msgstr "Mostra i record degli accessi falliti per tutti gli utenti."
+#: faillog.8.xml:73(para)
+msgid ""
+"Display (or act on) faillog records for all users having an entry in the "
+"<filename>faillog</filename> database."
+msgstr ""
 
 # type: IP
-#: faillog.8.xml:54(term)
+#: faillog.8.xml:86(term)
 msgid ""
 "<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
 "replaceable>"
@@ -6969,46 +7618,59 @@
 "replaceable>"
 
 # type: Plain text
-#: faillog.8.xml:59(para)
+#: faillog.8.xml:91(para)
 msgid ""
 "Lock account to <replaceable>SEC</replaceable> seconds after failed login."
 msgstr ""
 "Blocca l'account per <replaceable>SEC</replaceable> secondi dopo un "
 "tentativo di accesso fallito."
 
+#: faillog.8.xml:95(para) faillog.8.xml:121(para) faillog.8.xml:135(para)
+msgid ""
+"Write access to <filename>/var/log/faillog</filename> is required for this "
+"option."
+msgstr ""
+
 # type: IP
-#: faillog.8.xml:66(term)
+#: faillog.8.xml:102(term)
 msgid ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 
-# type: Plain text
-#: faillog.8.xml:71(para)
+#: faillog.8.xml:107(para)
 msgid ""
 "Set maximum number of login failures after the account is disabled to "
-"<replaceable>MAX</replaceable>. Selecting <replaceable>MAX</replaceable> "
-"value of 0 has the effect of not placing a limit on the number of failed "
-"logins. The maximum failure count should always be 0 for <emphasis>root</"
-"emphasis> to prevent a denial of services attack against the system."
+"<replaceable>MAX</replaceable>."
 msgstr ""
-"Imposta a <replaceable>MAX</replaceable> il numero massimo di tentativi "
-"permessi prima che l'account venga disabilitato. Un valore pari a zero "
-"significa che non viene posto nessun limite sul numero di tentativi falliti. "
-"Per impedire un possibile attacco di tipo Denial of Service al sistema, si "
-"consiglia di impostare questo valore a 0 per <emphasis>root</emphasis>."
 
+#: faillog.8.xml:111(para)
+msgid ""
+"Selecting a <replaceable>MAX</replaceable> value of 0 has the effect of not "
+"placing a limit on the number of failed logins."
+msgstr ""
+
+#: faillog.8.xml:116(para)
+msgid ""
+"The maximum failure count should always be 0 for <emphasis>root</emphasis> "
+"to prevent a denial of services attack against the system."
+msgstr ""
+
 # type: IP
-#: faillog.8.xml:82(term)
+#: faillog.8.xml:128(term)
 msgid "<option>-r</option>, <option>--reset</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
 # type: Plain text
-#: faillog.8.xml:84(para)
+#: faillog.8.xml:130(para)
+#, fuzzy
+#| msgid ""
+#| "Reset the counters of login failures or one record if used with the "
+#| "<option>-u</option><replaceable>LOGIN</replaceable> option. Write access "
+#| "to <filename>/var/log/faillog</filename> is required for this option."
 msgid ""
 "Reset the counters of login failures or one record if used with the <option>-"
-"u</option><replaceable>LOGIN</replaceable> option. Write access to "
-"<filename>/var/log/faillog</filename> is required for this option."
+"u</option><replaceable>LOGIN</replaceable> option."
 msgstr ""
 "Azzera i conteggi degli accessi falliti per tutti gli utenti, o per un "
 "utente solo se usato con l'opzione <option>-u</option> <replaceable>LOGIN</"
@@ -7016,28 +7678,29 @@
 "<filename>/var/log/faillog</filename>."
 
 # type: Plain text
-#: faillog.8.xml:97(para)
+#: faillog.8.xml:146(para)
+#, fuzzy
+#| msgid ""
+#| "Display faillog records more recent than <replaceable>DAYS</replaceable>. "
+#| "The <option>-t</option> flag overrides the use of <option>-u</option>."
 msgid ""
-"Display faillog records more recent than <replaceable>DAYS</replaceable>. "
-"The <option>-t</option> flag overrides the use of <option>-u</option>."
+"Display faillog records more recent than <replaceable>DAYS</replaceable>."
 msgstr ""
 "Mostra i record degli accessi falliti più recenti di un numero di "
 "<replaceable>GIORNI</replaceable>. L'opzione <option>-t</option> ha la "
 "precedenza sull'uso di <option>-u</option>."
 
-# type: IP
-#: faillog.8.xml:105(term)
-msgid ""
-"<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>"
-msgstr ""
-"<option>-u</option>, <option>--user</option> <replaceable>LOGIN</replaceable>"
-
 # type: Plain text
-#: faillog.8.xml:109(para)
+#: faillog.8.xml:158(para)
+#, fuzzy
+#| msgid ""
+#| "Display faillog record or maintains failure counters and limits (if used "
+#| "with <option>-l</option>, <option>-m</option> or <option>-r</option> "
+#| "options) only for user with <replaceable>LOGIN</replaceable>."
 msgid ""
 "Display faillog record or maintains failure counters and limits (if used "
 "with <option>-l</option>, <option>-m</option> or <option>-r</option> "
-"options) only for user with <replaceable>LOGIN</replaceable>."
+"options) only for the specified user(s)."
 msgstr ""
 "Mostra il record degli accessi falliti o, se sono state usate con le opzioni "
 "<option>-r</option>, <option>-m</option> o <option>-l</option>, imposta "
@@ -7045,8 +7708,33 @@
 "replaceable>."
 
 # type: Plain text
-#: faillog.8.xml:122(para)
+#: faillog.8.xml:176(para)
+#, fuzzy
+#| msgid ""
+#| "The <option>-r</option>, <option>-h</option> and <option>-f</option> "
+#| "options are only used when <command>login</command> is invoked by root."
 msgid ""
+"When none of the <option>-l</option>, <option>-m</option>, or <option>-r</"
+"option> options are used, <command>faillog</command> displays the faillog "
+"record of the specified user(s)."
+msgstr ""
+"Le opzioni <option>-r</option>, <option>-h</option> e <option>-f</option> "
+"possono essere utilizzate solo quando <command>login</command> viene "
+"invocato da root."
+
+#: faillog.8.xml:181(para)
+msgid ""
+"NOTE: in display mode, only the records of users which currently exist in "
+"the system are displayed. In the other modes (when the <option>-l</option>, "
+"<option>-m</option>, or <option>-r</option> options are used), the records "
+"of the user, or the range of users, or all the users that may have an entry "
+"in the faillog database will be changed. This is useful to reset records of "
+"users that have been deleted or set a policy in advance for a range of users."
+msgstr ""
+
+# type: Plain text
+#: faillog.8.xml:194(para)
+msgid ""
 "<command>faillog</command> only prints out users with no successful login "
 "since the last failure. To print out a user who has had a successful login "
 "since their last failure, you must explicitly request the user with the "
@@ -7060,17 +7748,17 @@
 "option> o se viene richiesto di mostrare tutti gli utenti con l'opzione "
 "<option>-a</option>."
 
-#: faillog.8.xml:135(filename) faillog.5.xml:41(filename)
+#: faillog.8.xml:207(filename) faillog.5.xml:70(filename)
 msgid "/var/log/faillog"
 msgstr "/var/log/faillog"
 
 # type: Plain text
-#: faillog.8.xml:137(para) faillog.5.xml:43(para)
+#: faillog.8.xml:209(para) faillog.5.xml:72(para)
 msgid "Failure logging file."
 msgstr ""
 
 # type: Plain text
-#: faillog.8.xml:145(para)
+#: faillog.8.xml:217(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
@@ -7081,12 +7769,12 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 # type: Plain text
-#: faillog.5.xml:11(refpurpose)
+#: faillog.5.xml:40(refpurpose)
 msgid "login failure logging file"
 msgstr "File di log degli accessi falliti"
 
 # type: Plain text
-#: faillog.5.xml:16(para)
+#: faillog.5.xml:45(para)
 #, fuzzy
 msgid ""
 "<filename>/var/log/faillog</filename> maintains a count of login failures "
@@ -7106,12 +7794,12 @@
 "avvenuto e infine la data in cui è avvenuto."
 
 # type: Plain text
-#: faillog.5.xml:26(para)
+#: faillog.5.xml:55(para)
 msgid "The structure of the file is:"
 msgstr "La struttura del file è la seguente:"
 
 # type: Plain text
-#: faillog.5.xml:27(programlisting)
+#: faillog.5.xml:56(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -7132,18 +7820,18 @@
 "\tlong    fail_locktime;\n"
 "};"
 
-#: expiry.1.xml:11(refentrytitle) expiry.1.xml:16(refname)
-#: expiry.1.xml:22(command)
+#: expiry.1.xml:41(refentrytitle) expiry.1.xml:46(refname)
+#: expiry.1.xml:52(command)
 msgid "expiry"
 msgstr "expiry"
 
 # type: Plain text
-#: expiry.1.xml:17(refpurpose)
+#: expiry.1.xml:47(refpurpose)
 msgid "check and enforce password expiration policy"
 msgstr "controlla e fa rispettare la scadenza della password"
 
 # type: Plain text
-#: expiry.1.xml:30(para)
+#: expiry.1.xml:60(para)
 #, fuzzy
 msgid ""
 "The <command>expiry</command> command checks (<option>-c</option>) the "
@@ -7155,7 +7843,7 @@
 "cambiata. Questo comando può essere eseguito da un utente qualsiasi."
 
 # type: Plain text
-#: expiry.1.xml:57(para) chage.1.xml:233(para)
+#: expiry.1.xml:87(para) chage.1.xml:262(para)
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -7166,12 +7854,12 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 # type: Plain text
-#: chsh.1.xml:17(refpurpose)
+#: chsh.1.xml:46(refpurpose)
 msgid "change login shell"
 msgstr "cambia la shell di login"
 
 # type: Plain text
-#: chsh.1.xml:34(para)
+#: chsh.1.xml:63(para)
 #, fuzzy
 msgid ""
 "The <command>chsh</command> command changes the user login shell. This "
@@ -7186,12 +7874,12 @@
 "account."
 
 # type: Plain text
-#: chsh.1.xml:45(para)
+#: chsh.1.xml:74(para)
 msgid "The options which apply to the <command>chsh</command> command are:"
 msgstr "Il comando <command>chsh</command> accetta le seguenti opzioni:"
 
 # type: Plain text
-#: chsh.1.xml:67(para)
+#: chsh.1.xml:96(para)
 #, fuzzy
 msgid ""
 "If the <option>-s</option> option is not selected, <command>chsh</command> "
@@ -7207,7 +7895,7 @@
 "[ ]</emphasis>."
 
 # type: Plain text
-#: chsh.1.xml:78(para)
+#: chsh.1.xml:107(para)
 #, fuzzy
 msgid ""
 "The only restriction placed on the login shell is that the command name must "
@@ -7227,12 +7915,12 @@
 "accidentalmente un utente selezionasse una shell limitata, non potrebbe più "
 "tornare alla shell di login che usava originariamente."
 
-#: chsh.1.xml:113(filename)
+#: chsh.1.xml:142(filename)
 msgid "/etc/shells"
 msgstr "/etc/shells"
 
 # type: Plain text
-#: chsh.1.xml:115(para)
+#: chsh.1.xml:144(para)
 msgid "List of valid login shells."
 msgstr ""
 "#-#-#-#-#    #-#-#-#-#\n"
@@ -7241,7 +7929,7 @@
 "Elenco delle shell di login ammesse."
 
 # type: Plain text
-#: chsh.1.xml:129(para)
+#: chsh.1.xml:158(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -7256,12 +7944,12 @@
 "citerefentry>."
 
 # type: Plain text
-#: chpasswd.8.xml:18(refpurpose)
+#: chpasswd.8.xml:47(refpurpose)
 msgid "update passwords in batch mode"
 msgstr "aggiorna le password in modo non interattivo"
 
 # type: Plain text
-#: chpasswd.8.xml:32(para)
+#: chpasswd.8.xml:61(para)
 #, fuzzy
 msgid ""
 "The <command>chpasswd</command> command reads a list of user name and "
@@ -7273,7 +7961,7 @@
 "utenti esistenti. Ciascuna riga usa il formato:"
 
 # type: Plain text
-#: chpasswd.8.xml:37(para)
+#: chpasswd.8.xml:66(para)
 msgid ""
 "<emphasis remap=\"I\">user_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -7282,7 +7970,7 @@
 "emphasis>"
 
 # type: Plain text
-#: chpasswd.8.xml:41(para)
+#: chpasswd.8.xml:70(para)
 #, fuzzy
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
@@ -7293,7 +7981,7 @@
 "L'algoritmo di cifratura predefinito è DES. Se sono presenti, vengono "
 "aggiornate anche le informazioni sulla durata delle password."
 
-#: chpasswd.8.xml:46(para) chgpasswd.8.xml:46(para)
+#: chpasswd.8.xml:75(para) chgpasswd.8.xml:75(para)
 msgid ""
 "The default encryption algorithm can be defined for the system with the "
 "ENCRYPT_METHOD variable of <filename>/etc/login.defs</filename>, and can be "
@@ -7302,7 +7990,7 @@
 msgstr ""
 
 # type: Plain text
-#: chpasswd.8.xml:52(para) chgpasswd.8.xml:52(para)
+#: chpasswd.8.xml:81(para) chgpasswd.8.xml:81(para)
 msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are created at a single time."
@@ -7311,41 +7999,45 @@
 "necessità di creare molti account nello stesso momento."
 
 # type: Plain text
-#: chpasswd.8.xml:60(para)
+#: chpasswd.8.xml:89(para)
 msgid "The options which apply to the <command>chpasswd</command> command are:"
 msgstr "Il comando <command>chpasswd</command> accetta le seguenti opzioni:"
 
+#: chpasswd.8.xml:98(para) chgpasswd.8.xml:98(para)
+msgid "The available methods are DES, MD5, and NONE."
+msgstr ""
+
 # type: IP
-#: chpasswd.8.xml:76(term) chgpasswd.8.xml:76(term)
+#: chpasswd.8.xml:108(term) chgpasswd.8.xml:108(term)
 msgid "<option>-e</option>, <option>--encrypted</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
 # type: Plain text
-#: chpasswd.8.xml:78(para) chgpasswd.8.xml:78(para)
+#: chpasswd.8.xml:110(para) chgpasswd.8.xml:110(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr "Le password fornite sono in forma cifrata."
 
 # type: IP
-#: chpasswd.8.xml:88(term) chgpasswd.8.xml:88(term)
+#: chpasswd.8.xml:120(term) chgpasswd.8.xml:120(term)
 msgid "<option>-m</option>, <option>--md5</option>"
 msgstr "<option>-m</option>, <option>--md5</option>"
 
 # type: Plain text
-#: chpasswd.8.xml:90(para) chgpasswd.8.xml:90(para)
+#: chpasswd.8.xml:122(para) chgpasswd.8.xml:122(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
 msgstr ""
 "Usa la cifratura MD5 anziché DES quando le password fornite non sono cifrate."
 
-#: chpasswd.8.xml:126(para) chgpasswd.8.xml:126(para)
+#: chpasswd.8.xml:158(para) chgpasswd.8.xml:158(para)
 msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
 msgstr ""
 
 # type: Plain text
-#: chpasswd.8.xml:178(para)
+#: chpasswd.8.xml:210(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
@@ -7363,12 +8055,12 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 # type: Plain text
-#: chgpasswd.8.xml:19(refpurpose)
+#: chgpasswd.8.xml:48(refpurpose)
 msgid "update group passwords in batch mode"
 msgstr ""
 
 # type: Plain text
-#: chgpasswd.8.xml:33(para)
+#: chgpasswd.8.xml:62(para)
 #, fuzzy
 msgid ""
 "The <command>chgpasswd</command> command reads a list of group name and "
@@ -7380,14 +8072,14 @@
 "utenti esistenti. Ciascuna riga usa il formato:"
 
 # type: Plain text
-#: chgpasswd.8.xml:38(para)
+#: chgpasswd.8.xml:67(para)
 msgid ""
 "<emphasis remap=\"I\">group_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
 msgstr ""
 
 # type: Plain text
-#: chgpasswd.8.xml:42(para)
+#: chgpasswd.8.xml:71(para)
 #, fuzzy
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
@@ -7397,13 +8089,13 @@
 "L'algoritmo di cifratura predefinito è DES."
 
 # type: Plain text
-#: chgpasswd.8.xml:60(para)
+#: chgpasswd.8.xml:89(para)
 msgid ""
 "The options which apply to the <command>chgpasswd</command> command are:"
 msgstr "Il comando <command>chgpasswd</command> accetta le seguenti opzioni:"
 
 # type: Plain text
-#: chgpasswd.8.xml:173(para)
+#: chgpasswd.8.xml:205(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
@@ -7419,7 +8111,7 @@
 "citerefentry>."
 
 # type: Plain text
-#: chfn.1.xml:18(refpurpose)
+#: chfn.1.xml:47(refpurpose)
 #, fuzzy
 msgid "change real user name and information"
 msgstr ""
@@ -7428,36 +8120,40 @@
 "#-#-#-#-#  chfn.1.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "chfn - cambia le informazioni personali dell'utente"
 
-#: chfn.1.xml:24(replaceable)
+#: chfn.1.xml:53(replaceable)
 msgid "full_name"
 msgstr ""
 
-#: chfn.1.xml:25(replaceable)
+#: chfn.1.xml:53(arg)
+msgid "-f <placeholder-1/>"
+msgstr "-f <placeholder-1/>"
+
+#: chfn.1.xml:54(replaceable)
 msgid "room_no"
 msgstr ""
 
-#: chfn.1.xml:26(replaceable)
+#: chfn.1.xml:55(replaceable)
 msgid "work_ph"
 msgstr ""
 
-#: chfn.1.xml:26(arg)
+#: chfn.1.xml:55(arg)
 msgid "-w <placeholder-1/>"
 msgstr "-w <placeholder-1/>"
 
-#: chfn.1.xml:27(replaceable)
+#: chfn.1.xml:56(replaceable)
 msgid "home_ph"
 msgstr ""
 
-#: chfn.1.xml:28(replaceable)
+#: chfn.1.xml:57(replaceable)
 msgid "other"
 msgstr ""
 
-#: chfn.1.xml:28(arg)
+#: chfn.1.xml:57(arg)
 msgid "-o <placeholder-1/>"
 msgstr "-o <placeholder-1/>"
 
 # type: Plain text
-#: chfn.1.xml:35(para)
+#: chfn.1.xml:64(para)
 #, fuzzy
 msgid ""
 "The <command>chfn</command> command changes user fullname, office number, "
@@ -7483,7 +8179,7 @@
 "utente può usare l'opzione <option>-o</option> per la modifica del campo "
 "GECOS senza restrizioni."
 
-#: chfn.1.xml:49(para)
+#: chfn.1.xml:78(para)
 msgid ""
 "These fields must not contain any colons. Except for the <emphasis remap=\"I"
 "\">other</emphasis> field, they should not contain any comma or equal sign. "
@@ -7493,7 +8189,7 @@
 msgstr ""
 
 # type: Plain text
-#: chfn.1.xml:58(para)
+#: chfn.1.xml:87(para)
 msgid ""
 "If none of the options are selected, <command>chfn</command> operates in an "
 "interactive fashion, prompting the user with the current values for all of "
@@ -7510,7 +8206,7 @@
 "<command>chfn</command>, chiede l'account sul quale operare."
 
 # type: Plain text
-#: chfn.1.xml:103(para)
+#: chfn.1.xml:132(para)
 msgid ""
 "<citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -7524,18 +8220,18 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chage.1.xml:5(refentrytitle) chage.1.xml:10(refname)
-#: chage.1.xml:15(command)
+#: chage.1.xml:34(refentrytitle) chage.1.xml:39(refname)
+#: chage.1.xml:44(command)
 msgid "chage"
 msgstr "chage"
 
 # type: Plain text
-#: chage.1.xml:11(refpurpose)
+#: chage.1.xml:40(refpurpose)
 msgid "change user password expiry information"
 msgstr "cambia le informazioni sulla scadenza della password"
 
 # type: Plain text
-#: chage.1.xml:27(para)
+#: chage.1.xml:56(para)
 msgid ""
 "The <command>chage</command> command changes the number of days between "
 "password changes and the date of the last password change. This information "
@@ -7546,19 +8242,19 @@
 "sistema per determinare quando un utente deve cambiare la propria password."
 
 # type: Plain text
-#: chage.1.xml:37(para)
+#: chage.1.xml:66(para)
 msgid "The options which apply to the <command>chage</command> command are:"
 msgstr "Il comando <command>chage</command> accetta le seguenti opzioni:"
 
 # type: IP
-#: chage.1.xml:42(term)
+#: chage.1.xml:71(term)
 msgid ""
 "<option>-d</option>, <option>--lastday</option><replaceable>LAST_DAY</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: chage.1.xml:46(para)
+#: chage.1.xml:75(para)
 msgid ""
 "Set the number of days since January 1st, 1970 when the password was last "
 "changed. The date may also be expressed in the format YYYY-MM-DD (or the "
@@ -7569,14 +8265,14 @@
 "nel formato AAAA-MM-GG o nella notazione comunemente usata nel proprio paese."
 
 # type: TP
-#: chage.1.xml:54(term)
+#: chage.1.xml:83(term)
 msgid ""
 "<option>-E</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: chage.1.xml:58(para)
+#: chage.1.xml:87(para)
 #, fuzzy
 msgid ""
 "Set the date or number of days since January 1, 1970 on which the user's "
@@ -7592,7 +8288,7 @@
 "comunemente usata nel proprio paese. Un utente con l'account bloccato deve "
 "contattare l'amministratore prima di poter usare ancora il sistema."
 
-#: chage.1.xml:66(para)
+#: chage.1.xml:95(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>EXPIRE_DATE</replaceable> will remove an account expiration "
@@ -7600,14 +8296,14 @@
 msgstr ""
 
 # type: TP
-#: chage.1.xml:80(term)
+#: chage.1.xml:109(term)
 msgid ""
 "<option>-I</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: chage.1.xml:84(para)
+#: chage.1.xml:113(para)
 #, fuzzy
 msgid ""
 "Set the number of days of inactivity after a password has expired before the "
@@ -7621,31 +8317,26 @@
 "disabilita questa funzione. Un utente con l'account bloccato deve contattare "
 "l'amministratore prima di poter usare ancora il sistema."
 
-#: chage.1.xml:91(para)
+#: chage.1.xml:120(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>INACTIVE</replaceable> will remove an account's inactivity."
 msgstr ""
 
-# type: IP
-#: chage.1.xml:99(term)
-msgid "<option>-l</option>, <option>--list</option>"
-msgstr "<option>-l</option>, <option>--list</option>"
-
 # type: Plain text
-#: chage.1.xml:103(para)
+#: chage.1.xml:132(para)
 msgid "Show account aging information."
 msgstr ""
 
 # type: IP
-#: chage.1.xml:121(term)
+#: chage.1.xml:150(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: chage.1.xml:125(para)
+#: chage.1.xml:154(para)
 #, fuzzy
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
@@ -7662,7 +8353,7 @@
 "account. Questo evento può essere reso noto in anticipo usando l'opzione "
 "<option>-W</option>, che fornisce un preavviso all'utente."
 
-#: chage.1.xml:134(para)
+#: chage.1.xml:163(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as "
 "<replaceable>MAX_DAYS</replaceable> will remove checking a password's "
@@ -7670,14 +8361,14 @@
 msgstr ""
 
 # type: IP
-#: chage.1.xml:142(term)
+#: chage.1.xml:171(term)
 msgid ""
 "<option>-W</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
 msgstr ""
 
 # type: Plain text
-#: chage.1.xml:146(para)
+#: chage.1.xml:175(para)
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
@@ -7690,7 +8381,7 @@
 "avvertito dell'imminente scadenza."
 
 # type: Plain text
-#: chage.1.xml:155(para)
+#: chage.1.xml:184(para)
 #, fuzzy
 msgid ""
 "If none of the options are selected, <command>chage</command> operates in an "
@@ -7706,7 +8397,7 @@
 "a usare il valore attuale."
 
 # type: Plain text
-#: chage.1.xml:165(para)
+#: chage.1.xml:194(para)
 msgid ""
 "The <command>chage</command> program requires a shadow password file to be "
 "available."
@@ -7715,7 +8406,7 @@
 "disponibile."
 
 # type: Plain text
-#: chage.1.xml:169(para)
+#: chage.1.xml:198(para)
 msgid ""
 "The <command>chage</command> command is restricted to the root user, except "
 "for the <option>-l</option> option, which may be used by an unprivileged "
@@ -7727,17 +8418,17 @@
 "dell'account."
 
 # type: IP
-#: chage.1.xml:222(replaceable)
+#: chage.1.xml:251(replaceable)
 msgid "15"
 msgstr "15"
 
 # type: Plain text
-#: chage.1.xml:224(para)
+#: chage.1.xml:253(para)
 msgid "can't find the shadow password file"
 msgstr ""
 
 # type: TP
-#: chage.1.xml:200(para)
+#: chage.1.xml:229(para)
 msgid ""
 "The <command>chage</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -7755,6 +8446,273 @@
 # type: Plain text
 #, fuzzy
 #~ msgid ""
+#~ "The group name or number of the user's initial login group. The group "
+#~ "name must exist. A group number must refer to an already existing group. "
+#~ "The default group number is 1 or whatever is specified in <filename>/etc/"
+#~ "default/useradd</filename>."
+#~ msgstr ""
+#~ "Il nuome o numero del nuovo gruppo di connessione dell'utente. Il nome "
+#~ "del gruppo deve esistere. Un numero di gruppo deve riferirsi ad un gruppo "
+#~ "già esistente. Il numero di gruppo predefinito è 1."
+
+# type: Plain text
+#~ msgid ""
+#~ "The group name or ID for a new user's initial group. The named group must "
+#~ "exist, and a numerical group ID must have an existing entry."
+#~ msgstr ""
+#~ "Il nome o ID del gruppo iniziale per un nuovo utente.  Il gruppo nominato "
+#~ "deve esistere, ed un ID numerico di gruppo deve avere una voce esistente."
+
+# type: Plain text
+#~ msgid "days since Jan 1, 1970 that password was last changed"
+#~ msgstr ""
+#~ "Giorni a partire dal 1 gennaio 1970 in cui la password è stata cambiata "
+#~ "l'ultima volta"
+
+# type: Plain text
+#, fuzzy
+#~ msgid "days after which password must be changed"
+#~ msgstr ""
+#~ "#-#-#-#-#  it.po (shadow 4.0.3)  #-#-#-#-#\n"
+#~ "Giorni dopo i quali la password deve essere modificata\n"
+#~ "#-#-#-#-#  shadow.5.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Giorni dopo i quali la password deve essere cambiata"
+
+# type: Plain text
+#~ msgid "days before password is to expire that user is warned"
+#~ msgstr ""
+#~ "Giorni prima della scadenza della password in cui l'utente viene avvertito"
+
+# type: Plain text
+#~ msgid "days after password expires that account is disabled"
+#~ msgstr ""
+#~ "Giorni dopo la scadenza della password in cui l'account viene disabilitato"
+
+# type: Plain text
+#~ msgid "days since Jan 1, 1970 that account is disabled"
+#~ msgstr ""
+#~ "Giorni a partire dal 1 gennaio 1970 dopo i quali l'account viene "
+#~ "disabilitato"
+
+# type: Plain text
+#~ msgid ""
+#~ "The password field must be filled. The encrypted password consists of 13 "
+#~ "to 24 characters from the 64 character alphabet a thru z, A thru Z, 0 "
+#~ "thru 9, \\. and /. Optionally it can start with a \"$\" character. This "
+#~ "means the encrypted password was generated using another (not DES) "
+#~ "algorithm. For example if it starts with \"$1$\" it means the MD5-based "
+#~ "algorithm was used."
+#~ msgstr ""
+#~ "Il campo password non può essere vuoto. La password cifrata è composta da "
+#~ "un numero compreso tra 13 a 24 di caratteri scelti da un alfabeto di 64 "
+#~ "caratteri: da a fino a z, da A a Z, da 0 a 9, . e /. Facoltativamente, la "
+#~ "password può iniziare con il carattere \"$\"; questo sta a indicare che "
+#~ "la password cifrata è stata generata usando un algoritmo diverso da DES. "
+#~ "Ad esempio, \"$1$\" significa che è stato usato un algoritmo basato su "
+#~ "MD5."
+
+# type: Plain text
+#~ msgid ""
+#~ "The date of the last password change is given as the number of days since "
+#~ "Jan 1, 1970. The password may not be changed again until the proper "
+#~ "number of days have passed, and must be changed after the maximum number "
+#~ "of days. If the minimum number of days required is greater than the "
+#~ "maximum number of day allowed, this password may not be changed by the "
+#~ "user."
+#~ msgstr ""
+#~ "La data dell'ultimo cambio della password è espressa come il numero di "
+#~ "giorni trascorsi dal 1 gennaio 1970. La passowrd non può essere cambiata "
+#~ "nuovamente prima che sia passato il numero di giorni previsti, ma deve "
+#~ "obbligatoriamente essere cambiata dopo il massimo numero di giorni. Se il "
+#~ "numero minimo di giorni richiesti è superiore al numero massimo di giorni "
+#~ "concessi, all'utente non è permesso cambiare la password."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "An account is considered to be inactive and is disabled if the password "
+#~ "is not changed within the specified number of days after the password "
+#~ "expires. An account will also be disabled on the specified day regardless "
+#~ "of other password expiration information."
+#~ msgstr ""
+#~ "#-#-#-#-#  it.po (shadow 4.0.3)  #-#-#-#-#\n"
+#~ "Un account viene considerato inattivo e viene disabilitato se la password "
+#~ "non viene modificata entro il numero di giorni specificato dopo la "
+#~ "scadenza della password.  Un account sarà anche disabilitato il giorno "
+#~ "specificato senza tener conto di altre informazioni sulla scadenza della "
+#~ "password.\n"
+#~ "#-#-#-#-#  shadow.5.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Un account viene considerato inattivo e viene disabilitato se, dopo la "
+#~ "scadenza, la password non viene cambiata entro il numero di giorni "
+#~ "specificato. Inoltre, un account viene disabilitato il giorno "
+#~ "specificato, senza tener conto di altre informazioni sulla scadenza della "
+#~ "password."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "This information supersedes any password or password age information "
+#~ "present in <filename>/etc/passwd</filename>."
+#~ msgstr ""
+#~ "#-#-#-#-#  it.po (shadow 4.0.3)  #-#-#-#-#\n"
+#~ "Questa informazione ha la precedenza nei confronti di qualunque "
+#~ "informazione sulla password o sulla scadenza della password presente in "
+#~ "<filename>/etc/passwd</filename>.\n"
+#~ "#-#-#-#-#  shadow.5.po (PACKAGE VERSION)  #-#-#-#-#\n"
+#~ "Queste informazioni hanno la precedenza su qualunque informazione sulle "
+#~ "password o sulla loro durata presente in <filename>/etc/passwd</filename>."
+
+# type: Plain text
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+# type: Plain text
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>getpwnam</"
+#~ "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>getpwnam</"
+#~ "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+# type: Plain text
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>."
+
+#~ msgid "-a"
+#~ msgstr "-a"
+
+#~ msgid "-d"
+#~ msgstr "-d"
+
+#~ msgid "-g"
+#~ msgstr "-g"
+
+#~ msgid "-o"
+#~ msgstr "-o"
+
+# type: SH
+#, fuzzy
+#~ msgid "VALUE"
+#~ msgstr "VALORI RESTITUITI"
+
+#~ msgid "-K <placeholder-1/>=<placeholder-2/>"
+#~ msgstr "-K <placeholder-1/>=<placeholder-2/>"
+
+#, fuzzy
+#~ msgid "-R"
+#~ msgstr "-"
+
+# type: IP
+#, fuzzy
+#~ msgid "<option>-A</option><replaceable>user</replaceable>,..."
+#~ msgstr ""
+#~ "<option>-t</option>, <option>--time</option><replaceable>GIORNI</"
+#~ "replaceable>"
+
+# type: IP
+#, fuzzy
+#~ msgid "<option>-M</option><replaceable>user</replaceable>,..."
+#~ msgstr ""
+#~ "<option>-t</option>, <option>--time</option><replaceable>GIORNI</"
+#~ "replaceable>"
+
+# type: Plain text
+#~ msgid "Display faillog records for all users."
+#~ msgstr "Mostra i record degli accessi falliti per tutti gli utenti."
+
+# type: Plain text
+#~ msgid ""
+#~ "Set maximum number of login failures after the account is disabled to "
+#~ "<replaceable>MAX</replaceable>. Selecting <replaceable>MAX</replaceable> "
+#~ "value of 0 has the effect of not placing a limit on the number of failed "
+#~ "logins. The maximum failure count should always be 0 for <emphasis>root</"
+#~ "emphasis> to prevent a denial of services attack against the system."
+#~ msgstr ""
+#~ "Imposta a <replaceable>MAX</replaceable> il numero massimo di tentativi "
+#~ "permessi prima che l'account venga disabilitato. Un valore pari a zero "
+#~ "significa che non viene posto nessun limite sul numero di tentativi "
+#~ "falliti. Per impedire un possibile attacco di tipo Denial of Service al "
+#~ "sistema, si consiglia di impostare questo valore a 0 per <emphasis>root</"
+#~ "emphasis>."
+
+# type: Plain text
+#, fuzzy
+#~ msgid ""
 #~ "The user's home directory will be created if it does not exist. The files "
 #~ "contained in <replaceable>SKEL_DIR</replaceable> will be copied to the "
 #~ "home directory if the <option>-k</option> option is used, otherwise the "
@@ -7891,28 +8849,6 @@
 #~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
 #~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-# type: Plain text
-#~ msgid ""
-#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>login</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
-#~ msgstr ""
-#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>login</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
-
 #~ msgid "administer the <placeholder-1/> file"
 #~ msgstr "amministra il file <placeholder-1/>"
 
@@ -7940,15 +8876,6 @@
 #~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
 #~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-# type: Plain text
-#~ msgid ""
-#~ "The group name or number of the user's initial login group. The group "
-#~ "name must exist. A group number must refer to an already existing group."
-#~ msgstr ""
-#~ "Il nuome o numero del nuovo gruppo di connessione dell'utente.  Il nome "
-#~ "del gruppo deve esistere. Un numero di gruppo deve riferirsi ad un gruppo "
-#~ "già esistente."
-
 #~ msgid "-n"
 #~ msgstr "-n"
 

Modified: upstream/trunk/man/po/pl.po
===================================================================
--- upstream/trunk/man/po/pl.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/man/po/pl.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: man pages for shadow 4.0.16\n"
-"POT-Creation-Date: 2008-05-24 21:02+0200\n"
+"POT-Creation-Date: 2009-04-06 00:48+0200\n"
 "PO-Revision-Date: 2008-08-15 12:10-0300\n"
 "Last-Translator: Tomasz Kłoczko <kloczek at pld.org.pl>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@ -11,74 +11,73 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: vipw.8.xml:9(refentrytitle) vipw.8.xml:14(refname) vipw.8.xml:23(command)
-#: login.defs.5.xml:419(term)
+#: vipw.8.xml:38(refentrytitle) vipw.8.xml:43(refname) vipw.8.xml:52(command)
 msgid "vipw"
 msgstr "vipw"
 
-#: vipw.8.xml:10(manvolnum) usermod.8.xml:11(manvolnum)
-#: userdel.8.xml:13(manvolnum) userdel.8.xml:170(replaceable)
-#: useradd.8.xml:20(manvolnum) pwconv.8.xml:13(manvolnum)
-#: pwck.8.xml:12(manvolnum) nologin.8.xml:6(manvolnum)
-#: newusers.8.xml:22(manvolnum) logoutd.8.xml:6(manvolnum)
-#: lastlog.8.xml:6(manvolnum) grpck.8.xml:10(manvolnum)
-#: groupmod.8.xml:10(manvolnum) groupmems.8.xml:10(manvolnum)
-#: groupdel.8.xml:10(manvolnum) groupdel.8.xml:100(replaceable)
-#: groupadd.8.xml:12(manvolnum) faillog.8.xml:6(manvolnum)
-#: faillog.5.xml:53(manvolnum) chpasswd.8.xml:13(manvolnum)
-#: chgpasswd.8.xml:14(manvolnum)
+#: vipw.8.xml:39(manvolnum) usermod.8.xml:40(manvolnum)
+#: userdel.8.xml:42(manvolnum) userdel.8.xml:199(replaceable)
+#: useradd.8.xml:50(manvolnum) pwconv.8.xml:43(manvolnum)
+#: pwck.8.xml:41(manvolnum) nologin.8.xml:35(manvolnum)
+#: newusers.8.xml:51(manvolnum) logoutd.8.xml:35(manvolnum)
+#: lastlog.8.xml:36(manvolnum) grpck.8.xml:39(manvolnum)
+#: groupmod.8.xml:39(manvolnum) groupmems.8.xml:39(manvolnum)
+#: groupdel.8.xml:39(manvolnum) groupdel.8.xml:129(replaceable)
+#: groupadd.8.xml:43(manvolnum) faillog.8.xml:35(manvolnum)
+#: faillog.5.xml:82(manvolnum) chpasswd.8.xml:42(manvolnum)
+#: chgpasswd.8.xml:43(manvolnum)
 msgid "8"
 msgstr "8"
 
-#: vipw.8.xml:11(refmiscinfo) usermod.8.xml:12(refmiscinfo)
-#: userdel.8.xml:14(refmiscinfo) useradd.8.xml:21(refmiscinfo)
-#: pwconv.8.xml:14(refmiscinfo) pwck.8.xml:13(refmiscinfo)
-#: nologin.8.xml:7(refmiscinfo) newusers.8.xml:23(refmiscinfo)
-#: logoutd.8.xml:7(refmiscinfo) lastlog.8.xml:7(refmiscinfo)
-#: grpck.8.xml:11(refmiscinfo) groupmod.8.xml:11(refmiscinfo)
-#: groupmems.8.xml:11(refmiscinfo) groupdel.8.xml:11(refmiscinfo)
-#: groupadd.8.xml:13(refmiscinfo) faillog.8.xml:7(refmiscinfo)
-#: chpasswd.8.xml:14(refmiscinfo) chgpasswd.8.xml:15(refmiscinfo)
+#: vipw.8.xml:40(refmiscinfo) usermod.8.xml:41(refmiscinfo)
+#: userdel.8.xml:43(refmiscinfo) useradd.8.xml:51(refmiscinfo)
+#: pwconv.8.xml:44(refmiscinfo) pwck.8.xml:42(refmiscinfo)
+#: nologin.8.xml:36(refmiscinfo) newusers.8.xml:52(refmiscinfo)
+#: logoutd.8.xml:36(refmiscinfo) lastlog.8.xml:37(refmiscinfo)
+#: grpck.8.xml:40(refmiscinfo) groupmod.8.xml:40(refmiscinfo)
+#: groupmems.8.xml:40(refmiscinfo) groupdel.8.xml:40(refmiscinfo)
+#: groupadd.8.xml:44(refmiscinfo) faillog.8.xml:36(refmiscinfo)
+#: chpasswd.8.xml:43(refmiscinfo) chgpasswd.8.xml:44(refmiscinfo)
 msgid "System Management Commands"
 msgstr "Polecenia Zarządzania Systemem"
 
-#: vipw.8.xml:15(refname) vipw.8.xml:29(command)
+#: vipw.8.xml:44(refname) vipw.8.xml:58(command)
 msgid "vigr"
 msgstr "vigr"
 
-#: vipw.8.xml:16(refpurpose)
+#: vipw.8.xml:45(refpurpose)
 msgid "edit the password, group, shadow-password or shadow-group file"
 msgstr "edytuj plik haseł, grup lub ich wersji chronionych"
 
-#: vipw.8.xml:25(replaceable) vipw.8.xml:31(replaceable)
-#: usermod.8.xml:23(replaceable) userdel.8.xml:23(arg)
-#: useradd.8.xml:31(replaceable) useradd.8.xml:43(replaceable)
-#: su.1.xml:37(replaceable) passwd.1.xml:28(replaceable)
-#: lastlog.8.xml:18(replaceable) groupmod.8.xml:22(replaceable)
-#: faillog.8.xml:18(replaceable) chsh.1.xml:24(replaceable)
-#: chpasswd.8.xml:25(replaceable) chgpasswd.8.xml:26(replaceable)
-#: chage.1.xml:17(replaceable)
+#: vipw.8.xml:54(replaceable) vipw.8.xml:60(replaceable)
+#: usermod.8.xml:52(replaceable) userdel.8.xml:52(arg)
+#: useradd.8.xml:61(replaceable) useradd.8.xml:73(replaceable)
+#: su.1.xml:66(replaceable) passwd.1.xml:57(replaceable)
+#: lastlog.8.xml:48(replaceable) groupmod.8.xml:51(replaceable)
+#: groupadd.8.xml:55(replaceable) faillog.8.xml:47(replaceable)
+#: chsh.1.xml:53(replaceable) chpasswd.8.xml:54(replaceable)
+#: chgpasswd.8.xml:55(replaceable) chage.1.xml:46(replaceable)
 msgid "options"
 msgstr "opcje"
 
-#: vipw.8.xml:37(title) usermod.8.xml:30(title) userdel.8.xml:31(title)
-#: useradd.8.xml:49(title) suauth.5.xml:21(title) su.1.xml:48(title)
-#: sg.1.xml:30(title) shadow.5.xml:15(title) shadow.3.xml:64(title)
-#: shadow.3.xml:120(title) pwconv.8.xml:40(title) pwck.8.xml:52(title)
-#: porttime.5.xml:15(title) passwd.5.xml:15(title) passwd.1.xml:37(title)
-#: nologin.8.xml:21(title) newusers.8.xml:40(title) newgrp.1.xml:26(title)
-#: logoutd.8.xml:21(title) login.defs.5.xml:76(title)
-#: login.access.5.xml:15(title) login.1.xml:72(title) limits.5.xml:16(title)
-#: lastlog.8.xml:24(title) gshadow.5.xml:15(title) grpck.8.xml:40(title)
-#: groups.1.xml:24(title) groupmod.8.xml:29(title) groupmems.8.xml:31(title)
-#: groupdel.8.xml:28(title) groupadd.8.xml:36(title) gpasswd.1.xml:40(title)
-#: faillog.8.xml:24(title) faillog.5.xml:15(title) expiry.1.xml:29(title)
-#: chsh.1.xml:33(title) chpasswd.8.xml:31(title) chgpasswd.8.xml:32(title)
-#: chfn.1.xml:34(title) chage.1.xml:26(title)
+#: vipw.8.xml:66(title) usermod.8.xml:59(title) userdel.8.xml:60(title)
+#: useradd.8.xml:79(title) suauth.5.xml:50(title) su.1.xml:77(title)
+#: sg.1.xml:59(title) shadow.5.xml:44(title) shadow.3.xml:93(title)
+#: shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:81(title)
+#: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
+#: nologin.8.xml:50(title) newusers.8.xml:69(title) newgrp.1.xml:55(title)
+#: logoutd.8.xml:50(title) login.defs.5.xml:107(title)
+#: login.access.5.xml:45(title) login.1.xml:103(title) limits.5.xml:46(title)
+#: lastlog.8.xml:54(title) gshadow.5.xml:43(title) grpck.8.xml:69(title)
+#: groups.1.xml:53(title) groupmod.8.xml:58(title) groupmems.8.xml:60(title)
+#: groupdel.8.xml:57(title) groupadd.8.xml:62(title) gpasswd.1.xml:69(title)
+#: faillog.8.xml:53(title) faillog.5.xml:44(title) expiry.1.xml:59(title)
+#: chsh.1.xml:62(title) chpasswd.8.xml:60(title) chgpasswd.8.xml:61(title)
+#: chfn.1.xml:63(title) chage.1.xml:55(title)
 msgid "DESCRIPTION"
 msgstr "OPIS"
 
-#: vipw.8.xml:38(para)
+#: vipw.8.xml:67(para)
 msgid ""
 "The <command>vipw</command> and <command>vigr</command> commands edits the "
 "files <filename>/etc/passwd</filename> and <filename>/etc/group</filename>, "
@@ -103,17 +102,17 @@
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: vipw.8.xml:55(title) usermod.8.xml:38(title) userdel.8.xml:40(title)
-#: useradd.8.xml:62(title) su.1.xml:94(title) pwck.8.xml:104(title)
-#: passwd.1.xml:123(title) newusers.8.xml:98(title) login.1.xml:157(title)
-#: lastlog.8.xml:36(title) grpck.8.xml:85(title) groupmod.8.xml:38(title)
-#: groupmems.8.xml:46(title) groupadd.8.xml:45(title) gpasswd.1.xml:80(title)
-#: faillog.8.xml:35(title) chsh.1.xml:44(title) chpasswd.8.xml:59(title)
-#: chgpasswd.8.xml:59(title) chage.1.xml:36(title)
+#: vipw.8.xml:84(title) usermod.8.xml:67(title) userdel.8.xml:69(title)
+#: useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:133(title)
+#: passwd.1.xml:151(title) newusers.8.xml:221(title) login.1.xml:188(title)
+#: lastlog.8.xml:66(title) grpck.8.xml:114(title) groupmod.8.xml:67(title)
+#: groupmems.8.xml:75(title) groupadd.8.xml:71(title) gpasswd.1.xml:109(title)
+#: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:88(title)
+#: chgpasswd.8.xml:88(title) chage.1.xml:65(title)
 msgid "OPTIONS"
 msgstr "OPCJE"
 
-#: vipw.8.xml:56(para)
+#: vipw.8.xml:85(para)
 msgid ""
 "The options which apply to the <command>vipw</command> and <command>vigr</"
 "command> commands are:"
@@ -122,249 +121,166 @@
 "następujące opcje:Polecenia <command>vipw</command> i <command>vigr</"
 "command> posiadają następujące opcje:"
 
-#: vipw.8.xml:62(term)
+#: vipw.8.xml:91(term)
 msgid "<option>-g</option>, <option>--group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: vipw.8.xml:64(para)
+#: vipw.8.xml:93(para)
 msgid "Edit group database."
 msgstr "Edycja bazy grup."
 
-#: vipw.8.xml:68(term) userdel.8.xml:70(term) useradd.8.xml:179(term)
-#: passwd.1.xml:163(term) lastlog.8.xml:52(term) groupmod.8.xml:64(term)
-#: groupadd.8.xml:80(term) faillog.8.xml:48(term) chsh.1.xml:50(term)
-#: chpasswd.8.xml:82(term) chgpasswd.8.xml:82(term) chage.1.xml:74(term)
+#: vipw.8.xml:97(term) userdel.8.xml:99(term) useradd.8.xml:247(term)
+#: passwd.1.xml:191(term) lastlog.8.xml:82(term) groupmod.8.xml:93(term)
+#: groupadd.8.xml:106(term) faillog.8.xml:80(term) chsh.1.xml:79(term)
+#: chpasswd.8.xml:114(term) chgpasswd.8.xml:114(term) chage.1.xml:103(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr "<option>-h</option>, <option>--help</option>"
 
-#: vipw.8.xml:70(para) userdel.8.xml:72(para) useradd.8.xml:181(para)
-#: passwd.1.xml:165(para) lastlog.8.xml:56(para) groupmod.8.xml:66(para)
-#: groupadd.8.xml:82(para) faillog.8.xml:50(para) chsh.1.xml:52(para)
-#: chpasswd.8.xml:84(para) chgpasswd.8.xml:84(para) chage.1.xml:76(para)
+#: vipw.8.xml:99(para) userdel.8.xml:101(para) useradd.8.xml:249(para)
+#: passwd.1.xml:193(para) lastlog.8.xml:86(para) groupmod.8.xml:95(para)
+#: groupadd.8.xml:108(para) faillog.8.xml:82(para) chsh.1.xml:81(para)
+#: chpasswd.8.xml:116(para) chgpasswd.8.xml:116(para) chage.1.xml:105(para)
 msgid "Display help message and exit."
 msgstr "Wyświetlenie komunikatu pomocy i zakończenie działania."
 
-#: vipw.8.xml:74(term)
+#: vipw.8.xml:103(term)
 msgid "<option>-p</option>, <option>--passwd</option>"
 msgstr "<option>-p</option>, <option>--passwd</option>"
 
-#: vipw.8.xml:76(para)
+#: vipw.8.xml:105(para)
 msgid "Edit passwd database."
 msgstr "Edycja bazy passwd."
 
-#: vipw.8.xml:80(term) passwd.1.xml:218(term)
+#: vipw.8.xml:109(term) passwd.1.xml:258(term)
 msgid "<option>-q</option>, <option>--quiet</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:82(para) passwd.1.xml:222(para)
+#: vipw.8.xml:111(para) passwd.1.xml:262(para)
 msgid "Quiet mode."
 msgstr "Cichy tryb pracy."
 
-#: vipw.8.xml:86(term)
+#: vipw.8.xml:115(term)
 msgid "<option>-s</option>, <option>--shadow</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: vipw.8.xml:88(para)
+#: vipw.8.xml:117(para)
 msgid "Edit shadow or gshadow database."
 msgstr "Edycja bazy shadow lub gshadow."
 
-#: vipw.8.xml:95(title) usermod.8.xml:265(title) userdel.8.xml:96(title)
-#: useradd.8.xml:471(title) su.1.xml:196(title) sg.1.xml:47(title)
-#: pwconv.8.xml:116(title) pwck.8.xml:153(title) passwd.1.xml:307(title)
-#: newusers.8.xml:174(title) newgrp.1.xml:58(title) login.1.xml:236(title)
-#: grpck.8.xml:125(title) groupmod.8.xml:109(title) groupmems.8.xml:107(title)
-#: groupdel.8.xml:47(title) groupadd.8.xml:149(title) gpasswd.1.xml:186(title)
-#: chsh.1.xml:91(title) chpasswd.8.xml:139(title) chgpasswd.8.xml:133(title)
-#: chfn.1.xml:70(title)
-msgid "CONFIGURATION"
-msgstr ""
-
-#: vipw.8.xml:96(para) usermod.8.xml:266(para) userdel.8.xml:97(para)
-#: useradd.8.xml:472(para) su.1.xml:197(para) sg.1.xml:48(para)
-#: pwck.8.xml:154(para) passwd.1.xml:308(para) newusers.8.xml:175(para)
-#: newgrp.1.xml:59(para) login.1.xml:237(para) grpck.8.xml:126(para)
-#: groupmod.8.xml:110(para) groupmems.8.xml:108(para) groupdel.8.xml:48(para)
-#: groupadd.8.xml:150(para) gpasswd.1.xml:187(para) chsh.1.xml:92(para)
-#: chpasswd.8.xml:140(para) chgpasswd.8.xml:134(para) chfn.1.xml:71(para)
-msgid ""
-"The following configuration variables in <filename>/etc/login.defs</"
-"filename> change the behavior of this tool:"
-msgstr ""
-
-#: vipw.8.xml:2(term) usermod.8.xml:2(term) userdel.8.xml:2(term)
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) newusers.8.xml:2(term)
-#: login.defs.5.xml:2(term) grpck.8.xml:2(term) groupmod.8.xml:2(term)
-#: groupmems.8.xml:2(term) groupdel.8.xml:2(term) groupadd.8.xml:2(term)
-#: gpasswd.1.xml:2(term) chgpasswd.8.xml:2(term)
-msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
-msgstr ""
-
-#: vipw.8.xml:4(para) usermod.8.xml:4(para) userdel.8.xml:4(para)
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) newusers.8.xml:4(para)
-#: login.defs.5.xml:4(para) grpck.8.xml:4(para) groupmod.8.xml:4(para)
-#: groupmems.8.xml:4(para) groupdel.8.xml:4(para) groupadd.8.xml:4(para)
-#: gpasswd.1.xml:4(para) chgpasswd.8.xml:4(para)
-msgid ""
-"Maximum members per group entry. When the maximum is reached, a new group "
-"entry (line) is started in <filename>/etc/group</filename> (with the same "
-"name, same password, and same GID)."
-msgstr ""
-
-#: vipw.8.xml:9(para) usermod.8.xml:9(para) userdel.8.xml:9(para)
-#: useradd.8.xml:9(para) pwconv.8.xml:9(para) newusers.8.xml:9(para)
-#: login.defs.5.xml:9(para) grpck.8.xml:9(para) groupmod.8.xml:9(para)
-#: groupmems.8.xml:9(para) groupdel.8.xml:9(para) groupadd.8.xml:9(para)
-#: gpasswd.1.xml:9(para) chgpasswd.8.xml:9(para)
-msgid ""
-"The default value is 0, meaning that there are no limits in the number of "
-"members in a group."
-msgstr ""
-
-#. Note: on HP, split groups have the same ID, but different
-#.                names.
-#: vipw.8.xml:15(para) usermod.8.xml:15(para) userdel.8.xml:15(para)
-#: useradd.8.xml:15(para) pwconv.8.xml:15(para) newusers.8.xml:15(para)
-#: login.defs.5.xml:15(para) grpck.8.xml:15(para) groupmod.8.xml:15(para)
-#: groupmems.8.xml:15(para) groupdel.8.xml:15(para) groupadd.8.xml:15(para)
-#: gpasswd.1.xml:15(para) chgpasswd.8.xml:15(para)
-msgid ""
-"This feature (split group) permits to limit the length of lines in the group "
-"file. This is useful to make sure that lines for NIS groups are not larger "
-"than 1024 characters."
-msgstr ""
-
-#: vipw.8.xml:20(para) usermod.8.xml:20(para) userdel.8.xml:20(para)
-#: useradd.8.xml:20(para) pwconv.8.xml:20(para) newusers.8.xml:20(para)
-#: login.defs.5.xml:20(para) grpck.8.xml:20(para) groupmod.8.xml:20(para)
-#: groupmems.8.xml:20(para) groupdel.8.xml:20(para) groupadd.8.xml:20(para)
-#: gpasswd.1.xml:20(para) chgpasswd.8.xml:20(para)
-msgid "If you need to enforce such limit, you can use 25."
-msgstr ""
-
-#: vipw.8.xml:23(para) usermod.8.xml:23(para) userdel.8.xml:23(para)
-#: useradd.8.xml:23(para) pwconv.8.xml:23(para) newusers.8.xml:23(para)
-#: login.defs.5.xml:23(para) grpck.8.xml:23(para) groupmod.8.xml:23(para)
-#: groupmems.8.xml:23(para) groupdel.8.xml:23(para) groupadd.8.xml:23(para)
-#: gpasswd.1.xml:23(para) chgpasswd.8.xml:23(para)
-msgid ""
-"Note: split groups may not be supported by all tools (even in the Shadow "
-"toolsuite. You should not use this variable unless you really need it."
-msgstr ""
-
-#: vipw.8.xml:107(title) usermod.8.xml:278(title) userdel.8.xml:111(title)
-#: useradd.8.xml:493(title) suauth.5.xml:139(title) su.1.xml:224(title)
-#: sg.1.xml:59(title) shadow.5.xml:105(title) shadow.3.xml:172(title)
-#: pwconv.8.xml:138(title) pwck.8.xml:167(title) porttime.5.xml:76(title)
-#: passwd.5.xml:87(title) passwd.1.xml:325(title) newusers.8.xml:197(title)
-#: newgrp.1.xml:70(title) logoutd.8.xml:35(title) login.access.5.xml:66(title)
-#: login.1.xml:280(title) limits.5.xml:110(title) lastlog.8.xml:111(title)
-#: gshadow.5.xml:61(title) grpck.8.xml:137(title) groups.1.xml:46(title)
-#: groupmod.8.xml:121(title) groupmems.8.xml:119(title)
-#: groupdel.8.xml:59(title) groupadd.8.xml:163(title) gpasswd.1.xml:201(title)
-#: faillog.8.xml:132(title) faillog.5.xml:38(title) expiry.1.xml:38(title)
-#: chsh.1.xml:104(title) chpasswd.8.xml:153(title) chgpasswd.8.xml:148(title)
-#: chfn.1.xml:84(title) chage.1.xml:177(title)
+#: vipw.8.xml:124(title) usermod.8.xml:322(title) userdel.8.xml:140(title)
+#: useradd.8.xml:619(title) suauth.5.xml:168(title) su.1.xml:253(title)
+#: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
+#: pwconv.8.xml:168(title) pwck.8.xml:196(title) porttime.5.xml:105(title)
+#: passwd.5.xml:116(title) passwd.1.xml:367(title) newusers.8.xml:320(title)
+#: newgrp.1.xml:99(title) logoutd.8.xml:64(title) login.access.5.xml:96(title)
+#: login.1.xml:316(title) limits.5.xml:140(title) lastlog.8.xml:147(title)
+#: gshadow.5.xml:89(title) grpck.8.xml:166(title) groups.1.xml:75(title)
+#: groupmod.8.xml:150(title) groupmems.8.xml:168(title)
+#: groupdel.8.xml:88(title) groupadd.8.xml:189(title) gpasswd.1.xml:230(title)
+#: faillog.8.xml:204(title) faillog.5.xml:67(title) expiry.1.xml:68(title)
+#: chsh.1.xml:133(title) chpasswd.8.xml:185(title) chgpasswd.8.xml:180(title)
+#: chfn.1.xml:113(title) chage.1.xml:206(title)
 msgid "FILES"
 msgstr "PLIKI"
 
-#: vipw.8.xml:110(filename) usermod.8.xml:281(filename)
-#: userdel.8.xml:114(filename) useradd.8.xml:508(filename)
-#: sg.1.xml:74(filename) pwck.8.xml:170(filename) newusers.8.xml:212(filename)
-#: newgrp.1.xml:85(filename) gshadow.5.xml:64(filename)
-#: grpck.8.xml:140(filename) groups.1.xml:49(filename)
-#: groupmod.8.xml:124(filename) groupmems.8.xml:122(filename)
-#: groupdel.8.xml:62(filename) groupadd.8.xml:166(filename)
-#: gpasswd.1.xml:20(filename) gpasswd.1.xml:204(filename)
-#: chgpasswd.8.xml:151(filename)
+#: vipw.8.xml:127(filename) usermod.8.xml:325(filename)
+#: userdel.8.xml:143(filename) useradd.8.xml:634(filename)
+#: sg.1.xml:103(filename) pwck.8.xml:199(filename)
+#: newusers.8.xml:335(filename) newgrp.1.xml:114(filename)
+#: gshadow.5.xml:92(filename) grpck.8.xml:169(filename)
+#: groups.1.xml:78(filename) groupmod.8.xml:153(filename)
+#: groupmems.8.xml:171(filename) groupdel.8.xml:91(filename)
+#: groupadd.8.xml:192(filename) gpasswd.1.xml:49(filename)
+#: gpasswd.1.xml:233(filename) chgpasswd.8.xml:183(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
-#: vipw.8.xml:112(para) usermod.8.xml:283(para) userdel.8.xml:116(para)
-#: useradd.8.xml:510(para) sg.1.xml:76(para) pwck.8.xml:172(para)
-#: newusers.8.xml:214(para) newgrp.1.xml:87(para) gshadow.5.xml:66(para)
-#: grpck.8.xml:142(para) groups.1.xml:51(para) groupmod.8.xml:126(para)
-#: groupmems.8.xml:124(para) groupdel.8.xml:64(para) groupadd.8.xml:168(para)
-#: gpasswd.1.xml:206(para) chgpasswd.8.xml:153(para)
+#: vipw.8.xml:129(para) usermod.8.xml:327(para) userdel.8.xml:145(para)
+#: useradd.8.xml:636(para) sg.1.xml:105(para) pwck.8.xml:201(para)
+#: newusers.8.xml:337(para) newgrp.1.xml:116(para) gshadow.5.xml:94(para)
+#: grpck.8.xml:171(para) groups.1.xml:80(para) groupmod.8.xml:155(para)
+#: groupmems.8.xml:173(para) groupdel.8.xml:93(para) groupadd.8.xml:194(para)
+#: gpasswd.1.xml:235(para) chgpasswd.8.xml:185(para)
 msgid "Group account information."
 msgstr "Informacje o grupach użytkowników."
 
-#: vipw.8.xml:116(filename) useradd.8.xml:514(filename) sg.1.xml:80(filename)
-#: newusers.8.xml:218(filename) newgrp.1.xml:91(filename)
-#: gshadow.5.xml:70(filename) grpck.8.xml:146(filename)
-#: groupmod.8.xml:130(filename) groupmems.8.xml:128(filename)
-#: groupdel.8.xml:68(filename) groupadd.8.xml:172(filename)
-#: gpasswd.1.xml:21(filename) gpasswd.1.xml:210(filename)
-#: chgpasswd.8.xml:157(filename)
+#: vipw.8.xml:133(filename) useradd.8.xml:640(filename) sg.1.xml:109(filename)
+#: newusers.8.xml:341(filename) newgrp.1.xml:120(filename)
+#: gshadow.5.xml:98(filename) grpck.8.xml:175(filename)
+#: groupmod.8.xml:159(filename) groupmems.8.xml:177(filename)
+#: groupdel.8.xml:97(filename) groupadd.8.xml:198(filename)
+#: gpasswd.1.xml:50(filename) gpasswd.1.xml:239(filename)
+#: chgpasswd.8.xml:189(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
-#: vipw.8.xml:118(para) useradd.8.xml:516(para) sg.1.xml:82(para)
-#: newusers.8.xml:220(para) newgrp.1.xml:93(para) gshadow.5.xml:72(para)
-#: grpck.8.xml:148(para) groupmod.8.xml:132(para) groupdel.8.xml:70(para)
-#: groupadd.8.xml:174(para) gpasswd.1.xml:212(para) chgpasswd.8.xml:159(para)
+#: vipw.8.xml:135(para) useradd.8.xml:642(para) sg.1.xml:111(para)
+#: newusers.8.xml:343(para) newgrp.1.xml:122(para) gshadow.5.xml:100(para)
+#: grpck.8.xml:177(para) groupmod.8.xml:161(para) groupdel.8.xml:99(para)
+#: groupadd.8.xml:200(para) gpasswd.1.xml:241(para) chgpasswd.8.xml:191(para)
 msgid "Secure group account information."
 msgstr "Informacje chronione o grupach użytkowników."
 
-#: vipw.8.xml:122(filename) usermod.8.xml:287(filename)
-#: userdel.8.xml:126(filename) useradd.8.xml:496(filename)
-#: su.1.xml:227(filename) sg.1.xml:62(filename) shadow.5.xml:108(filename)
-#: pwck.8.xml:176(filename) passwd.5.xml:90(filename)
-#: passwd.1.xml:328(filename) newusers.8.xml:200(filename)
-#: newgrp.1.xml:73(filename) login.1.xml:295(filename)
-#: grpck.8.xml:152(filename) expiry.1.xml:41(filename)
-#: chsh.1.xml:107(filename) chpasswd.8.xml:156(filename)
-#: chfn.1.xml:93(filename) chage.1.xml:181(filename)
+#: vipw.8.xml:139(filename) usermod.8.xml:331(filename)
+#: userdel.8.xml:155(filename) useradd.8.xml:622(filename)
+#: su.1.xml:256(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
+#: pwck.8.xml:205(filename) passwd.5.xml:119(filename)
+#: passwd.1.xml:370(filename) newusers.8.xml:323(filename)
+#: newgrp.1.xml:102(filename) login.1.xml:331(filename)
+#: grpck.8.xml:181(filename) expiry.1.xml:71(filename)
+#: chsh.1.xml:136(filename) chpasswd.8.xml:188(filename)
+#: chfn.1.xml:122(filename) chage.1.xml:210(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
-#: vipw.8.xml:124(para) usermod.8.xml:289(para) userdel.8.xml:128(para)
-#: useradd.8.xml:498(para) su.1.xml:229(para) sg.1.xml:64(para)
-#: shadow.5.xml:110(para) pwck.8.xml:178(para) passwd.5.xml:92(para)
-#: passwd.1.xml:330(para) newusers.8.xml:202(para) newgrp.1.xml:75(para)
-#: login.1.xml:297(para) grpck.8.xml:154(para) expiry.1.xml:43(para)
-#: chsh.1.xml:109(para) chpasswd.8.xml:158(para) chfn.1.xml:95(para)
-#: chage.1.xml:184(para)
+#: vipw.8.xml:141(para) usermod.8.xml:333(para) userdel.8.xml:157(para)
+#: useradd.8.xml:624(para) su.1.xml:258(para) sg.1.xml:93(para)
+#: shadow.5.xml:235(para) pwck.8.xml:207(para) passwd.5.xml:121(para)
+#: passwd.1.xml:372(para) newusers.8.xml:325(para) newgrp.1.xml:104(para)
+#: login.1.xml:333(para) grpck.8.xml:183(para) expiry.1.xml:73(para)
+#: chsh.1.xml:138(para) chpasswd.8.xml:190(para) chfn.1.xml:124(para)
+#: chage.1.xml:213(para)
 msgid "User account information."
 msgstr "Informacja o kontach użytkowników."
 
-#: vipw.8.xml:128(filename) usermod.8.xml:293(filename)
-#: userdel.8.xml:132(filename) useradd.8.xml:502(filename)
-#: su.1.xml:233(filename) sg.1.xml:68(filename) shadow.5.xml:114(filename)
-#: shadow.3.xml:175(filename) pwck.8.xml:182(filename)
-#: passwd.5.xml:96(filename) passwd.1.xml:334(filename)
-#: newusers.8.xml:206(filename) newgrp.1.xml:79(filename)
-#: login.1.xml:301(filename) expiry.1.xml:47(filename)
-#: chpasswd.8.xml:162(filename) chage.1.xml:189(filename)
+#: vipw.8.xml:145(filename) usermod.8.xml:337(filename)
+#: userdel.8.xml:161(filename) useradd.8.xml:628(filename)
+#: su.1.xml:262(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
+#: shadow.3.xml:204(filename) pwck.8.xml:211(filename)
+#: passwd.5.xml:125(filename) passwd.1.xml:376(filename)
+#: newusers.8.xml:329(filename) newgrp.1.xml:108(filename)
+#: login.1.xml:337(filename) expiry.1.xml:77(filename)
+#: chpasswd.8.xml:194(filename) chage.1.xml:218(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
-#: vipw.8.xml:130(para) usermod.8.xml:295(para) userdel.8.xml:134(para)
-#: useradd.8.xml:504(para) su.1.xml:235(para) sg.1.xml:70(para)
-#: shadow.5.xml:116(para) shadow.3.xml:177(para) pwck.8.xml:184(para)
-#: passwd.1.xml:336(para) newusers.8.xml:208(para) newgrp.1.xml:81(para)
-#: login.1.xml:303(para) expiry.1.xml:49(para) chpasswd.8.xml:164(para)
-#: chage.1.xml:192(para)
+#: vipw.8.xml:147(para) usermod.8.xml:339(para) userdel.8.xml:163(para)
+#: useradd.8.xml:630(para) su.1.xml:264(para) sg.1.xml:99(para)
+#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:213(para)
+#: passwd.1.xml:378(para) newusers.8.xml:331(para) newgrp.1.xml:110(para)
+#: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:196(para)
+#: chage.1.xml:221(para)
 msgid "Secure user account information."
 msgstr "Informacje chronione o użytkownikach."
 
-#: vipw.8.xml:137(title) usermod.8.xml:302(title) userdel.8.xml:213(title)
-#: useradd.8.xml:610(title) suauth.5.xml:168(title) su.1.xml:242(title)
-#: sg.1.xml:89(title) shadow.5.xml:123(title) shadow.3.xml:184(title)
-#: pwconv.8.xml:150(title) pwck.8.xml:191(title) porttime.5.xml:88(title)
-#: passwd.5.xml:105(title) passwd.1.xml:394(title) nologin.8.xml:35(title)
-#: newusers.8.xml:233(title) newgrp.1.xml:100(title)
-#: login.defs.5.xml:445(title) login.access.5.xml:78(title)
-#: login.1.xml:334(title) limits.5.xml:120(title) gshadow.5.xml:79(title)
-#: grpck.8.xml:161(title) groups.1.xml:58(title) groupmod.8.xml:190(title)
-#: groupmems.8.xml:137(title) groupdel.8.xml:116(title)
-#: groupadd.8.xml:253(title) gpasswd.1.xml:219(title) faillog.8.xml:144(title)
-#: faillog.5.xml:50(title) expiry.1.xml:56(title) chsh.1.xml:128(title)
-#: chpasswd.8.xml:177(title) chgpasswd.8.xml:172(title) chfn.1.xml:102(title)
-#: chage.1.xml:232(title)
+#: vipw.8.xml:154(title) usermod.8.xml:346(title) userdel.8.xml:242(title)
+#: useradd.8.xml:736(title) suauth.5.xml:197(title) su.1.xml:271(title)
+#: sg.1.xml:118(title) shadow.5.xml:248(title) shadow.3.xml:213(title)
+#: pwconv.8.xml:180(title) pwck.8.xml:220(title) porttime.5.xml:117(title)
+#: passwd.5.xml:134(title) passwd.1.xml:436(title) nologin.8.xml:64(title)
+#: newusers.8.xml:356(title) newgrp.1.xml:129(title)
+#: login.defs.5.xml:471(title) login.access.5.xml:108(title)
+#: login.1.xml:370(title) limits.5.xml:150(title) gshadow.5.xml:107(title)
+#: grpck.8.xml:190(title) groups.1.xml:87(title) groupmod.8.xml:219(title)
+#: groupmems.8.xml:186(title) groupdel.8.xml:145(title)
+#: groupadd.8.xml:279(title) gpasswd.1.xml:248(title) faillog.8.xml:216(title)
+#: faillog.5.xml:79(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
+#: chpasswd.8.xml:209(title) chgpasswd.8.xml:204(title) chfn.1.xml:131(title)
+#: chage.1.xml:261(title)
 msgid "SEE ALSO"
 msgstr "ZOBACZ TAKŻE"
 
-#: vipw.8.xml:138(para)
+#: vipw.8.xml:155(para)
 msgid ""
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>group</"
@@ -384,23 +300,22 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: usermod.8.xml:10(refentrytitle) usermod.8.xml:15(refname)
-#: usermod.8.xml:21(command) login.defs.5.xml:411(term)
+#: usermod.8.xml:39(refentrytitle) usermod.8.xml:44(refname)
+#: usermod.8.xml:50(command) login.defs.5.xml:443(term)
 msgid "usermod"
 msgstr "usermod"
 
-#: usermod.8.xml:16(refpurpose)
+#: usermod.8.xml:45(refpurpose)
 msgid "modify a user account"
 msgstr "zmiana danych konta użytkownika"
 
-#: usermod.8.xml:25(replaceable) userdel.8.xml:25(replaceable)
-#: useradd.8.xml:33(replaceable) su.1.xml:41(replaceable)
-#: passwd.1.xml:31(replaceable) chsh.1.xml:27(replaceable)
-#: chage.1.xml:20(replaceable)
+#: usermod.8.xml:54(replaceable) userdel.8.xml:54(replaceable)
+#: useradd.8.xml:63(replaceable) passwd.1.xml:60(replaceable)
+#: chsh.1.xml:56(replaceable) chage.1.xml:49(replaceable)
 msgid "LOGIN"
 msgstr "LOGIN"
 
-#: usermod.8.xml:31(para)
+#: usermod.8.xml:60(para)
 msgid ""
 "The <command>usermod</command> command modifies the system account files to "
 "reflect the changes that are specified on the command line."
@@ -408,15 +323,15 @@
 "Polecenie <command>usermod</command> zmienia systemowe pliki kont, "
 "odzwierciedlając zmiany podane w wierszu poleceń."
 
-#: usermod.8.xml:39(para)
+#: usermod.8.xml:68(para)
 msgid "The options which apply to the <command>usermod</command> command are:"
 msgstr "Polecenie <command>usermod</command> posiada następujące opcje:"
 
-#: usermod.8.xml:45(term)
+#: usermod.8.xml:74(term)
 msgid "<option>-a</option>, <option>--append</option>"
 msgstr "<option>-a</option>, <option>--all</option>"
 
-#: usermod.8.xml:49(para)
+#: usermod.8.xml:78(para)
 msgid ""
 "Add the user to the supplemental group(s). Use only with <option>-G</option> "
 "option."
@@ -424,7 +339,7 @@
 "Dodaj użytkownika do dodatkowej grupy lub grup. Może być użyte tylko z opcją "
 "<option>-G</option>."
 
-#: usermod.8.xml:56(term) useradd.8.xml:83(term)
+#: usermod.8.xml:85(term) useradd.8.xml:125(term)
 msgid ""
 "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
 "replaceable>"
@@ -432,7 +347,7 @@
 "<option>-c</option>, <option>--comment</option><replaceable>KOMENTARZ</"
 "replaceable>"
 
-#: usermod.8.xml:61(para)
+#: usermod.8.xml:90(para)
 msgid ""
 "The new value of the user's password file comment field. It is normally "
 "modified using the <citerefentry><refentrytitle>chfn</"
@@ -442,7 +357,7 @@
 "jest zmieniana przy pomocy polecenia <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: usermod.8.xml:70(term) useradd.8.xml:96(term)
+#: usermod.8.xml:99(term) useradd.8.xml:138(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
@@ -450,17 +365,26 @@
 "<option>-d</option>, <option>--home</option><replaceable>KAT_DOMOWY</"
 "replaceable>"
 
-#: usermod.8.xml:75(para)
+#: usermod.8.xml:104(para)
+msgid "The user's new login directory."
+msgstr ""
+
+#: usermod.8.xml:107(para)
+#, fuzzy
+#| msgid ""
+#| "The user's new login directory. If the <option>-m</option> option is "
+#| "given the contents of the current home directory will be moved to the new "
+#| "home directory, which is created if it does not already exist."
 msgid ""
-"The user's new login directory. If the <option>-m</option> option is given "
-"the contents of the current home directory will be moved to the new home "
-"directory, which is created if it does not already exist."
+"If the <option>-m</option> option is given the contents of the current home "
+"directory will be moved to the new home directory, which is created if it "
+"does not already exist."
 msgstr ""
 "Nowy katalog domowy użytkownika. Jeżeli podano opcję <option>-m</option>, to "
 "zawartość aktualnego katalogu domowego zostanie przesunięta do nowego "
 "katalogu. Nowy katalog domowy jest tworzony jeśli nie istnieje."
 
-#: usermod.8.xml:84(term) useradd.8.xml:123(term) useradd.8.xml:394(term)
+#: usermod.8.xml:116(term) useradd.8.xml:165(term) useradd.8.xml:494(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -468,7 +392,7 @@
 "<option>-e</option>, <option>--expiredate</option><replaceable>DATA_WAŻN</"
 "replaceable>"
 
-#: usermod.8.xml:89(para) useradd.8.xml:128(para)
+#: usermod.8.xml:121(para) useradd.8.xml:170(para)
 msgid ""
 "The date on which the user account will be disabled. The date is specified "
 "in the format <emphasis remap=\"I\">YYYY-MM-DD</emphasis>."
@@ -476,7 +400,7 @@
 "Data, od której konto danego użytkownika zostanie wyłączone. Data podawana "
 "jest w formacie <emphasis remap=\"I\">MM/DD/RR</emphasis>."
 
-#: usermod.8.xml:96(term) useradd.8.xml:135(term) useradd.8.xml:403(term)
+#: usermod.8.xml:128(term) useradd.8.xml:183(term) useradd.8.xml:507(term)
 msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -484,23 +408,34 @@
 "<option>-f</option>, <option>--inactive</option><replaceable>NIEAKTYWNE</"
 "replaceable>"
 
-#: usermod.8.xml:101(para) useradd.8.xml:140(para)
+#: usermod.8.xml:133(para)
 msgid ""
 "The number of days after a password expires until the account is permanently "
-"disabled. A value of 0 disables the account as soon as the password has "
-"expired, and a value of -1 disables the feature. The default value is -1."
+"disabled."
 msgstr ""
+
+#: usermod.8.xml:137(para)
+#, fuzzy
+#| msgid ""
+#| "The number of days after a password expires until the account is "
+#| "permanently disabled. A value of 0 disables the account as soon as the "
+#| "password has expired, and a value of -1 disables the feature. The default "
+#| "value is -1."
+msgid ""
+"A value of 0 disables the account as soon as the password has expired, and a "
+"value of -1 disables the feature. The default value is -1."
+msgstr ""
 "Liczba dni po wygaśnięciu hasła do stałego wyłączenia konta. Wartość 0 "
 "wyłącza konto natychmiast po przeterminowaniu hasła, zaś wartość -1 wyłącza "
 "tę cechę. Domyślną wartością jest -1."
 
-#: usermod.8.xml:110(term) useradd.8.xml:149(term) useradd.8.xml:415(term)
+#: usermod.8.xml:145(term) useradd.8.xml:203(term) useradd.8.xml:523(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GRUPA</replaceable>"
 
-#: usermod.8.xml:115(para)
+#: usermod.8.xml:150(para)
 msgid ""
 "The group name or number of the user's new initial login group. The group "
 "name must exist. A group number must refer to an already existing group. The "
@@ -510,7 +445,7 @@
 "istnieć. Numer grupy musi odnosić się do już istniejącej grupy. Domyślnym "
 "numerem grupy jest 1."
 
-#: usermod.8.xml:123(term) useradd.8.xml:163(term)
+#: usermod.8.xml:158(term) useradd.8.xml:231(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -520,16 +455,13 @@
 "replaceable>[<emphasis remap=\"I\">,GRUPA2,...</emphasis>[<emphasis remap=\"I"
 "\">,GRUPAN</emphasis>]]]"
 
-#: usermod.8.xml:128(para)
+#: usermod.8.xml:163(para)
 #, fuzzy
 msgid ""
 "A list of supplementary groups which the user is also a member of. Each "
 "group is separated from the next by a comma, with no intervening whitespace. "
 "The groups are subject to the same restrictions as the group given with the "
-"<option>-g</option> option. If the user is currently a member of a group "
-"which is not listed, the user will be removed from the group. This behaviour "
-"can be changed via the <option>-a</option> option, which appends the user to "
-"the current supplementary group list."
+"<option>-g</option> option."
 msgstr ""
 "Lista dodatkowych grup, do których również należy użytkownik. Każda grupa "
 "oddzielona jest od następnej przecinkiem, bez wtrąconej spacji. Do grup "
@@ -537,21 +469,35 @@
 "opcji <option>-g</option>.   Jeżeli użytkownik jest obecnie członkiem grupy, "
 "której nie podano na liście, to zostanie z niej usunięty."
 
-#: usermod.8.xml:141(term)
+#: usermod.8.xml:170(para)
+#, fuzzy
 msgid ""
+"If the user is currently a member of a group which is not listed, the user "
+"will be removed from the group. This behaviour can be changed via the "
+"<option>-a</option> option, which appends the user to the current "
+"supplementary group list."
+msgstr ""
+"Lista dodatkowych grup, do których również należy użytkownik. Każda grupa "
+"oddzielona jest od następnej przecinkiem, bez wtrąconej spacji. Do grup "
+"odnoszą się te same ograniczenia, które obowiązują przy grupie podanej w "
+"opcji <option>-g</option>.   Jeżeli użytkownik jest obecnie członkiem grupy, "
+"której nie podano na liście, to zostanie z niej usunięty."
+
+#: usermod.8.xml:179(term)
+msgid ""
 "<option>-l</option>, <option>--login</option><replaceable>NEW_LOGIN</"
 "replaceable>"
 msgstr ""
 "<option>-l</option>, <option>--login</option><replaceable>NOWY_LOGIN</"
 "replaceable>"
 
-#: usermod.8.xml:146(para)
+#: usermod.8.xml:184(para)
 #, fuzzy
 msgid ""
-"The name of the user will be changed from <emphasis remap=\"I\">LOGIN</"
-"emphasis> to <emphasis remap=\"I\">NEW_LOGIN</emphasis>. Nothing else is "
-"changed. In particular, the user's home directory name should probably be "
-"changed manually to reflect the new login name."
+"The name of the user will be changed from <replaceable>LOGIN</replaceable> "
+"to <replaceable>NEW_LOGIN</replaceable>. Nothing else is changed. In "
+"particular, the user's home directory name should probably be changed "
+"manually to reflect the new login name."
 msgstr ""
 "Nazwa użytkownika zostanie zmieniona z <emphasis remap=\"I\">LOGIN</"
 "emphasis> na <emphasis remap=\"I\">NOWY_LOGIN</emphasis>. Nic więcej nie "
@@ -559,11 +505,11 @@
 "nazwa katalogu domowego użytkownika, tak by odzwierciedlała nową nazwę "
 "użytkownika."
 
-#: usermod.8.xml:156(term)
+#: usermod.8.xml:194(term)
 msgid "<option>-L</option>, <option>--lock</option>"
 msgstr "<option>-L</option>, <option>--lock</option>"
 
-#: usermod.8.xml:160(para)
+#: usermod.8.xml:198(para)
 msgid ""
 "Lock a user's password. This puts a '!' in front of the encrypted password, "
 "effectively disabling the password. You can't use this option with <option>-"
@@ -573,26 +519,26 @@
 "zakodowanego hasła. Opcji tej nie można używać z opcjami <option>-p</option> "
 "or <option>-U</option>."
 
-#: usermod.8.xml:166(para)
+#: usermod.8.xml:204(para)
 msgid ""
 "Note: if you wish to lock the account (not only access with a password), you "
 "should also set the <replaceable>EXPIRE_DATE</replaceable> to "
 "<replaceable>1</replaceable>."
 msgstr ""
 
-#: usermod.8.xml:175(term) useradd.8.xml:282(term) groupmod.8.xml:82(term)
-#: groupadd.8.xml:107(term)
+#: usermod.8.xml:213(term) useradd.8.xml:364(term) groupmod.8.xml:111(term)
+#: groupadd.8.xml:133(term)
 msgid "<option>-o</option>, <option>--non-unique</option>"
 msgstr "<option>-o</option>, <option>--non-unique</option>"
 
-#: usermod.8.xml:179(para)
+#: usermod.8.xml:217(para)
 msgid ""
 "When used with the <option>-u</option> option, this option allows to change "
 "the user ID to a non-unique value."
 msgstr ""
 
-#: usermod.8.xml:186(term) useradd.8.xml:290(term) groupmod.8.xml:93(term)
-#: groupadd.8.xml:117(term)
+#: usermod.8.xml:224(term) useradd.8.xml:376(term) groupmod.8.xml:122(term)
+#: groupadd.8.xml:143(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
@@ -600,20 +546,20 @@
 "<option>-p</option>, <option>--password</option><replaceable>HASŁO</"
 "replaceable>"
 
-#: usermod.8.xml:191(para)
+#: usermod.8.xml:229(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
 msgstr ""
 
-#: usermod.8.xml:199(term) useradd.8.xml:322(term) useradd.8.xml:428(term)
-#: su.1.xml:128(term) chsh.1.xml:56(term)
+#: usermod.8.xml:237(term) useradd.8.xml:416(term) useradd.8.xml:544(term)
+#: su.1.xml:157(term) chsh.1.xml:85(term)
 msgid ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 
-#: usermod.8.xml:204(para) chsh.1.xml:60(para)
+#: usermod.8.xml:242(para) chsh.1.xml:89(para)
 msgid ""
 "The name of the user's new login shell. Setting this field to blank causes "
 "the system to select the default login shell."
@@ -621,27 +567,36 @@
 "Nazwa nowej powłoki (shell) użytkownika. Ustawienie tego pola na puste "
 "powoduje, że system wybierze domyślną powłokę logowania."
 
-#: usermod.8.xml:211(term) useradd.8.xml:335(term)
+#: usermod.8.xml:249(term) useradd.8.xml:431(term)
 msgid ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: usermod.8.xml:216(para)
+#: usermod.8.xml:254(para)
+msgid "The new numerical value of the user's ID."
+msgstr ""
+
+#: usermod.8.xml:257(para)
 msgid ""
-"The numerical value of the user's ID. This value must be unique, unless the "
-"<option>-o</option> option is used. The value must be non-negative. Values "
-"between 0 and 999 are typically reserved for system accounts. Any files "
-"which the user owns and which are located in the directory tree rooted at "
-"the user's home directory will have the file user ID changed automatically. "
-"Files outside of the user's home directory must be altered manually."
+"This value must be unique, unless the <option>-o</option> option is used. "
+"The value must be non-negative. Values between 0 and 999 are typically "
+"reserved for system accounts."
 msgstr ""
 
-#: usermod.8.xml:229(term)
+#: usermod.8.xml:263(para)
+msgid ""
+"Any files which the user owns and which are located in the directory tree "
+"rooted at the user's home directory will have the file user ID changed "
+"automatically. Files outside of the user's home directory must be altered "
+"manually."
+msgstr ""
+
+#: usermod.8.xml:273(term)
 msgid "<option>-U</option>, <option>--unlock</option>"
 msgstr "<option>-U</option>, <option>--unlock</option>"
 
-#: usermod.8.xml:233(para)
+#: usermod.8.xml:277(para)
 msgid ""
 "Unlock a user's password. This removes the '!' in front of the encrypted "
 "password. You can't use this option with <option>-p</option> or <option>-L</"
@@ -651,7 +606,7 @@
 "zakodowanego hasła. Opcji tej nie można używać z opcjami <option>-p</option> "
 "lub <option>-L</option>."
 
-#: usermod.8.xml:238(para)
+#: usermod.8.xml:282(para)
 msgid ""
 "Note: if you wish to unlock the account (not only access with a password), "
 "you should also set the <replaceable>EXPIRE_DATE</replaceable> (for example "
@@ -659,18 +614,27 @@
 "replaceable> value from <filename>/etc/default/useradd</filename>)."
 msgstr ""
 
-#: usermod.8.xml:252(title) userdel.8.xml:192(title) useradd.8.xml:451(title)
-#: su.1.xml:188(title) shadow.3.xml:164(title) passwd.1.xml:296(title)
-#: newusers.8.xml:160(title) login.1.xml:202(title) lastlog.8.xml:123(title)
-#: groupdel.8.xml:40(title) groupadd.8.xml:187(title) gpasswd.1.xml:174(title)
-#: faillog.8.xml:121(title) chpasswd.8.xml:125(title)
-#: chgpasswd.8.xml:125(title)
+#: usermod.8.xml:296(title) userdel.8.xml:221(title) useradd.8.xml:573(title)
+#: su.1.xml:217(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
+#: newusers.8.xml:283(title) login.1.xml:238(title) lastlog.8.xml:159(title)
+#: groupdel.8.xml:69(title) groupadd.8.xml:213(title) gpasswd.1.xml:203(title)
+#: faillog.8.xml:193(title) chpasswd.8.xml:157(title)
+#: chgpasswd.8.xml:157(title)
 msgid "CAVEATS"
 msgstr "OSTRZEŻENIA"
 
-#: usermod.8.xml:253(para)
+#: usermod.8.xml:297(para)
+#, fuzzy
+#| msgid ""
+#| "<command>usermod</command> will not allow you to change the name of a "
+#| "user who is logged in. You must make certain that the named user is not "
+#| "executing any processes when this command is being executed if the user's "
+#| "numerical user ID is being changed. You must change the owner of any "
+#| "<command>crontab</command> files manually. You must change the owner of "
+#| "any <command>at</command> jobs manually. You must make any changes "
+#| "involving NIS on the NIS server."
 msgid ""
-"<command>usermod</command> will not allow you to change the name of a user "
+"<command>usermod</command> will not allow you to change the name of an user "
 "who is logged in. You must make certain that the named user is not executing "
 "any processes when this command is being executed if the user's numerical "
 "user ID is being changed. You must change the owner of any <command>crontab</"
@@ -686,52 +650,135 @@
 "<command>at</command> musisz zmienić ręcznie. Jakiekolwiek zmiany dotyczące "
 "NIS musisz wykonać na serwerze NIS."
 
-#: usermod.8.xml:2(term) userdel.8.xml:2(term) useradd.8.xml:2(term)
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: usermod.8.xml:309(title) userdel.8.xml:125(title) useradd.8.xml:596(title)
+#: su.1.xml:225(title) sg.1.xml:76(title) pwconv.8.xml:146(title)
+#: pwck.8.xml:182(title) passwd.1.xml:349(title) newusers.8.xml:297(title)
+#: newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:154(title)
+#: groupmod.8.xml:138(title) groupmems.8.xml:156(title)
+#: groupdel.8.xml:76(title) groupadd.8.xml:175(title) gpasswd.1.xml:215(title)
+#: chsh.1.xml:120(title) chpasswd.8.xml:171(title) chgpasswd.8.xml:165(title)
+#: chfn.1.xml:99(title)
+msgid "CONFIGURATION"
+msgstr ""
+
+#: usermod.8.xml:310(para) userdel.8.xml:126(para) useradd.8.xml:597(para)
+#: su.1.xml:226(para) sg.1.xml:77(para) pwck.8.xml:183(para)
+#: passwd.1.xml:350(para) newusers.8.xml:298(para) newgrp.1.xml:88(para)
+#: login.1.xml:273(para) grpck.8.xml:155(para) groupmod.8.xml:139(para)
+#: groupmems.8.xml:157(para) groupdel.8.xml:77(para) groupadd.8.xml:176(para)
+#: gpasswd.1.xml:216(para) chsh.1.xml:121(para) chpasswd.8.xml:172(para)
+#: chgpasswd.8.xml:166(para) chfn.1.xml:100(para)
+msgid ""
+"The following configuration variables in <filename>/etc/login.defs</"
+"filename> change the behavior of this tool:"
+msgstr ""
+
+#: usermod.8.xml:32(term) userdel.8.xml:32(term) useradd.8.xml:32(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>MAIL_DIR</option> (string)"
 msgstr "MAIL_DIR (łańcuch)"
 
-#: usermod.8.xml:4(para) userdel.8.xml:4(para) useradd.8.xml:4(para)
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: usermod.8.xml:34(para) userdel.8.xml:34(para) useradd.8.xml:34(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "The mail spool directory. This is needed to manipulate the mailbox when its "
 "corresponding user account is modified or deleted. If not specified, a "
 "compile-time default is used."
 msgstr ""
 
-#: usermod.8.xml:11(term) userdel.8.xml:11(term) useradd.8.xml:11(term)
-#: su.1.xml:11(term) login.defs.5.xml:11(term) login.1.xml:11(term)
+#: usermod.8.xml:41(term) userdel.8.xml:41(term) useradd.8.xml:41(term)
+#: su.1.xml:41(term) login.defs.5.xml:41(term) login.1.xml:41(term)
 #, fuzzy
 msgid "<option>MAIL_FILE</option> (string)"
 msgstr "MAIL_DIR (łańcuch)"
 
-#: usermod.8.xml:13(para) userdel.8.xml:13(para) useradd.8.xml:13(para)
-#: su.1.xml:13(para) login.defs.5.xml:13(para) login.1.xml:13(para)
+#: usermod.8.xml:43(para) userdel.8.xml:43(para) useradd.8.xml:43(para)
+#: su.1.xml:43(para) login.defs.5.xml:43(para) login.1.xml:43(para)
 msgid ""
 "Defines the location of the users mail spool files relatively to their home "
 "directory."
 msgstr ""
 
 #. FIXME: MAIL_FILE not used in useradd
-#: usermod.8.xml:20(para) userdel.8.xml:20(para) useradd.8.xml:20(para)
-#: su.1.xml:20(para) login.defs.5.xml:20(para) login.1.xml:20(para)
+#: usermod.8.xml:50(para) userdel.8.xml:50(para) useradd.8.xml:50(para)
+#: su.1.xml:50(para) login.defs.5.xml:50(para) login.1.xml:50(para)
 msgid ""
 "The <option>MAIL_DIR</option> and <option>MAIL_FILE</option> variables are "
 "used by <command>useradd</command>, <command>usermod</command>, and "
 "<command>userdel</command> to create, move, or delete the user's mail spool."
 msgstr ""
 
-#: usermod.8.xml:26(para) userdel.8.xml:26(para) useradd.8.xml:26(para)
-#: su.1.xml:26(para) login.defs.5.xml:26(para) login.1.xml:26(para)
+#: usermod.8.xml:56(para) userdel.8.xml:56(para) useradd.8.xml:56(para)
+#: su.1.xml:56(para) login.defs.5.xml:56(para) login.1.xml:56(para)
 msgid ""
 "If <option>MAIL_CHECK_ENAB</option> is set to <replaceable>yes</"
 "replaceable>, they are also used to define the <envar>MAIL</envar> "
 "environment variable."
 msgstr ""
 
-#: usermod.8.xml:303(para)
+#: usermod.8.xml:30(term) userdel.8.xml:30(term) useradd.8.xml:30(term)
+#: pwconv.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: grpck.8.xml:30(term) groupmod.8.xml:30(term) groupmems.8.xml:30(term)
+#: groupdel.8.xml:30(term) groupadd.8.xml:30(term) gpasswd.1.xml:30(term)
+#: chgpasswd.8.xml:30(term)
+msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
+msgstr ""
+
+#: usermod.8.xml:32(para) userdel.8.xml:32(para) useradd.8.xml:32(para)
+#: pwconv.8.xml:32(para) newusers.8.xml:32(para) login.defs.5.xml:32(para)
+#: grpck.8.xml:32(para) groupmod.8.xml:32(para) groupmems.8.xml:32(para)
+#: groupdel.8.xml:32(para) groupadd.8.xml:32(para) gpasswd.1.xml:32(para)
+#: chgpasswd.8.xml:32(para)
 msgid ""
+"Maximum members per group entry. When the maximum is reached, a new group "
+"entry (line) is started in <filename>/etc/group</filename> (with the same "
+"name, same password, and same GID)."
+msgstr ""
+
+#: usermod.8.xml:37(para) userdel.8.xml:37(para) useradd.8.xml:37(para)
+#: pwconv.8.xml:37(para) newusers.8.xml:37(para) login.defs.5.xml:37(para)
+#: grpck.8.xml:37(para) groupmod.8.xml:37(para) groupmems.8.xml:37(para)
+#: groupdel.8.xml:37(para) groupadd.8.xml:37(para) gpasswd.1.xml:37(para)
+#: chgpasswd.8.xml:37(para)
+msgid ""
+"The default value is 0, meaning that there are no limits in the number of "
+"members in a group."
+msgstr ""
+
+#. Note: on HP, split groups have the same ID, but different
+#.                names.
+#: usermod.8.xml:43(para) userdel.8.xml:43(para) useradd.8.xml:43(para)
+#: pwconv.8.xml:43(para) newusers.8.xml:43(para) login.defs.5.xml:43(para)
+#: grpck.8.xml:43(para) groupmod.8.xml:43(para) groupmems.8.xml:43(para)
+#: groupdel.8.xml:43(para) groupadd.8.xml:43(para) gpasswd.1.xml:43(para)
+#: chgpasswd.8.xml:43(para)
+msgid ""
+"This feature (split group) permits to limit the length of lines in the group "
+"file. This is useful to make sure that lines for NIS groups are not larger "
+"than 1024 characters."
+msgstr ""
+
+#: usermod.8.xml:48(para) userdel.8.xml:48(para) useradd.8.xml:48(para)
+#: pwconv.8.xml:48(para) newusers.8.xml:48(para) login.defs.5.xml:48(para)
+#: grpck.8.xml:48(para) groupmod.8.xml:48(para) groupmems.8.xml:48(para)
+#: groupdel.8.xml:48(para) groupadd.8.xml:48(para) gpasswd.1.xml:48(para)
+#: chgpasswd.8.xml:48(para)
+msgid "If you need to enforce such limit, you can use 25."
+msgstr ""
+
+#: usermod.8.xml:51(para) userdel.8.xml:51(para) useradd.8.xml:51(para)
+#: pwconv.8.xml:51(para) newusers.8.xml:51(para) login.defs.5.xml:51(para)
+#: grpck.8.xml:51(para) groupmod.8.xml:51(para) groupmems.8.xml:51(para)
+#: groupdel.8.xml:51(para) groupadd.8.xml:51(para) gpasswd.1.xml:51(para)
+#: chgpasswd.8.xml:51(para)
+msgid ""
+"Note: split groups may not be supported by all tools (even in the Shadow "
+"toolsuite. You should not use this variable unless you really need it."
+msgstr ""
+
+#: usermod.8.xml:347(para)
+msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
@@ -768,16 +815,16 @@
 "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: userdel.8.xml:12(refentrytitle) userdel.8.xml:17(refname)
-#: userdel.8.xml:22(command) login.defs.5.xml:402(term)
+#: userdel.8.xml:41(refentrytitle) userdel.8.xml:46(refname)
+#: userdel.8.xml:51(command) login.defs.5.xml:434(term)
 msgid "userdel"
 msgstr "userdel"
 
-#: userdel.8.xml:18(refpurpose)
+#: userdel.8.xml:47(refpurpose)
 msgid "delete a user account and related files"
 msgstr "plik chroniony informacji o użytkownikach"
 
-#: userdel.8.xml:32(para)
+#: userdel.8.xml:61(para)
 #, fuzzy
 msgid ""
 "The <command>userdel</command> command modifies the system account files, "
@@ -787,15 +834,15 @@
 "Polecenie <command>usermod</command> zmienia systemowe pliki kont, "
 "odzwierciedlając zmiany podane w wierszu poleceń."
 
-#: userdel.8.xml:41(para)
+#: userdel.8.xml:70(para)
 msgid "The options which apply to the <command>userdel</command> command are:"
 msgstr "Polecenie <command>userdel</command> posiada następujące opcje:"
 
-#: userdel.8.xml:46(term) groupadd.8.xml:52(term)
+#: userdel.8.xml:75(term) groupadd.8.xml:78(term)
 msgid "<option>-f</option>, <option>--force</option>"
 msgstr "<option>-f</option>, <option>--force</option>"
 
-#: userdel.8.xml:50(para)
+#: userdel.8.xml:79(para)
 msgid ""
 "This option forces the removal of the user account, even if the user is "
 "still logged in. It also forces <command>userdel</command> to remove the "
@@ -807,157 +854,162 @@
 "removed, even if it is still the primary group of another user."
 msgstr ""
 
-#: userdel.8.xml:63(para)
+#: userdel.8.xml:92(para)
 msgid ""
 "<emphasis>Note:</emphasis> This option is dangerous and may leave your "
 "system in an inconsistent state."
 msgstr ""
 
-#: userdel.8.xml:76(term)
+#: userdel.8.xml:105(term)
 msgid "<option>-r</option>, <option>--remove</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
-#: userdel.8.xml:80(para)
+#: userdel.8.xml:109(para)
 msgid ""
 "Files in the user's home directory will be removed along with the home "
 "directory itself and the user's mail spool. Files located in other file "
 "systems will have to be searched for and deleted manually."
 msgstr ""
 
-#: userdel.8.xml:86(para)
+#: userdel.8.xml:115(para)
 msgid ""
 "The mail spool is defined by the <emphasis>MAIL_DIR</emphasis> variable in "
 "the <filename>login.defs</filename> file."
 msgstr ""
 
-#: userdel.8.xml:2(term) login.defs.5.xml:2(term)
+#: userdel.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>USERDEL_CMD</option> (string)"
 msgstr "USERDEL_CMD (łańcuch)"
 
-#: userdel.8.xml:4(para) login.defs.5.xml:4(para)
+#: userdel.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "If defined, this command is run when removing a user. It should remove any "
 "at/cron/print jobs etc. owned by the user to be removed (passed as the first "
 "argument)."
 msgstr ""
 
-#: userdel.8.xml:2(term) useradd.8.xml:2(term) su.1.xml:2(term)
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: userdel.8.xml:32(term) useradd.8.xml:32(term) su.1.xml:32(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>USERGROUPS_ENAB</option> (boolean)"
 msgstr "GID_MAX (numer)"
 
-#: userdel.8.xml:4(para) useradd.8.xml:4(para) su.1.xml:4(para)
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: userdel.8.xml:34(para) useradd.8.xml:34(para) su.1.xml:34(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Enable setting of the umask group bits to be the same as owner bits "
 "(examples: 022 -&gt; 002, 077 -&gt; 007) for non-root users, if the uid is "
-"the same as gid, and username is the same as the primary group name. "
-"<placeholder-1/> If set to <replaceable>yes</replaceable>, <command>userdel</"
-"command> will remove the user's group if it contains no more members, and "
+"the same as gid, and username is the same as the primary group name."
+msgstr ""
+
+#: userdel.8.xml:39(para) useradd.8.xml:39(para) su.1.xml:39(para)
+#: login.defs.5.xml:39(para) login.1.xml:39(para)
+msgid ""
+"If set to <replaceable>yes</replaceable>, <command>userdel</command> will "
+"remove the user's group if it contains no more members, and "
 "<command>useradd</command> will create by default a group with the name of "
 "the user."
 msgstr ""
 
-#: userdel.8.xml:120(filename) useradd.8.xml:532(filename)
-#: pwconv.8.xml:141(filename) newusers.8.xml:224(filename)
-#: login.access.5.xml:69(filename) groupadd.8.xml:178(filename)
-#: chsh.1.xml:119(filename) chpasswd.8.xml:168(filename)
-#: chgpasswd.8.xml:163(filename) chfn.1.xml:87(filename)
+#: userdel.8.xml:149(filename) useradd.8.xml:658(filename)
+#: pwconv.8.xml:171(filename) newusers.8.xml:347(filename)
+#: login.access.5.xml:99(filename) groupadd.8.xml:204(filename)
+#: chsh.1.xml:148(filename) chpasswd.8.xml:200(filename)
+#: chgpasswd.8.xml:195(filename) chfn.1.xml:116(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
-#: userdel.8.xml:122(para) useradd.8.xml:534(para) pwconv.8.xml:143(para)
-#: newusers.8.xml:226(para) login.access.5.xml:71(para)
-#: groupadd.8.xml:180(para) chsh.1.xml:121(para) chpasswd.8.xml:170(para)
-#: chgpasswd.8.xml:165(para) chfn.1.xml:89(para)
+#: userdel.8.xml:151(para) useradd.8.xml:660(para) pwconv.8.xml:173(para)
+#: newusers.8.xml:349(para) login.access.5.xml:101(para)
+#: groupadd.8.xml:206(para) chsh.1.xml:150(para) chpasswd.8.xml:202(para)
+#: chgpasswd.8.xml:197(para) chfn.1.xml:118(para)
 msgid "Shadow password suite configuration."
 msgstr "Konfiguracja pakietu shadow."
 
-#: userdel.8.xml:141(title) useradd.8.xml:541(title) pwck.8.xml:208(title)
-#: passwd.1.xml:343(title) grpck.8.xml:182(title) groupmod.8.xml:139(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:208(title) chage.1.xml:199(title)
+#: userdel.8.xml:170(title) useradd.8.xml:667(title) pwck.8.xml:241(title)
+#: passwd.1.xml:385(title) grpck.8.xml:214(title) groupmod.8.xml:168(title)
+#: groupdel.8.xml:106(title) groupadd.8.xml:234(title) chage.1.xml:228(title)
 msgid "EXIT VALUES"
 msgstr "KOD ZAKOŃCZENIA"
 
-#: userdel.8.xml:146(replaceable) useradd.8.xml:546(replaceable)
-#: pwck.8.xml:213(replaceable) passwd.1.xml:348(replaceable)
-#: grpck.8.xml:187(replaceable) groupmod.8.xml:144(replaceable)
-#: groupdel.8.xml:82(replaceable) groupadd.8.xml:213(replaceable)
-#: chage.1.xml:204(replaceable)
+#: userdel.8.xml:175(replaceable) useradd.8.xml:672(replaceable)
+#: pwck.8.xml:246(replaceable) passwd.1.xml:390(replaceable)
+#: grpck.8.xml:219(replaceable) groupmod.8.xml:173(replaceable)
+#: groupdel.8.xml:111(replaceable) groupadd.8.xml:239(replaceable)
+#: chage.1.xml:233(replaceable)
 msgid "0"
 msgstr "0"
 
-#: userdel.8.xml:148(para) useradd.8.xml:548(para) pwck.8.xml:215(para)
-#: passwd.1.xml:350(para) grpck.8.xml:189(para) groupmod.8.xml:146(para)
-#: groupdel.8.xml:84(para) groupadd.8.xml:215(para) chage.1.xml:206(para)
+#: userdel.8.xml:177(para) useradd.8.xml:674(para) pwck.8.xml:248(para)
+#: passwd.1.xml:392(para) grpck.8.xml:221(para) groupmod.8.xml:175(para)
+#: groupdel.8.xml:113(para) groupadd.8.xml:241(para) chage.1.xml:235(para)
 msgid "success"
 msgstr "poprawne zakończenie działania programu"
 
-#: userdel.8.xml:152(replaceable) useradd.8.xml:552(replaceable)
-#: su.1.xml:26(manvolnum) sg.1.xml:10(manvolnum) pwck.8.xml:219(replaceable)
-#: passwd.1.xml:16(manvolnum) passwd.1.xml:354(replaceable)
-#: newgrp.1.xml:10(manvolnum) login.1.xml:42(manvolnum)
-#: grpck.8.xml:193(replaceable) groups.1.xml:6(manvolnum)
-#: gpasswd.1.xml:14(manvolnum) expiry.1.xml:12(manvolnum)
-#: chsh.1.xml:12(manvolnum) chfn.1.xml:13(manvolnum) chage.1.xml:6(manvolnum)
-#: chage.1.xml:210(replaceable)
+#: userdel.8.xml:181(replaceable) useradd.8.xml:678(replaceable)
+#: su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:252(replaceable)
+#: passwd.1.xml:45(manvolnum) passwd.1.xml:396(replaceable)
+#: newgrp.1.xml:39(manvolnum) login.1.xml:71(manvolnum)
+#: grpck.8.xml:225(replaceable) groups.1.xml:35(manvolnum)
+#: gpasswd.1.xml:43(manvolnum) expiry.1.xml:42(manvolnum)
+#: chsh.1.xml:41(manvolnum) chfn.1.xml:42(manvolnum) chage.1.xml:35(manvolnum)
+#: chage.1.xml:239(replaceable)
 msgid "1"
 msgstr "1"
 
-#: userdel.8.xml:154(para) useradd.8.xml:554(para)
+#: userdel.8.xml:183(para) useradd.8.xml:680(para)
 msgid "can't update password file"
 msgstr "nie można zaktualizować pliku z hasłami"
 
-#: userdel.8.xml:158(replaceable) useradd.8.xml:558(replaceable)
-#: pwck.8.xml:225(replaceable) passwd.1.xml:360(replaceable)
-#: grpck.8.xml:199(replaceable) groupmod.8.xml:150(replaceable)
-#: groupdel.8.xml:88(replaceable) groupadd.8.xml:219(replaceable)
-#: chage.1.xml:216(replaceable)
+#: userdel.8.xml:187(replaceable) useradd.8.xml:684(replaceable)
+#: pwck.8.xml:258(replaceable) passwd.1.xml:402(replaceable)
+#: grpck.8.xml:231(replaceable) groupmod.8.xml:179(replaceable)
+#: groupdel.8.xml:117(replaceable) groupadd.8.xml:245(replaceable)
+#: chage.1.xml:245(replaceable)
 msgid "2"
 msgstr "2"
 
-#: userdel.8.xml:160(para) useradd.8.xml:560(para) pwck.8.xml:221(para)
-#: grpck.8.xml:195(para) groupmod.8.xml:152(para) groupdel.8.xml:90(para)
-#: groupadd.8.xml:221(para) chage.1.xml:218(para)
+#: userdel.8.xml:189(para) useradd.8.xml:686(para) pwck.8.xml:254(para)
+#: grpck.8.xml:227(para) groupmod.8.xml:181(para) groupdel.8.xml:119(para)
+#: groupadd.8.xml:247(para) chage.1.xml:247(para)
 msgid "invalid command syntax"
 msgstr "niepoprawna składnia polecenia"
 
-#: userdel.8.xml:164(replaceable) useradd.8.xml:576(replaceable)
-#: passwd.1.xml:384(replaceable) groupmod.8.xml:168(replaceable)
-#: groupdel.8.xml:94(replaceable)
+#: userdel.8.xml:193(replaceable) useradd.8.xml:702(replaceable)
+#: pwck.8.xml:282(replaceable) passwd.1.xml:426(replaceable)
+#: groupmod.8.xml:197(replaceable) groupdel.8.xml:123(replaceable)
 msgid "6"
 msgstr "6"
 
-#: userdel.8.xml:166(para)
+#: userdel.8.xml:195(para)
 msgid "specified user doesn't exist"
 msgstr ""
 
-#: userdel.8.xml:172(para)
+#: userdel.8.xml:201(para)
 msgid "user currently logged in"
 msgstr ""
 
-#: userdel.8.xml:176(replaceable) useradd.8.xml:588(replaceable)
-#: groupmod.8.xml:180(replaceable) groupdel.8.xml:106(replaceable)
-#: groupadd.8.xml:243(replaceable)
+#: userdel.8.xml:205(replaceable) useradd.8.xml:714(replaceable)
+#: groupmod.8.xml:209(replaceable) groupdel.8.xml:135(replaceable)
+#: groupadd.8.xml:269(replaceable)
 msgid "10"
 msgstr "10"
 
-#: userdel.8.xml:178(para) useradd.8.xml:590(para) groupmod.8.xml:182(para)
-#: groupdel.8.xml:108(para) groupadd.8.xml:245(para)
+#: userdel.8.xml:207(para) useradd.8.xml:716(para) groupmod.8.xml:211(para)
+#: groupdel.8.xml:137(para) groupadd.8.xml:271(para)
 msgid "can't update group file"
 msgstr "nie można zaktualizować pliku z grupami"
 
-#: userdel.8.xml:182(replaceable) useradd.8.xml:594(replaceable)
+#: userdel.8.xml:211(replaceable) useradd.8.xml:720(replaceable)
 msgid "12"
 msgstr "12"
 
-#: userdel.8.xml:184(para)
+#: userdel.8.xml:213(para)
 msgid "can't remove home directory"
 msgstr ""
 
-#: userdel.8.xml:142(para)
+#: userdel.8.xml:171(para)
 msgid ""
 "The <command>userdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -965,20 +1017,20 @@
 "Polecenie <command>userdel</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: userdel.8.xml:193(para)
+#: userdel.8.xml:222(para)
 msgid ""
 "<command>userdel</command> will not allow you to remove an account if the "
 "user is currently logged in. You must kill any running processes which "
 "belong to an account that you are deleting."
 msgstr ""
 
-#: userdel.8.xml:198(para)
+#: userdel.8.xml:227(para)
 msgid ""
 "You may not remove any NIS attributes on a NIS client. This must be "
 "performed on the NIS server."
 msgstr ""
 
-#: userdel.8.xml:201(para)
+#: userdel.8.xml:230(para)
 msgid ""
 "If <emphasis>USERGROUPS_ENAB</emphasis> is defined to <emphasis remap=\"I"
 "\">yes</emphasis> in <filename>/etc/login.defs</filename>, <command>userdel</"
@@ -989,7 +1041,7 @@
 "<option>-f</option> option can force the deletion of this group."
 msgstr ""
 
-#: userdel.8.xml:214(para)
+#: userdel.8.xml:243(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1023,21 +1075,21 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: useradd.8.xml:19(refentrytitle) useradd.8.xml:24(refname)
-#: useradd.8.xml:29(command) useradd.8.xml:36(command)
-#: useradd.8.xml:40(command) login.defs.5.xml:389(term)
+#: useradd.8.xml:49(refentrytitle) useradd.8.xml:54(refname)
+#: useradd.8.xml:59(command) useradd.8.xml:66(command)
+#: useradd.8.xml:70(command) login.defs.5.xml:421(term)
 msgid "useradd"
 msgstr "useradd"
 
-#: useradd.8.xml:25(refpurpose)
+#: useradd.8.xml:55(refpurpose)
 msgid "create a new user or update default new user information"
 msgstr ""
 
-#: useradd.8.xml:37(arg) useradd.8.xml:41(arg)
+#: useradd.8.xml:67(arg) useradd.8.xml:71(arg)
 msgid "-D"
 msgstr "-D"
 
-#: useradd.8.xml:50(para)
+#: useradd.8.xml:80(para)
 msgid ""
 "When invoked without the <option>-D</option> option, the <command>useradd</"
 "command> command creates a new user account using the values specified on "
@@ -1047,11 +1099,18 @@
 "initial files."
 msgstr ""
 
-#: useradd.8.xml:63(para)
+#: useradd.8.xml:89(para)
+msgid ""
+"By default, a group will also be created for the new user (see <option>-g</"
+"option>, <option>-N</option>, <option>-U</option>, and "
+"<option>USERGROUPS_ENAB</option>)."
+msgstr ""
+
+#: useradd.8.xml:98(para)
 msgid "The options which apply to the <command>useradd</command> command are:"
 msgstr "Polecenie <command>useradd</command> posiada następujące opcje:"
 
-#: useradd.8.xml:67(term) useradd.8.xml:379(term)
+#: useradd.8.xml:102(term) useradd.8.xml:475(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
@@ -1059,7 +1118,7 @@
 "<option>-b</option>, <option>--base-dir</option><replaceable>KAT_BAZOWY</"
 "replaceable>"
 
-#: useradd.8.xml:72(para)
+#: useradd.8.xml:107(para)
 msgid ""
 "The default base directory for the system if <option>-d</"
 "option><replaceable>HOME_DIR</replaceable> is not specified. "
@@ -1068,13 +1127,20 @@
 "<replaceable>BASE_DIR</replaceable> must exist."
 msgstr ""
 
-#: useradd.8.xml:88(para)
+#: useradd.8.xml:115(para)
 msgid ""
+"If this option is not specified, <command>useradd</command> will use the "
+"base directory specified by the <option>HOME</option> variable in <filename>/"
+"etc/default/useradd</filename>, or <filename>/home</filename> by default."
+msgstr ""
+
+#: useradd.8.xml:130(para)
+msgid ""
 "Any text string. It is generally a short description of the login, and is "
 "currently used as the field for the user's full name."
 msgstr ""
 
-#: useradd.8.xml:101(para)
+#: useradd.8.xml:143(para)
 msgid ""
 "The new user will be created using <replaceable>HOME_DIR</replaceable> as "
 "the value for the user's login directory. The default is to append the "
@@ -1084,26 +1150,76 @@
 "created if it is missing."
 msgstr ""
 
-#: useradd.8.xml:113(term)
+#: useradd.8.xml:155(term)
 #, fuzzy
 #| msgid "<option>-d</option>, <option>--delete</option>"
 msgid "<option>-D</option>, <option>--defaults</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
-#: useradd.8.xml:117(para)
+#: useradd.8.xml:159(para)
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr ""
 
-#: useradd.8.xml:154(para)
+#: useradd.8.xml:174(para)
 msgid ""
+"If not specified, <command>useradd</command> will use the default expiry "
+"date specified by the <option>EXPIRE</option> variable in <filename>/etc/"
+"default/useradd</filename>, or an empty string (no expiry) by default."
+msgstr ""
+
+#: useradd.8.xml:188(para)
+#, fuzzy
+#| msgid ""
+#| "The number of days after a password expires until the account is "
+#| "permanently disabled. A value of 0 disables the account as soon as the "
+#| "password has expired, and a value of -1 disables the feature. The default "
+#| "value is -1."
+msgid ""
+"The number of days after a password expires until the account is permanently "
+"disabled. A value of 0 disables the account as soon as the password has "
+"expired, and a value of -1 disables the feature."
+msgstr ""
+"Liczba dni po wygaśnięciu hasła do stałego wyłączenia konta. Wartość 0 "
+"wyłącza konto natychmiast po przeterminowaniu hasła, zaś wartość -1 wyłącza "
+"tę cechę. Domyślną wartością jest -1."
+
+#: useradd.8.xml:194(para)
+msgid ""
+"If not specified, <command>useradd</command> will use the default inactivity "
+"period specified by the <option>INACTIVE</option> variable in the <filename>/"
+"etc/default/useradd</filename>, or -1 by default."
+msgstr ""
+
+#: useradd.8.xml:208(para)
+#, fuzzy
+#| msgid ""
+#| "The group name or number of the user's new initial login group. The group "
+#| "name must exist. A group number must refer to an already existing group. "
+#| "The default group number is 1."
+msgid ""
 "The group name or number of the user's initial login group. The group name "
-"must exist. A group number must refer to an already existing group. The "
-"default group number is 1 or whatever is specified in <filename>/etc/default/"
-"useradd</filename>."
+"must exist. A group number must refer to an already existing group."
 msgstr ""
+"Nazwa lub numer początkowej grupy logowania użytkownika. Nazwa grupy musi "
+"istnieć. Numer grupy musi odnosić się do już istniejącej grupy. Domyślnym "
+"numerem grupy jest 1."
 
-#: useradd.8.xml:168(para)
+#: useradd.8.xml:213(para)
 msgid ""
+"If not specified, the bahavior of <command>useradd</command> will depend on "
+"the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>. If this variable is set to <replaceable>yes</replaceable> (or "
+"<option>-U/--user-group</option> is specified on the command line), a group "
+"will be created for the user, with the same name as her loginname. If the "
+"variable is set to <replaceable>no</replaceable> (or <option>-N/--no-user-"
+"group</option> is specified on the command line), useradd will set the "
+"primary group of the new user to the value specified by the <option>GROUP</"
+"option> variable in <filename>/etc/default/useradd</filename>, or 100 by "
+"default."
+msgstr ""
+
+#: useradd.8.xml:236(para)
+msgid ""
 "A list of supplementary groups which the user is also a member of. Each "
 "group is separated from the next by a comma, with no intervening whitespace. "
 "The groups are subject to the same restrictions as the group given with the "
@@ -1111,7 +1227,7 @@
 "the initial group."
 msgstr ""
 
-#: useradd.8.xml:185(term)
+#: useradd.8.xml:253(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
@@ -1122,14 +1238,14 @@
 msgstr ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 
-#: useradd.8.xml:190(para)
+#: useradd.8.xml:258(para)
 msgid ""
 "The skeleton directory, which contains files and directories to be copied in "
 "the user's home directory, when the home directory is created by "
 "<command>useradd</command>."
 msgstr ""
 
-#: useradd.8.xml:195(para)
+#: useradd.8.xml:263(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
@@ -1137,14 +1253,14 @@
 "home</option>) option is specified."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:199(para)
+#: useradd.8.xml:267(para)
 msgid ""
-"If this option is not set, the skeleton directory is defined in <filename>/"
-"etc/default/useradd</filename> or, by default, <filename>/etc/skel</"
-"filename>."
+"If this option is not set, the skeleton directory is defined by the "
+"<option>SKEL</option> variable in <filename>/etc/default/useradd</filename> "
+"or, by default, <filename>/etc/skel</filename>."
 msgstr ""
 
-#: useradd.8.xml:207(term) groupadd.8.xml:86(term)
+#: useradd.8.xml:276(term) groupadd.8.xml:112(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
@@ -1152,10 +1268,10 @@
 "<option>-K</option>, <option>--key</option><replaceable>KLUCZ</"
 "replaceable>=<replaceable>WARTOŚĆ</replaceable>"
 
-#: useradd.8.xml:212(para)
+#: useradd.8.xml:281(para)
 msgid ""
-"Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS "
-"and others). <placeholder-1/> Example: <option>-K </"
+"Overrides <filename>/etc/login.defs</filename> defaults (UID_MIN, UID_MAX, "
+"UMASK, PASS_MAX_DAYS and others). <placeholder-1/> Example: <option>-K </"
 "option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</"
 "replaceable> can be used when creating system account to turn off password "
 "ageing, even though system account has no password at all. Multiple <option>-"
@@ -1165,101 +1281,134 @@
 "replaceable>=<replaceable>499</replaceable>"
 msgstr ""
 
-#: useradd.8.xml:226(para)
+#: useradd.8.xml:295(para)
 msgid ""
 "Note: <option>-K </option><replaceable>UID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable> doesn't work yet."
 msgstr ""
 
-#: useradd.8.xml:234(option) groupmems.8.xml:24(arg)
-#: groupmems.8.xml:79(option)
-msgid "-l"
-msgstr "-l"
+#: useradd.8.xml:303(term)
+#, fuzzy
+#| msgid "<option>-l</option>, <option>--list</option>"
+msgid "<option>-l</option>, <option>--no-log-init</option>"
+msgstr "<option>-l</option>, <option>--list</option>"
 
-#: useradd.8.xml:236(para)
+#: useradd.8.xml:305(para)
 msgid "Do not add the user to the lastlog and faillog databases."
 msgstr ""
 
-#: useradd.8.xml:239(para)
+#: useradd.8.xml:308(para)
 msgid ""
 "By default, the user's entries in the lastlog and faillog databases are "
 "resetted to avoid reusing the entry from a previously deleted user."
 msgstr ""
 
-#: useradd.8.xml:247(term)
+#: useradd.8.xml:316(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:251(para)
+#: useradd.8.xml:320(para)
 msgid ""
 "Create the user's home directory if it does not exist. The files and "
 "directories contained in the skeleton directory (which can be defined with "
 "the <option>-k</option> option) will be copied to the home directory."
 msgstr ""
 
-#: useradd.8.xml:257(para)
+#: useradd.8.xml:326(para)
 msgid "By default, no home directories are created."
 msgstr ""
 
-#: useradd.8.xml:263(term)
+#: useradd.8.xml:333(option)
 #, fuzzy
+#| msgid "-"
+msgid "-M"
+msgstr "-"
+
+#: useradd.8.xml:336(para)
+msgid ""
+"Do no create the user's home directory, even if the system wide setting from "
+"<filename>/etc/login.defs</filename> (<option>CREATE_HOME</option>) is set "
+"to <replaceable>yes</replaceable>."
+msgstr ""
+
+#: useradd.8.xml:345(term)
+#, fuzzy
 #| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-N</option>, <option>--no-user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: useradd.8.xml:267(para)
+#: useradd.8.xml:349(para)
 msgid ""
 "Do not create a group with the same name as the user, but add the user to "
 "the group specified by the <option>-g</option> option or by the GROUP "
 "variable in <filename>/etc/default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:273(para) useradd.8.xml:358(para)
+#: useradd.8.xml:355(para) useradd.8.xml:454(para)
 msgid ""
 "The default behavior (if the <option>-g</option>, <option>-N</option>, and "
 "<option>-U</option> options are not specified) is defined by the "
-"<option>USERGROUPS_ENAB</option> variable in <filename>login.defs</filename>."
+"<option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>."
 msgstr ""
 
-#: useradd.8.xml:286(para)
+#: useradd.8.xml:368(para)
 msgid "Allow the creation of a user account with a duplicate (non-unique) UID."
 msgstr ""
 
-#: useradd.8.xml:295(para)
+#: useradd.8.xml:369(para)
+#, fuzzy
+#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
+"This option is only valid in combination with the <option>-o</option> option."
+msgstr "<option>-m</option>, <option>--create-home</option>"
+
+#: useradd.8.xml:381(para)
+msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
 "disable the account."
 msgstr ""
 
-#: useradd.8.xml:303(term) newusers.8.xml:113(term) groupadd.8.xml:130(term)
+#: useradd.8.xml:389(term) newusers.8.xml:236(term) groupadd.8.xml:156(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-r</option>, <option>--system</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: useradd.8.xml:307(para) newusers.8.xml:117(para)
+#: useradd.8.xml:393(para) newusers.8.xml:240(para)
 msgid "Create a system account."
 msgstr ""
 
-#: useradd.8.xml:310(para) newusers.8.xml:120(para)
+#: useradd.8.xml:396(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are choosen in the "
 "<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
-"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<filename>/etc/login.defs</filename>, instead of <option>UID_MIN</option>-"
 "<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
 "the creation of groups)."
 msgstr ""
 
-#: useradd.8.xml:327(para)
+#: useradd.8.xml:405(para)
 msgid ""
+"Note that <command>useradd</command> will not create a home directory for "
+"such an user, regardless of the default setting in <filename>/etc/login."
+"defs</filename> (<option>CREATE_HOME</option>). You have to specify the "
+"<option>-m</option> options if you want a home directory for a system "
+"account to be created."
+msgstr ""
+
+#: useradd.8.xml:421(para)
+msgid ""
 "The name of the user's login shell. The default is to leave this field "
-"blank, which causes the system to select the default login shell."
+"blank, which causes the system to select the default login shell specified "
+"by the <option>SHELL</option> variable in <filename>/etc/default/useradd</"
+"filename>, or an empty string by default."
 msgstr ""
 
-#: useradd.8.xml:340(para)
+#: useradd.8.xml:436(para)
 msgid ""
 "The numerical value of the user's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. The "
@@ -1268,23 +1417,23 @@
 "accounts."
 msgstr ""
 
-#: useradd.8.xml:350(term)
+#: useradd.8.xml:446(term)
 #, fuzzy
 #| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-U</option>, <option>--user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: useradd.8.xml:354(para)
+#: useradd.8.xml:450(para)
 msgid ""
 "Create a group with the same name as the user, and add the user to this "
 "group."
 msgstr ""
 
-#: useradd.8.xml:369(title)
+#: useradd.8.xml:465(title)
 msgid "Changing the default values"
 msgstr ""
 
-#: useradd.8.xml:370(para)
+#: useradd.8.xml:466(para)
 msgid ""
 "When invoked with only the <option>-D</option> option, <command>useradd</"
 "command> will display the current default values. When invoked with <option>-"
@@ -1292,7 +1441,7 @@
 "default values for the specified options. Valid default-changing options are:"
 msgstr ""
 
-#: useradd.8.xml:384(para)
+#: useradd.8.xml:480(para)
 msgid ""
 "The path prefix for a new user's home directory. The user's name will be "
 "affixed to the end of <replaceable>BASE_DIR</replaceable> to form the new "
@@ -1300,248 +1449,321 @@
 "when creating a new account."
 msgstr ""
 
-#: useradd.8.xml:399(para)
+#: useradd.8.xml:487(para)
+msgid ""
+"This option sets the <option>HOME</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
+#: useradd.8.xml:499(para)
 msgid "The date on which the user account is disabled."
 msgstr ""
 
-#: useradd.8.xml:408(para)
+#: useradd.8.xml:500(para)
 msgid ""
+"This option sets the <option>EXPIRE</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
+#: useradd.8.xml:512(para)
+msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
 msgstr ""
 
-#: useradd.8.xml:420(para)
+#: useradd.8.xml:516(para)
 msgid ""
-"The group name or ID for a new user's initial group. The named group must "
-"exist, and a numerical group ID must have an existing entry."
+"This option sets the <option>INACTIVE</option> variable in <filename>/etc/"
+"default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:433(para)
+#: useradd.8.xml:528(para)
+msgid ""
+"The group name or ID for a new user's initial group (when the <option>-N/--"
+"no-user-group</option> is used or when the <option>USERGROUPS_ENAB</option> "
+"variable is set to <replaceable>no</replaceable> in <filename>/etc/login."
+"defs</filename>. The named group must exist, and a numerical group ID must "
+"have an existing entry."
+msgstr ""
+
+#: useradd.8.xml:537(para)
+msgid ""
+"This option sets the <option>GROUP</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
+#: useradd.8.xml:549(para)
 msgid "The name of a new user's login shell."
 msgstr ""
 
-#: useradd.8.xml:444(title)
+#: useradd.8.xml:552(para)
+msgid ""
+"This option sets the <option>SHELL</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
+#: useradd.8.xml:564(title)
 msgid "NOTES"
 msgstr "UWAGI"
 
-#: useradd.8.xml:445(para)
+#: useradd.8.xml:565(para)
 msgid ""
 "The system administrator is responsible for placing the default user files "
-"in the <filename>/etc/skel/</filename> directory."
+"in the <filename>/etc/skel/</filename> directory (or any other skeleton "
+"directory specified in <filename>/etc/default/useradd</filename> or on the "
+"command line)."
 msgstr ""
 
-#: useradd.8.xml:452(para)
+#: useradd.8.xml:574(para)
 msgid ""
 "You may not add a user to a NIS or LDAP group. This must be performed on the "
 "corresponding server."
 msgstr ""
 
-#: useradd.8.xml:457(para)
+#: useradd.8.xml:579(para)
 msgid ""
 "Similarly, if the username already exists in an external user database such "
 "as NIS or LDAP, <command>useradd</command> will deny the user account "
 "creation request."
 msgstr ""
 
-#: useradd.8.xml:463(para)
+#: useradd.8.xml:585(para)
 msgid ""
 "Usernames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
-"regular expression terms: [a-z_][a-z0-9_-]*[$]"
+"regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: groupadd.8.xml:2(term)
+#: useradd.8.xml:590(para)
+msgid "Usernames may only be up to 32 characters long."
+msgstr ""
+
+#: useradd.8.xml:30(term) login.defs.5.xml:30(term)
 #, fuzzy
+msgid "<option>CREATE_HOME</option> (boolean)"
+msgstr "GID_MAX (numer)"
+
+#: useradd.8.xml:32(para) login.defs.5.xml:32(para)
+msgid ""
+"Indicate if a home directory should be created by default for new users."
+msgstr ""
+
+#: useradd.8.xml:36(para) login.defs.5.xml:36(para)
+msgid ""
+"This setting does not apply to system users, and can be overriden on the "
+"command line."
+msgstr ""
+
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: groupadd.8.xml:32(term)
+#, fuzzy
 msgid "<option>GID_MAX</option> (number)"
 msgstr "GID_MAX (numer)"
 
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
-#: groupadd.8.xml:3(term)
+#: useradd.8.xml:33(term) newusers.8.xml:33(term) login.defs.5.xml:33(term)
+#: groupadd.8.xml:33(term)
 #, fuzzy
 msgid "<option>GID_MIN</option> (number)"
 msgstr "GID_MIN (numer)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
-#: groupadd.8.xml:5(para)
+#: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para)
+#: groupadd.8.xml:35(para)
 msgid ""
 "Range of group IDs used for the creation of regular groups by "
 "<command>useradd</command>, <command>useradd</command>, or "
 "<command>newusers</command>."
 msgstr ""
 
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) pwck.8.xml:2(term)
-#: newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_MAX_DAYS</option> (number)"
 msgstr "PASS_MAX_DAYS (numer)"
 
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) pwck.8.xml:4(para)
-#: newusers.8.xml:4(para) login.defs.5.xml:4(para)
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "The maximum number of days a password may be used. If the password is older "
 "than this, a password change will be forced. If not specified, -1 will be "
 "assumed (which disables the restriction)."
 msgstr ""
 
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) pwck.8.xml:2(term)
-#: newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_MIN_DAYS</option> (number)"
 msgstr "PASS_MIN_DAYS (numer)"
 
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) pwck.8.xml:4(para)
-#: newusers.8.xml:4(para) login.defs.5.xml:4(para)
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "The minimum number of days allowed between password changes. Any password "
 "changes attempted sooner than this will be rejected. If not specified, -1 "
 "will be assumed (which disables the restriction)."
 msgstr ""
 
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) pwck.8.xml:2(term)
-#: newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_WARN_AGE</option> (number)"
 msgstr "PASS_WARN_AGE (numer)"
 
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) pwck.8.xml:4(para)
-#: newusers.8.xml:4(para) login.defs.5.xml:4(para)
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "The number of days warning given before a password expires. A zero means "
 "warning is given only upon the day of expiration, a negative value means no "
 "warning is given. If not specified, no warning will be provided."
 msgstr ""
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: groupadd.8.xml:2(term)
+#: useradd.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: groupadd.8.xml:30(term)
 #, fuzzy
 msgid "<option>SYS_GID_MAX</option> (number)"
 msgstr "GID_MAX (numer)"
 
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
-#: groupadd.8.xml:3(term)
+#: useradd.8.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
+#: groupadd.8.xml:31(term)
 #, fuzzy
 msgid "<option>SYS_GID_MIN</option> (number)"
 msgstr "GID_MIN (numer)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
-#: groupadd.8.xml:5(para)
+#: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
+#: groupadd.8.xml:33(para)
 msgid ""
 "Range of group IDs used for the creation of system groups by "
 "<command>useradd</command>, <command>groupadd</command>, or "
 "<command>newusers</command>."
 msgstr ""
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
 #, fuzzy
 msgid "<option>SYS_UID_MAX</option> (number)"
 msgstr "UID_MAX (numer)"
 
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
+#: useradd.8.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
 #, fuzzy
 msgid "<option>SYS_UID_MIN</option> (number)"
 msgstr "UID_MIN (numer)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
+#: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
 msgid ""
 "Range of user IDs used for the creation of system users by <command>useradd</"
 "command> or <command>newusers</command>."
 msgstr ""
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>UID_MAX</option> (number)"
 msgstr "UID_MAX (numer)"
 
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
+#: useradd.8.xml:33(term) newusers.8.xml:33(term) login.defs.5.xml:33(term)
 #, fuzzy
 msgid "<option>UID_MIN</option> (number)"
 msgstr "UID_MIN (numer)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
+#: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para)
 msgid ""
 "Range of user IDs used for the creation of regular users by "
 "<command>useradd</command> or <command>newusers</command>."
 msgstr ""
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: login.1.xml:2(term)
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: login.1.xml:32(term)
 #, fuzzy
 msgid "<option>UMASK</option> (number)"
 msgstr "UMASK (number)"
 
-#: useradd.8.xml:4(para) newusers.8.xml:4(para) login.defs.5.xml:4(para)
-#: login.1.xml:4(para)
+#: useradd.8.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
+#: login.1.xml:34(para)
 msgid ""
-"The permission mask is initialized to this value. If not specified, the "
-"permission mask will be initialized to 022."
+"The file mode creation mask is initialized to this value. If not specified, "
+"the mask will be initialized to 022."
 msgstr ""
 
-#: useradd.8.xml:520(filename)
+#: useradd.8.xml:38(para) newusers.8.xml:38(para) login.defs.5.xml:38(para)
+#: login.1.xml:38(para)
+msgid ""
+"<command>useradd</command> and <command>newusers</command> use this mask to "
+"set the mode of the home directory they create"
+msgstr ""
+
+#: useradd.8.xml:42(para) newusers.8.xml:42(para) login.defs.5.xml:42(para)
+#: login.1.xml:42(para)
+msgid ""
+"It is also used by <command>login</command> to define users' initial umask. "
+"Note that this mask can be overriden by the user's GECOS line (if "
+"<option>QUOTAS_ENAB</option> is set) or by the specification of a limit with "
+"the <emphasis>K</emphasis> identifier in "
+"<citerefentry><refentrytitle>limits</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+
+#: useradd.8.xml:646(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
-#: useradd.8.xml:522(para)
+#: useradd.8.xml:648(para)
 msgid "Default values for account creation."
 msgstr ""
 
-#: useradd.8.xml:526(filename)
+#: useradd.8.xml:652(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
-#: useradd.8.xml:528(para)
+#: useradd.8.xml:654(para)
 msgid "Directory containing default files."
 msgstr ""
 
-#: useradd.8.xml:564(replaceable) shadow.3.xml:6(manvolnum)
-#: pwck.8.xml:231(replaceable) passwd.1.xml:366(replaceable)
-#: grpck.8.xml:205(replaceable) groupmod.8.xml:156(replaceable)
-#: groupadd.8.xml:225(replaceable)
+#: useradd.8.xml:690(replaceable) shadow.3.xml:35(manvolnum)
+#: pwck.8.xml:264(replaceable) passwd.1.xml:408(replaceable)
+#: grpck.8.xml:237(replaceable) groupmod.8.xml:185(replaceable)
+#: groupadd.8.xml:251(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:566(para) passwd.1.xml:386(para) groupmod.8.xml:158(para)
-#: groupadd.8.xml:227(para)
+#: useradd.8.xml:692(para) passwd.1.xml:428(para) groupmod.8.xml:187(para)
+#: groupadd.8.xml:253(para)
 msgid "invalid argument to option"
 msgstr "nieprawidłowy argument opcji"
 
-#: useradd.8.xml:570(replaceable) pwck.8.xml:237(replaceable)
-#: passwd.1.xml:372(replaceable) grpck.8.xml:211(replaceable)
-#: groupmod.8.xml:162(replaceable) groupadd.8.xml:231(replaceable)
+#: useradd.8.xml:696(replaceable) pwck.8.xml:270(replaceable)
+#: passwd.1.xml:414(replaceable) grpck.8.xml:243(replaceable)
+#: groupmod.8.xml:191(replaceable) groupadd.8.xml:257(replaceable)
 msgid "4"
 msgstr "4"
 
-#: useradd.8.xml:572(para)
+#: useradd.8.xml:698(para)
 msgid "UID already in use (and no <option>-o</option>)"
 msgstr "UID juz jest używany (i nie uzyto opcji <option>-o</option>)"
 
-#: useradd.8.xml:578(para) groupmod.8.xml:164(para) groupmod.8.xml:170(para)
-#: groupdel.8.xml:96(para)
+#: useradd.8.xml:704(para) groupmod.8.xml:193(para) groupmod.8.xml:199(para)
+#: groupdel.8.xml:125(para)
 msgid "specified group doesn't exist"
 msgstr ""
 
-#: useradd.8.xml:582(replaceable) groupmod.8.xml:174(replaceable)
-#: groupadd.8.xml:237(replaceable)
+#: useradd.8.xml:708(replaceable) groupmod.8.xml:203(replaceable)
+#: groupadd.8.xml:263(replaceable)
 msgid "9"
 msgstr "9"
 
-#: useradd.8.xml:584(para)
+#: useradd.8.xml:710(para)
 msgid "username already in use"
 msgstr ""
 
-#: useradd.8.xml:596(para)
+#: useradd.8.xml:722(para)
 msgid "can't create home directory"
 msgstr ""
 
-#: useradd.8.xml:600(replaceable)
+#: useradd.8.xml:726(replaceable)
 msgid "13"
 msgstr "13"
 
-#: useradd.8.xml:602(para)
+#: useradd.8.xml:728(para)
 msgid "can't create mail spool"
 msgstr ""
 
-#: useradd.8.xml:542(para)
+#: useradd.8.xml:668(para)
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -1549,7 +1771,7 @@
 "Polecenie <command>useradd</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: useradd.8.xml:611(para)
+#: useradd.8.xml:737(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1587,43 +1809,43 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: suauth.5.xml:5(refentrytitle) suauth.5.xml:10(refname)
+#: suauth.5.xml:34(refentrytitle) suauth.5.xml:39(refname)
 msgid "suauth"
 msgstr "suauth"
 
-#: suauth.5.xml:6(manvolnum) shadow.5.xml:6(manvolnum)
-#: pwck.8.xml:243(replaceable) porttime.5.xml:6(manvolnum)
-#: passwd.5.xml:6(manvolnum) passwd.1.xml:378(replaceable)
-#: login.defs.5.xml:67(manvolnum) login.access.5.xml:6(manvolnum)
-#: limits.5.xml:6(manvolnum) gshadow.5.xml:6(manvolnum)
-#: grpck.8.xml:217(replaceable) faillog.5.xml:6(manvolnum)
+#: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
+#: pwck.8.xml:276(replaceable) porttime.5.xml:35(manvolnum)
+#: passwd.5.xml:35(manvolnum) passwd.1.xml:420(replaceable)
+#: login.defs.5.xml:98(manvolnum) login.access.5.xml:36(manvolnum)
+#: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
+#: grpck.8.xml:249(replaceable) faillog.5.xml:35(manvolnum)
 msgid "5"
 msgstr "5"
 
-#: suauth.5.xml:7(refmiscinfo) shadow.5.xml:7(refmiscinfo)
-#: porttime.5.xml:7(refmiscinfo) passwd.5.xml:7(refmiscinfo)
-#: login.defs.5.xml:68(refmiscinfo) login.access.5.xml:7(refmiscinfo)
-#: limits.5.xml:7(refmiscinfo) gshadow.5.xml:7(refmiscinfo)
-#: faillog.5.xml:7(refmiscinfo)
+#: suauth.5.xml:36(refmiscinfo) shadow.5.xml:36(refmiscinfo)
+#: porttime.5.xml:36(refmiscinfo) passwd.5.xml:36(refmiscinfo)
+#: login.defs.5.xml:99(refmiscinfo) login.access.5.xml:37(refmiscinfo)
+#: limits.5.xml:37(refmiscinfo) gshadow.5.xml:35(refmiscinfo)
+#: faillog.5.xml:36(refmiscinfo)
 msgid "File Formats and Conversions"
 msgstr ""
 
-#: suauth.5.xml:11(refpurpose)
+#: suauth.5.xml:40(refpurpose)
 msgid "detailed su control file"
 msgstr ""
 
-#: suauth.5.xml:16(command) suauth.5.xml:142(filename)
+#: suauth.5.xml:45(command) suauth.5.xml:171(filename)
 msgid "/etc/suauth"
 msgstr "/etc/suauth"
 
-#: suauth.5.xml:22(para)
+#: suauth.5.xml:51(para)
 msgid ""
 "The file <filename>/etc/suauth</filename> is referenced whenever the su "
 "command is called. It can change the behaviour of the su command, based upon:"
 msgstr ""
 
 #. .RS
-#: suauth.5.xml:29(literallayout)
+#: suauth.5.xml:58(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -1632,18 +1854,18 @@
 msgstr ""
 
 #. .fi
-#: suauth.5.xml:33(para)
+#: suauth.5.xml:62(para)
 msgid ""
 "2) the user executing the su command (or any groups he might be a member of)"
 msgstr ""
 
-#: suauth.5.xml:38(para)
+#: suauth.5.xml:67(para)
 msgid ""
 "The file is formatted like this, with lines starting with a # being treated "
 "as comment lines and ignored;"
 msgstr ""
 
-#: suauth.5.xml:43(literallayout)
+#: suauth.5.xml:72(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -1651,14 +1873,14 @@
 "    "
 msgstr ""
 
-#: suauth.5.xml:47(para)
+#: suauth.5.xml:76(para)
 msgid ""
 "Where to-id is either the word <emphasis>ALL</emphasis>, a list of usernames "
 "delimited by \",\" or the words <emphasis>ALL EXCEPT</emphasis> followed by "
 "a list of usernames delimited by \",\""
 msgstr ""
 
-#: suauth.5.xml:53(para)
+#: suauth.5.xml:82(para)
 msgid ""
 "from-id is formatted the same as to-id except the extra word "
 "<emphasis>GROUP</emphasis> is recognised. <emphasis>ALL EXCEPT GROUP</"
@@ -1669,38 +1891,38 @@
 "manvolnum></citerefentry> is neccessary."
 msgstr ""
 
-#: suauth.5.xml:64(para)
+#: suauth.5.xml:93(para)
 msgid "Action can be one only of the following currently supported options."
 msgstr ""
 
-#: suauth.5.xml:70(emphasis)
+#: suauth.5.xml:99(emphasis)
 msgid "DENY"
 msgstr "DENY"
 
-#: suauth.5.xml:73(para)
+#: suauth.5.xml:102(para)
 msgid "The attempt to su is stopped before a password is even asked for."
 msgstr ""
 
-#: suauth.5.xml:80(emphasis)
+#: suauth.5.xml:109(emphasis)
 msgid "NOPASS"
 msgstr "NOPASS"
 
-#: suauth.5.xml:83(para)
+#: suauth.5.xml:112(para)
 msgid ""
 "The attempt to su is automatically successful; no password is asked for."
 msgstr ""
 
-#: suauth.5.xml:91(emphasis)
+#: suauth.5.xml:120(emphasis)
 msgid "OWNPASS"
 msgstr "OWNPASS"
 
-#: suauth.5.xml:94(para)
+#: suauth.5.xml:123(para)
 msgid ""
 "For the su command to be successful, the user must enter his or her own "
 "password. They are told this."
 msgstr ""
 
-#: suauth.5.xml:102(para)
+#: suauth.5.xml:131(para)
 msgid ""
 "Note there are three separate fields delimited by a colon. No whitespace "
 "must surround this colon. Also note that the file is examined sequentially "
@@ -1709,11 +1931,11 @@
 "as fine control as he or she wishes."
 msgstr ""
 
-#: suauth.5.xml:112(title)
+#: suauth.5.xml:141(title)
 msgid "EXAMPLE"
 msgstr "EXAMPLE"
 
-#: suauth.5.xml:113(literallayout)
+#: suauth.5.xml:142(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -1740,29 +1962,29 @@
 "    "
 msgstr ""
 
-#: suauth.5.xml:149(title) pwconv.8.xml:105(title) login.defs.5.xml:428(title)
+#: suauth.5.xml:178(title) pwconv.8.xml:135(title) login.defs.5.xml:455(title)
 msgid "BUGS"
 msgstr "BŁĘDY"
 
-#: suauth.5.xml:150(para)
+#: suauth.5.xml:179(para)
 msgid ""
 "There could be plenty lurking. The file parser is particularly unforgiving "
 "about syntax errors, expecting no spurious whitespace (apart from beginning "
 "and end of lines), and a specific token delimiting different things."
 msgstr ""
 
-#: suauth.5.xml:159(title) shadow.3.xml:154(title)
+#: suauth.5.xml:188(title) shadow.3.xml:183(title)
 msgid "DIAGNOSTICS"
 msgstr "DIAGNOSTYKA"
 
-#: suauth.5.xml:160(para)
+#: suauth.5.xml:189(para)
 msgid ""
 "An error parsing the file is reported using "
 "<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry> as level ERR on facility AUTH."
 msgstr ""
 
-#: suauth.5.xml:169(para)
+#: suauth.5.xml:198(para)
 msgid ""
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -1770,25 +1992,30 @@
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: su.1.xml:25(refentrytitle) su.1.xml:30(refname) su.1.xml:35(command)
-#: login.defs.5.xml:363(term)
+#: su.1.xml:54(refentrytitle) su.1.xml:59(refname) su.1.xml:64(command)
+#: login.defs.5.xml:395(term)
 msgid "su"
 msgstr "su"
 
-#: su.1.xml:27(refmiscinfo) sg.1.xml:11(refmiscinfo)
-#: passwd.1.xml:17(refmiscinfo) newgrp.1.xml:11(refmiscinfo)
-#: login.1.xml:43(refmiscinfo) groups.1.xml:7(refmiscinfo)
-#: gpasswd.1.xml:15(refmiscinfo) expiry.1.xml:13(refmiscinfo)
-#: chsh.1.xml:13(refmiscinfo) chfn.1.xml:14(refmiscinfo)
-#: chage.1.xml:7(refmiscinfo)
+#: su.1.xml:56(refmiscinfo) sg.1.xml:40(refmiscinfo)
+#: passwd.1.xml:46(refmiscinfo) newgrp.1.xml:40(refmiscinfo)
+#: login.1.xml:72(refmiscinfo) groups.1.xml:36(refmiscinfo)
+#: gpasswd.1.xml:44(refmiscinfo) expiry.1.xml:43(refmiscinfo)
+#: chsh.1.xml:42(refmiscinfo) chfn.1.xml:43(refmiscinfo)
+#: chage.1.xml:36(refmiscinfo)
 msgid "User Commands"
 msgstr "Polecenia użytkowników"
 
-#: su.1.xml:31(refpurpose)
+#: su.1.xml:60(refpurpose)
 msgid "change user ID or become superuser"
 msgstr ""
 
-#: su.1.xml:49(para)
+#: su.1.xml:70(replaceable) login.1.xml:85(replaceable)
+#: login.1.xml:93(replaceable)
+msgid "username"
+msgstr ""
+
+#: su.1.xml:78(para)
 msgid ""
 "The <command>su</command> command is used to become another user during a "
 "login session. Invoked without a <option>username</option>, <command>su</"
@@ -1797,7 +2024,7 @@
 "would expect had the user logged in directly."
 msgstr ""
 
-#: su.1.xml:58(para)
+#: su.1.xml:87(para)
 msgid ""
 "Additional arguments may be provided after the username, in which case they "
 "are supplied to the user's login shell. In particular, an argument of "
@@ -1806,20 +2033,20 @@
 "specified in <filename>/etc/passwd</filename> for the target user."
 msgstr ""
 
-#: su.1.xml:67(para)
+#: su.1.xml:96(para)
 msgid ""
 "You can use the <option>--</option> argument to separate <command>su</"
 "command> options from the arguments supplied to the shell."
 msgstr ""
 
-#: su.1.xml:72(para)
+#: su.1.xml:101(para)
 msgid ""
 "The user will be prompted for a password, if appropriate. Invalid passwords "
 "will produce an error message. All attempts, both valid and invalid, are "
 "logged to detect abuse of the system."
 msgstr ""
 
-#: su.1.xml:77(para)
+#: su.1.xml:106(para)
 msgid ""
 "The current environment is passed to the new shell. The value of <envar>"
 "$PATH</envar> is reset to <filename>/bin:/usr/bin</filename> for normal "
@@ -1829,18 +2056,18 @@
 "filename>."
 msgstr ""
 
-#: su.1.xml:86(para) login.1.xml:135(para)
+#: su.1.xml:115(para) login.1.xml:166(para)
 msgid ""
 "A subsystem login is indicated by the presence of a \"*\" as the first "
 "character of the login shell. The given home directory will be used as the "
 "root of a new file system which the user is actually logged into."
 msgstr ""
 
-#: su.1.xml:95(para)
+#: su.1.xml:124(para)
 msgid "The options which apply to the <command>su</command> command are:"
 msgstr "Polecenie <command>su</command> posiada następujące opcje:"
 
-#: su.1.xml:99(term)
+#: su.1.xml:128(term)
 msgid ""
 "<option>-c</option>, <option>--command</option><replaceable>COMMAND</"
 "replaceable>"
@@ -1848,61 +2075,61 @@
 "<option>-c</option>, <option>--command</option><replaceable>POLECENIE</"
 "replaceable>"
 
-#: su.1.xml:104(para)
+#: su.1.xml:133(para)
 msgid ""
 "Specify a command that will be invoked by the shell using its <option>-c</"
 "option>."
 msgstr ""
 
-#: su.1.xml:111(term)
+#: su.1.xml:140(term)
 msgid "<option>-</option>, <option>-l</option>, <option>--login</option>"
 msgstr "<option>-</option>, <option>-l</option>, <option>--login</option>"
 
-#: su.1.xml:115(para)
+#: su.1.xml:144(para)
 msgid ""
 "Provide an environment similar to what the user would expect had the user "
 "logged in directly."
 msgstr ""
 
-#: su.1.xml:119(para)
+#: su.1.xml:148(para)
 msgid ""
 "When <option>-</option> is used, it must be specified as the last "
 "<command>su</command> option. The other forms (<option>-l</option> and "
 "<option>--login</option>) do not have this restriction."
 msgstr ""
 
-#: su.1.xml:133(para)
+#: su.1.xml:162(para)
 msgid "The shell that will be invoked."
 msgstr ""
 
-#: su.1.xml:138(para)
+#: su.1.xml:167(para)
 msgid "The shell specified with --shell."
 msgstr ""
 
-#: su.1.xml:141(para)
+#: su.1.xml:170(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
 msgstr ""
 
-#: su.1.xml:148(para)
+#: su.1.xml:177(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
 msgstr ""
 
-#: su.1.xml:154(para)
+#: su.1.xml:183(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
 msgstr ""
 
-#: su.1.xml:134(para)
+#: su.1.xml:163(para)
 msgid ""
 "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:161(para)
+#: su.1.xml:190(para)
 msgid ""
 "If the target user has a restricted shell (i.e. the shell field of this "
 "user's entry in <filename>/etc/passwd</filename> is not listed in <filename>/"
@@ -1911,7 +2138,7 @@
 "unless <command>su</command> is called by root."
 msgstr ""
 
-#: su.1.xml:172(term)
+#: su.1.xml:201(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -1919,44 +2146,44 @@
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
 
-#: su.1.xml:177(para)
+#: su.1.xml:206(para)
 msgid "Preserve the current environment."
 msgstr ""
 
-#: su.1.xml:178(para)
+#: su.1.xml:207(para)
 msgid ""
 "If the target user has a restricted shell, this option has no effect (unless "
 "<command>su</command> is called by root)."
 msgstr ""
 
-#: su.1.xml:189(para)
+#: su.1.xml:218(para)
 msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>CONSOLE</option> (string)"
 msgstr "CHFN_RESTRICT (łańcuch)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, either full pathname of a file containing device names or a \":"
 "\" delimited list of device names. Root logins will be allowed only upon "
 "these devices."
 msgstr ""
 
-#: su.1.xml:9(para) login.defs.5.xml:9(para) login.1.xml:9(para)
+#: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
 msgid "If not defined, root will be allowed on any device."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>CONSOLE_GROUPS</option> (string)"
 msgstr "CHFN_RESTRICT (łańcuch)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "List of groups to add to the user's supplementary group set when logging in "
 "on the console (as determined by the CONSOLE setting). Default is none. "
@@ -1964,18 +2191,18 @@
 "permanent access to these groups, even when not logged in on the console."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>DEFAULT_HOME</option> (boolean)"
 msgstr "GID_MAX (numer)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Indicate if login is allowed if we can't cd to the home directory. Default "
 "in no."
 msgstr ""
 
-#: su.1.xml:8(para) login.defs.5.xml:8(para) login.1.xml:8(para)
+#: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
 msgid ""
 "If set to <replaceable>yes</replaceable>, the user will login in the root "
 "(<filename>/</filename>) directory if it is not possible to cd to her home "
@@ -1983,41 +2210,41 @@
 msgstr ""
 
 #. XXX: When compiled with PAM support, only sulogin uses ENV_HZ
-#: su.1.xml:3(term) login.defs.5.xml:3(term) login.1.xml:3(term)
+#: su.1.xml:33(term) login.defs.5.xml:33(term) login.1.xml:33(term)
 #, fuzzy
 msgid "<option>ENV_HZ</option> (string)"
 msgstr "MAIL_DIR (łańcuch)"
 
-#: su.1.xml:5(para) login.defs.5.xml:5(para) login.1.xml:5(para)
+#: su.1.xml:35(para) login.defs.5.xml:35(para) login.1.xml:35(para)
 msgid ""
 "If set, it will be used to define the HZ environment variable when a user "
 "login. The value must be preceded by <replaceable>HZ=</replaceable>. A "
 "common value on Linux is <replaceable>HZ=100</replaceable>."
 msgstr ""
 
-#: su.1.xml:11(para) login.defs.5.xml:11(para) login.1.xml:11(para)
+#: su.1.xml:41(para) login.defs.5.xml:41(para) login.1.xml:41(para)
 msgid ""
 "The <envar>HZ</envar> environment variable is only set when the user (the "
 "superuser) logs in with <command>sulogin</command>."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENVIRON_FILE</option> (string)"
 msgstr "MAIL_DIR (łańcuch)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If this file exists and is readable, login environment will be read from it. "
 "Every line should be in the form name=value."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_PATH</option> (string)"
 msgstr "CHFN_RESTRICT (łańcuch)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, it will be used to define the PATH environment variable when a "
 "regular user login. The value can be preceded by <replaceable>PATH=</"
@@ -2026,12 +2253,12 @@
 "usr/bin</replaceable>."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_SUPATH</option> (string)"
 msgstr "CHFN_RESTRICT (łańcuch)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, it will be used to define the PATH environment variable when the "
 "superuser login. The value can be preceded by <replaceable>PATH=</"
@@ -2040,12 +2267,12 @@
 "<replaceable>PATH=/bin:/usr/bin</replaceable>."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_TZ</option> (string)"
 msgstr "CHFN_RESTRICT (łańcuch)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, it will be used to define the TZ environment variable when a user "
 "login. The value can be the name of a timezone preceded by <replaceable>TZ=</"
@@ -2055,72 +2282,72 @@
 msgstr ""
 
 #. TODO: it can in fact be used to set any other variable
-#: su.1.xml:13(para) login.defs.5.xml:13(para) login.1.xml:13(para)
+#: su.1.xml:43(para) login.defs.5.xml:43(para) login.1.xml:43(para)
 msgid ""
 "If a full path is specified but the file does not exist or cannot be read, "
 "the default is to use <replaceable>TZ=CST6CDT</replaceable>."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
-#: chsh.1.xml:2(term) chfn.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
+#: chsh.1.xml:32(term) chfn.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOGIN_STRING</option> (string)"
 msgstr "CHFN_RESTRICT (łańcuch)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
-#: chsh.1.xml:4(para) chfn.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
+#: chsh.1.xml:34(para) chfn.1.xml:34(para)
 msgid ""
 "The string used for prompting a password. The default is to use \"Password: "
 "\", or a translation of that string. If you set this variable, the prompt "
 "will no be translated."
 msgstr ""
 
-#: su.1.xml:9(para) login.defs.5.xml:9(para) login.1.xml:9(para)
-#: chsh.1.xml:9(para) chfn.1.xml:9(para)
+#: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
+#: chsh.1.xml:39(para) chfn.1.xml:39(para)
 msgid ""
 "If the string contains <replaceable>%s</replaceable>, this will be replaced "
 "by the user's name."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>MAIL_CHECK_ENAB</option> (boolean)"
 msgstr "GID_MAX (numer)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable checking and display of mailbox status upon login."
 msgstr ""
 
-#: su.1.xml:7(para) login.defs.5.xml:7(para) login.1.xml:7(para)
+#: su.1.xml:37(para) login.defs.5.xml:37(para) login.1.xml:37(para)
 msgid ""
 "You should disable it if the shell startup files already check for mail "
 "(\"mailx -e\" or equivalent)."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>QUOTAS_ENAB</option> (boolean)"
 msgstr "GID_MAX (numer)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable setting of ulimit, umask, and niceness from passwd gecos field."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SULOG_FILE</option> (string)"
 msgstr "CHFN_RESTRICT (łańcuch)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "If defined, all su activity is logged to this file."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SU_NAME</option> (string)"
 msgstr "MAIL_DIR (łańcuch)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "If defined, the command name to display when running \"su -\". For example, "
 "if this is defined as \"su\" then a \"ps\" will display the command is \"-su"
@@ -2128,12 +2355,12 @@
 "being run, e.g. something like \"-sh\"."
 msgstr ""
 
-#: su.1.xml:3(term) login.defs.5.xml:3(term)
+#: su.1.xml:33(term) login.defs.5.xml:33(term)
 #, fuzzy
 msgid "<option>SU_WHEEL_ONLY</option> (boolean)"
 msgstr "GID_MAX (numer)"
 
-#: su.1.xml:5(para) login.defs.5.xml:5(para)
+#: su.1.xml:35(para) login.defs.5.xml:35(para)
 msgid ""
 "If <replaceable>yes</replaceable>, the user must be listed as a member of "
 "the first gid 0 group in <filename>/etc/group</filename> (called "
@@ -2142,18 +2369,18 @@
 "empty, no one will be able to <command>su</command> to uid 0."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SYSLOG_SU_ENAB</option> (boolean)"
 msgstr "GID_MAX (numer)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "Enable \"syslog\" logging of <command>su</command> activity - in addition to "
 "sulog file logging."
 msgstr ""
 
-#: su.1.xml:243(para)
+#: su.1.xml:272(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -2169,27 +2396,27 @@
 "citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>"
 
-#: sg.1.xml:9(refentrytitle) sg.1.xml:14(refname) sg.1.xml:20(command)
+#: sg.1.xml:38(refentrytitle) sg.1.xml:43(refname) sg.1.xml:49(command)
 msgid "sg"
 msgstr "sg"
 
-#: sg.1.xml:15(refpurpose)
+#: sg.1.xml:44(refpurpose)
 msgid "execute command as different group ID"
 msgstr ""
 
-#: sg.1.xml:21(arg) newgrp.1.xml:20(arg)
+#: sg.1.xml:50(arg) newgrp.1.xml:49(arg)
 msgid "-"
 msgstr "-"
 
-#: sg.1.xml:23(arg) expiry.1.xml:23(arg)
+#: sg.1.xml:52(arg) expiry.1.xml:53(arg)
 msgid "-c"
 msgstr "-c"
 
-#: sg.1.xml:22(arg)
+#: sg.1.xml:51(arg)
 msgid "group <placeholder-1/> command"
 msgstr ""
 
-#: sg.1.xml:31(para)
+#: sg.1.xml:60(para)
 msgid ""
 "The <command>sg</command> command works similar to <command>newgrp</command> "
 "but accepts a command. The command will be executed with the <filename>/bin/"
@@ -2202,16 +2429,16 @@
 "command> command you are returned to your previous group ID."
 msgstr ""
 
-#: sg.1.xml:2(term) newgrp.1.xml:2(term) login.defs.5.xml:2(term)
+#: sg.1.xml:32(term) newgrp.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SYSLOG_SG_ENAB</option> (boolean)"
 msgstr "GID_MAX (numer)"
 
-#: sg.1.xml:4(para) newgrp.1.xml:4(para) login.defs.5.xml:4(para)
+#: sg.1.xml:34(para) newgrp.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Enable \"syslog\" logging of <command>sg</command> activity."
 msgstr ""
 
-#: sg.1.xml:90(para)
+#: sg.1.xml:119(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -2248,230 +2475,354 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
-#: shadow.5.xml:5(refentrytitle) shadow.5.xml:10(refname)
-#: shadow.3.xml:5(refentrytitle) shadow.3.xml:10(refname)
-#: pwck.8.xml:31(replaceable) pwck.8.xml:45(replaceable)
-#: grpck.8.xml:24(replaceable) grpck.8.xml:33(replaceable)
+#: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
+#: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
+#: pwck.8.xml:60(replaceable) pwck.8.xml:74(replaceable)
+#: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
 msgid "shadow"
 msgstr ""
 
-#: shadow.5.xml:11(refpurpose)
+#: shadow.5.xml:40(refpurpose)
 msgid "encrypted password file"
 msgstr ""
 
-#: shadow.5.xml:16(para)
+#: shadow.5.xml:45(para)
 msgid ""
-"<emphasis remap=\"I\">shadow</emphasis> contains the encrypted password "
-"information for user's accounts and optional the password aging information. "
-"Included is:"
+"<filename>shadow</filename> is a file which contains the password "
+"information for the system's accounts and optional aging information."
 msgstr ""
 
-#: shadow.5.xml:23(para) passwd.5.xml:24(para)
+#: shadow.5.xml:51(para) gshadow.5.xml:82(para)
+msgid ""
+"This file must not be readable by regular users if password security is to "
+"be maintained."
+msgstr ""
+
+#: shadow.5.xml:56(para)
+msgid ""
+"Each line of this file contains 9 fields, separated by colons (<quote>:</"
+"quote>), in the following order:"
+msgstr ""
+
+#: shadow.5.xml:63(emphasis) passwd.5.xml:53(para)
 msgid "login name"
 msgstr ""
 
-#: shadow.5.xml:26(para) gshadow.5.xml:26(para)
+#: shadow.5.xml:65(para)
+msgid "It must be a valid account name, which exist on the system."
+msgstr ""
+
+#: shadow.5.xml:71(emphasis) gshadow.5.xml:54(para)
 msgid "encrypted password"
 msgstr ""
 
-#: shadow.5.xml:29(para)
-msgid "days since Jan 1, 1970 that password was last changed"
+#: shadow.5.xml:73(para)
+msgid ""
+"Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+"manvolnum></citerefentry> for details on how this string is interpreted."
 msgstr ""
 
-#: shadow.5.xml:32(para)
-msgid "days before password may be changed"
+#: shadow.5.xml:78(para)
+#, fuzzy
+msgid ""
+"If the password field contains some string that is not a valid result of "
+"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
+"citerefentry>, for instance ! or *, the user will not be able to use a unix "
+"password to log in (but the user may log in the system by other means)."
 msgstr ""
+"Nowa wartość pola komentarza dla danego użytkownika w pliku haseł. Zwykle "
+"jest zmieniana przy pomocy polecenia <citerefentry><refentrytitle>chfn</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: shadow.5.xml:35(para)
-msgid "days after which password must be changed"
+#: shadow.5.xml:85(para)
+msgid ""
+"This field may be empty, in which case no passwords are required to "
+"authenticate as the specified login name. However, some applications which "
+"read the <filename>/etc/shadow</filename> file may decide not to permit any "
+"access at all if the password field is empty."
 msgstr ""
 
-#: shadow.5.xml:38(para)
-msgid "days before password is to expire that user is warned"
+#: shadow.5.xml:92(para)
+msgid ""
+"A password field which starts with a exclamation mark means that the "
+"password is locked. The remaining characters on the line represent the "
+"password field before the password was locked."
 msgstr ""
 
-#: shadow.5.xml:41(para)
-msgid "days after password expires that account is disabled"
+#: shadow.5.xml:102(emphasis)
+msgid "date of last password change"
 msgstr ""
 
-#: shadow.5.xml:44(para)
-msgid "days since Jan 1, 1970 that account is disabled"
+#: shadow.5.xml:105(para)
+msgid ""
+"The date of the last password change, expressed as the number of days since "
+"Jan 1, 1970."
 msgstr ""
 
-#: shadow.5.xml:47(para)
-msgid "a reserved field"
+#: shadow.5.xml:109(para)
+msgid ""
+"The value 0 has a special meaning, which is that the user should change her "
+"pasword the next time she will log in the system."
 msgstr ""
 
-#: shadow.5.xml:51(para)
+#: shadow.5.xml:114(para)
+msgid "An empty field means that password aging features are disabled."
+msgstr ""
+
+#: shadow.5.xml:121(emphasis)
+msgid "minimum password age"
+msgstr ""
+
+#: shadow.5.xml:123(para)
 msgid ""
-"The password field must be filled. The encrypted password consists of 13 to "
-"24 characters from the 64 character alphabet a thru z, A thru Z, 0 thru 9, "
-"\\. and /. Optionally it can start with a \"$\" character. This means the "
-"encrypted password was generated using another (not DES) algorithm. For "
-"example if it starts with \"$1$\" it means the MD5-based algorithm was used."
+"The minimum password age is the number of days the user will have to wait "
+"before she will be allowed to change her password again."
 msgstr ""
 
-#: shadow.5.xml:60(para)
+#: shadow.5.xml:128(para)
+msgid "An empty field and value 0 mean that there are no minimum password age."
+msgstr ""
+
+#: shadow.5.xml:135(emphasis)
+msgid "maximum password age"
+msgstr ""
+
+#: shadow.5.xml:137(para)
 msgid ""
-"Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry> for details on how this string is interpreted."
+"The maximum password age is the number of days after which the user will "
+"have to change her password."
 msgstr ""
 
-#: shadow.5.xml:68(para)
+#: shadow.5.xml:141(para)
 msgid ""
-"If the password field contains some string that is not valid result of "
-"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
-"citerefentry>, for instance ! or *, the user will not be able to use a unix "
-"password to log in, subject to <citerefentry><refentrytitle>pam</"
-"refentrytitle><manvolnum>7</manvolnum></citerefentry>."
+"After this number of days is elapsed, the password may still be valid. The "
+"user should be asked to change her password the next time she will log in."
 msgstr ""
 
-#: shadow.5.xml:77(para)
+#: shadow.5.xml:146(para)
 msgid ""
-"The date of the last password change is given as the number of days since "
-"Jan 1, 1970. The password may not be changed again until the proper number "
-"of days have passed, and must be changed after the maximum number of days. "
-"If the minimum number of days required is greater than the maximum number of "
-"day allowed, this password may not be changed by the user."
+"An empty field means that there are no maximum password age, no password "
+"warning period, and no password inactivity period (see below)."
 msgstr ""
 
-#: shadow.5.xml:86(para)
+#: shadow.5.xml:151(para)
 msgid ""
-"An account is considered to be inactive and is disabled if the password is "
-"not changed within the specified number of days after the password expires. "
-"An account will also be disabled on the specified day regardless of other "
-"password expiration information."
+"If the maximum password age is lower than the minimum password age, the user "
+"cannot change her password."
 msgstr ""
 
-#: shadow.5.xml:93(para)
+#: shadow.5.xml:159(emphasis)
+msgid "password warning period"
+msgstr ""
+
+#: shadow.5.xml:162(para)
 msgid ""
-"This information supersedes any password or password age information present "
-"in <filename>/etc/passwd</filename>."
+"The number of days before a password is going to expire (see the maximum "
+"password age above) during which the user should be warned."
 msgstr ""
 
-#: shadow.5.xml:98(para) gshadow.5.xml:54(para)
+#: shadow.5.xml:167(para)
 msgid ""
-"This file must not be readable by regular users if password security is to "
-"be maintained."
+"An empty field and value 0 mean that there are no password warning period."
 msgstr ""
 
-#: shadow.5.xml:124(para)
+#: shadow.5.xml:175(emphasis)
+msgid "password inactivity period"
+msgstr ""
+
+#: shadow.5.xml:178(para)
 msgid ""
+"The number of days after a password has expired (see the maximum password "
+"age above) during which the password should still be accepted (and the user "
+"should update her password during the next login)."
+msgstr ""
+
+#: shadow.5.xml:184(para)
+msgid ""
+"After expiration of the password and this expiration period is elapsed, no "
+"login is possible using the current user's password. The user should contact "
+"her administrator."
+msgstr ""
+
+#: shadow.5.xml:189(para)
+msgid ""
+"An empty field means that there are no enforcement of an inactivity period."
+msgstr ""
+
+#: shadow.5.xml:197(emphasis)
+#, fuzzy
+#| msgid "User account information."
+msgid "account expiration date"
+msgstr "Informacja o kontach użytkowników."
+
+#: shadow.5.xml:200(para)
+msgid ""
+"The date of expiration of the account, expressed as the number of days since "
+"Jan 1, 1970."
+msgstr ""
+
+#: shadow.5.xml:204(para)
+msgid ""
+"Note that an account expiration differs from a password expiration. In case "
+"of an acount expiration, the user shall not be allowed to login. In case of "
+"a password expiration, the user is not allowed to login using her password."
+msgstr ""
+
+#: shadow.5.xml:210(para)
+msgid "An empty field means that the account will never expire."
+msgstr ""
+
+#: shadow.5.xml:213(para)
+msgid ""
+"The value 0 should not be used as it is interpreted as either an account "
+"with no expiration, or as an expiration on Jan 1, 1970."
+msgstr ""
+
+#: shadow.5.xml:221(emphasis)
+msgid "reserved field"
+msgstr ""
+
+#: shadow.5.xml:223(para)
+msgid "This field is reserved for future use."
+msgstr ""
+
+#: shadow.5.xml:249(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>"
+msgid ""
 "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>pwconv</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>login</"
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>pwconv</"
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>"
 
-#: shadow.3.xml:7(refmiscinfo)
+#: shadow.3.xml:36(refmiscinfo)
 msgid "Library Calls"
 msgstr ""
 
-#: shadow.3.xml:11(refname)
+#: shadow.3.xml:40(refname)
 msgid "getspnam"
 msgstr "getspnam"
 
-#: shadow.3.xml:12(refpurpose)
+#: shadow.3.xml:41(refpurpose)
 msgid "encrypted password file routines"
 msgstr ""
 
-#: shadow.3.xml:16(title)
+#: shadow.3.xml:45(title)
 msgid "SYNTAX"
 msgstr "SKŁADNIA"
 
-#: shadow.3.xml:18(emphasis)
+#: shadow.3.xml:47(emphasis)
 msgid "#include &lt;shadow.h&gt;"
 msgstr "#include &lt;shadow.h&gt;"
 
-#: shadow.3.xml:22(emphasis)
+#: shadow.3.xml:51(emphasis)
 msgid "struct spwd *getspent();"
 msgstr "struct spwd *getspent();"
 
-#: shadow.3.xml:26(emphasis)
+#: shadow.3.xml:55(emphasis)
 msgid "struct spwd *getspnam(char"
 msgstr "struct spwd *getspnam(char"
 
-#: shadow.3.xml:27(emphasis)
+#: shadow.3.xml:56(emphasis)
 msgid "*name"
 msgstr "*name"
 
-#: shadow.3.xml:27(emphasis) shadow.3.xml:40(emphasis)
-#: shadow.3.xml:45(emphasis) shadow.3.xml:51(emphasis)
+#: shadow.3.xml:56(emphasis) shadow.3.xml:69(emphasis)
+#: shadow.3.xml:74(emphasis) shadow.3.xml:80(emphasis)
 msgid ");"
 msgstr ");"
 
-#: shadow.3.xml:31(emphasis)
+#: shadow.3.xml:60(emphasis)
 msgid "void setspent();"
 msgstr "void setspent()"
 
-#: shadow.3.xml:35(emphasis)
+#: shadow.3.xml:64(emphasis)
 msgid "void endspent();"
 msgstr "void endspent();"
 
-#: shadow.3.xml:39(emphasis)
+#: shadow.3.xml:68(emphasis)
 msgid "struct spwd *fgetspent(FILE"
 msgstr "struct spwd *fgetspent(FILE"
 
-#: shadow.3.xml:40(emphasis) shadow.3.xml:51(emphasis)
+#: shadow.3.xml:69(emphasis) shadow.3.xml:80(emphasis)
 msgid "*fp"
 msgstr "*fp"
 
-#: shadow.3.xml:44(emphasis)
+#: shadow.3.xml:73(emphasis)
 msgid "struct spwd *sgetspent(char"
 msgstr "struct spwd *sgetspent(char"
 
-#: shadow.3.xml:45(emphasis)
+#: shadow.3.xml:74(emphasis)
 msgid "*cp"
 msgstr "*cp"
 
-#: shadow.3.xml:49(emphasis)
+#: shadow.3.xml:78(emphasis)
 msgid "int putspent(struct spwd"
 msgstr "int putspent(struct spwd"
 
-#: shadow.3.xml:50(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "*p,"
 msgstr "*p,"
 
-#: shadow.3.xml:50(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "FILE"
 msgstr "FILE"
 
-#: shadow.3.xml:55(emphasis)
+#: shadow.3.xml:84(emphasis)
 msgid "int lckpwdf();"
 msgstr "int lckpwdf();"
 
-#: shadow.3.xml:59(emphasis)
+#: shadow.3.xml:88(emphasis)
 msgid "int ulckpwdf();"
 msgstr "int ulckpwdf();"
 
-#: shadow.3.xml:65(para)
+#: shadow.3.xml:94(para)
 msgid ""
 "<emphasis remap=\"I\">shadow</emphasis> manipulates the contents of the "
 "shadow password file, <filename>/etc/shadow</filename>. The structure in the "
 "<emphasis remap=\"I\">#include</emphasis> file is:"
 msgstr ""
 
-#: shadow.3.xml:70(programlisting)
+#: shadow.3.xml:99(programlisting)
 #, no-wrap
 msgid ""
 "struct spwd {\n"
@@ -2488,51 +2839,51 @@
 "    "
 msgstr ""
 
-#: shadow.3.xml:82(para)
+#: shadow.3.xml:111(para)
 msgid "The meanings of each field are:"
 msgstr ""
 
-#: shadow.3.xml:85(para)
+#: shadow.3.xml:114(para)
 msgid "sp_namp - pointer to null-terminated user name"
 msgstr ""
 
-#: shadow.3.xml:88(para)
+#: shadow.3.xml:117(para)
 msgid "sp_pwdp - pointer to null-terminated password"
 msgstr ""
 
-#: shadow.3.xml:91(para)
+#: shadow.3.xml:120(para)
 msgid "sp_lstchg - days since Jan 1, 1970 password was last changed"
 msgstr ""
 
-#: shadow.3.xml:94(para)
+#: shadow.3.xml:123(para)
 msgid "sp_min - days before which password may not be changed"
 msgstr ""
 
-#: shadow.3.xml:97(para)
+#: shadow.3.xml:126(para)
 msgid "sp_max - days after which password must be changed"
 msgstr ""
 
-#: shadow.3.xml:100(para)
+#: shadow.3.xml:129(para)
 msgid ""
 "sp_warn - days before password is to expire that user is warned of pending "
 "password expiration"
 msgstr ""
 
-#: shadow.3.xml:105(para)
+#: shadow.3.xml:134(para)
 msgid ""
 "sp_inact - days after password expires that account is considered inactive "
 "and disabled"
 msgstr ""
 
-#: shadow.3.xml:110(para)
+#: shadow.3.xml:139(para)
 msgid "sp_expire - days since Jan 1, 1970 when account will be disabled"
 msgstr ""
 
-#: shadow.3.xml:113(para)
+#: shadow.3.xml:142(para)
 msgid "sp_flag - reserved for future use"
 msgstr ""
 
-#: shadow.3.xml:121(para)
+#: shadow.3.xml:150(para)
 msgid ""
 "<emphasis>getspent</emphasis>, <emphasis>getspname</emphasis>, "
 "<emphasis>fgetspent</emphasis>, and <emphasis>sgetspent</emphasis> each "
@@ -2545,13 +2896,13 @@
 "the file for an entry matching <emphasis>name</emphasis>."
 msgstr ""
 
-#: shadow.3.xml:134(para)
+#: shadow.3.xml:163(para)
 msgid ""
 "<emphasis>setspent</emphasis> and <emphasis>endspent</emphasis> may be used "
 "to begin and end, respectively, access to the shadow password file."
 msgstr ""
 
-#: shadow.3.xml:140(para)
+#: shadow.3.xml:169(para)
 msgid ""
 "The <emphasis>lckpwdf</emphasis> and <emphasis>ulckpwdf</emphasis> routines "
 "should be used to insure exclusive access to the <filename>/etc/shadow</"
@@ -2563,20 +2914,20 @@
 "locks are acquired 0 is returned."
 msgstr ""
 
-#: shadow.3.xml:155(para)
+#: shadow.3.xml:184(para)
 msgid ""
 "Routines return NULL if no more entries are available or if an error occurs "
 "during processing. Routines which have <emphasis>int</emphasis> as the "
 "return value return 0 for success and -1 for failure."
 msgstr ""
 
-#: shadow.3.xml:165(para)
+#: shadow.3.xml:194(para)
 msgid ""
 "These routines may only be used by the superuser as access to the shadow "
 "password file is restricted."
 msgstr ""
 
-#: shadow.3.xml:185(para)
+#: shadow.3.xml:214(para)
 msgid ""
 "<citerefentry><refentrytitle>getpwent</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -2586,37 +2937,37 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: pwconv.8.xml:12(refentrytitle) pwconv.8.xml:17(refname)
-#: pwconv.8.xml:26(command) login.defs.5.xml:356(term)
+#: pwconv.8.xml:42(refentrytitle) pwconv.8.xml:47(refname)
+#: pwconv.8.xml:56(command) login.defs.5.xml:388(term)
 msgid "pwconv"
 msgstr "pwconv"
 
-#: pwconv.8.xml:18(refname) pwconv.8.xml:29(command)
+#: pwconv.8.xml:48(refname) pwconv.8.xml:59(command)
 msgid "pwunconv"
 msgstr "pwunconv"
 
-#: pwconv.8.xml:19(refname) pwconv.8.xml:32(command)
-#: login.defs.5.xml:270(term)
+#: pwconv.8.xml:49(refname) pwconv.8.xml:62(command)
+#: login.defs.5.xml:302(term)
 msgid "grpconv"
 msgstr "grpconv"
 
-#: pwconv.8.xml:20(refname) pwconv.8.xml:35(command)
-#: login.defs.5.xml:276(term)
+#: pwconv.8.xml:50(refname) pwconv.8.xml:65(command)
+#: login.defs.5.xml:308(term)
 msgid "grpunconv"
 msgstr "grpunconv"
 
-#: pwconv.8.xml:21(refpurpose)
+#: pwconv.8.xml:51(refpurpose)
 msgid "convert to and from shadow passwords and groups"
 msgstr ""
 
-#: pwconv.8.xml:41(para)
+#: pwconv.8.xml:71(para)
 msgid ""
 "The <command>pwconv</command> command creates <emphasis remap=\"I\">shadow</"
 "emphasis> from <emphasis remap=\"I\">passwd</emphasis> and an optionally "
 "existing <emphasis remap=\"I\">shadow</emphasis>."
 msgstr ""
 
-#: pwconv.8.xml:47(para)
+#: pwconv.8.xml:77(para)
 msgid ""
 "The <command>pwunconv</command> command creates <emphasis remap=\"I"
 "\">passwd</emphasis> from <emphasis remap=\"I\">passwd</emphasis> and "
@@ -2624,14 +2975,14 @@
 "\">shadow</emphasis>."
 msgstr ""
 
-#: pwconv.8.xml:54(para)
+#: pwconv.8.xml:84(para)
 msgid ""
 "The <command>grpconv</command> command creates <emphasis remap=\"I"
 "\">gshadow</emphasis> from <emphasis remap=\"I\">group</emphasis> and an "
 "optionally existing <emphasis remap=\"I\">gshadow</emphasis>."
 msgstr ""
 
-#: pwconv.8.xml:60(para)
+#: pwconv.8.xml:90(para)
 msgid ""
 "The <command>grpunconv</command> command creates <emphasis remap=\"I"
 "\">group</emphasis> from <emphasis remap=\"I\">group</emphasis> and "
@@ -2639,14 +2990,14 @@
 "\">gshadow</emphasis>."
 msgstr ""
 
-#: pwconv.8.xml:67(para)
+#: pwconv.8.xml:97(para)
 msgid ""
 "These four programs all operate on the normal and shadow password and group "
 "files: <filename>/etc/passwd</filename>, <filename>/etc/group</filename>, "
 "<filename>/etc/shadow</filename>, and <filename>/etc/gshadow</filename>."
 msgstr ""
 
-#: pwconv.8.xml:74(para)
+#: pwconv.8.xml:104(para)
 msgid ""
 "Each program acquires the necessary locks before conversion. "
 "<command>pwconv</command> and <command>grpconv</command> are similar. First, "
@@ -2658,7 +3009,7 @@
 "hand."
 msgstr ""
 
-#: pwconv.8.xml:85(para)
+#: pwconv.8.xml:115(para)
 msgid ""
 "<command>pwconv</command> will use the values of <emphasis remap=\"I"
 "\">PASS_MIN_DAYS</emphasis>, <emphasis remap=\"I\">PASS_MAX_DAYS</emphasis>, "
@@ -2666,7 +3017,7 @@
 "defs</filename> when adding new entries to <filename>/etc/shadow</filename>."
 msgstr ""
 
-#: pwconv.8.xml:94(para)
+#: pwconv.8.xml:124(para)
 msgid ""
 "Likewise <command>pwunconv</command> and <command>grpunconv</command> are "
 "similar. Passwords in the main file are updated from the shadowed file. "
@@ -2676,7 +3027,7 @@
 "can."
 msgstr ""
 
-#: pwconv.8.xml:106(para)
+#: pwconv.8.xml:136(para)
 msgid ""
 "Errors in the password or group files (such as invalid or duplicate entries) "
 "may cause these programs to loop forever or fail in other strange ways. "
@@ -2684,20 +3035,20 @@
 "any such errors before converting to or from shadow passwords or groups."
 msgstr ""
 
-#: pwconv.8.xml:117(para)
+#: pwconv.8.xml:147(para)
 msgid ""
 "The following configuration variable in <filename>/etc/login.defs</filename> "
 "changes the behavior of <command>grpconv</command> and <command>grpunconv</"
 "command>:"
 msgstr ""
 
-#: pwconv.8.xml:125(para)
+#: pwconv.8.xml:155(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of <command>pwconv</command>:"
 msgstr ""
 
-#: pwconv.8.xml:151(para)
+#: pwconv.8.xml:181(para)
 msgid ""
 "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -2711,37 +3062,37 @@
 "<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>."
 
-#: pwck.8.xml:11(refentrytitle) pwck.8.xml:16(refname) pwck.8.xml:22(command)
-#: pwck.8.xml:37(command) login.defs.5.xml:348(term)
+#: pwck.8.xml:40(refentrytitle) pwck.8.xml:45(refname) pwck.8.xml:51(command)
+#: pwck.8.xml:66(command) login.defs.5.xml:380(term)
 msgid "pwck"
 msgstr "pwck"
 
-#: pwck.8.xml:17(refpurpose)
+#: pwck.8.xml:46(refpurpose)
 msgid "verify integrity of password files"
 msgstr ""
 
-#: pwck.8.xml:23(arg) pwck.8.xml:38(arg) pwck.8.xml:111(option)
+#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:140(option)
 msgid "-q"
 msgstr "-q"
 
-#: pwck.8.xml:24(arg) pwck.8.xml:132(option) grpck.8.xml:29(arg)
-#: grpck.8.xml:101(option)
+#: pwck.8.xml:53(arg) pwck.8.xml:161(option) grpck.8.xml:58(arg)
+#: grpck.8.xml:130(option)
 msgid "-s"
 msgstr "-s"
 
-#: pwck.8.xml:27(replaceable) pwck.8.xml:42(replaceable)
-#: passwd.5.xml:5(refentrytitle) passwd.5.xml:10(refname)
-#: passwd.1.xml:15(refentrytitle) passwd.1.xml:20(refname)
-#: passwd.1.xml:26(command) login.defs.5.xml:337(term)
+#: pwck.8.xml:56(replaceable) pwck.8.xml:71(replaceable)
+#: passwd.5.xml:34(refentrytitle) passwd.5.xml:39(refname)
+#: passwd.1.xml:44(refentrytitle) passwd.1.xml:49(refname)
+#: passwd.1.xml:55(command) login.defs.5.xml:369(term)
 msgid "passwd"
 msgstr "passwd"
 
-#: pwck.8.xml:39(arg) pwck.8.xml:122(option) login.1.xml:186(option)
-#: grpck.8.xml:20(arg) grpck.8.xml:91(option) gpasswd.1.xml:120(option)
+#: pwck.8.xml:68(arg) pwck.8.xml:151(option) login.1.xml:222(option)
+#: grpck.8.xml:49(arg) grpck.8.xml:120(option)
 msgid "-r"
 msgstr "-r"
 
-#: pwck.8.xml:53(para)
+#: pwck.8.xml:82(para)
 msgid ""
 "The <command>pwck</command> command verifies the integrity of the system "
 "authentication information. All entries in the <filename>/etc/passwd</"
@@ -2751,35 +3102,35 @@
 "uncorrectable errors."
 msgstr ""
 
-#: pwck.8.xml:62(para) grpck.8.xml:51(para)
+#: pwck.8.xml:91(para) grpck.8.xml:80(para)
 msgid "Checks are made to verify that each entry has:"
 msgstr ""
 
-#: pwck.8.xml:65(para) grpck.8.xml:55(para)
+#: pwck.8.xml:94(para) grpck.8.xml:84(para)
 msgid "the correct number of fields"
 msgstr ""
 
-#: pwck.8.xml:68(para)
+#: pwck.8.xml:97(para)
 msgid "a unique user name"
 msgstr ""
 
-#: pwck.8.xml:71(para)
+#: pwck.8.xml:100(para)
 msgid "a valid user and group identifier"
 msgstr ""
 
-#: pwck.8.xml:74(para)
+#: pwck.8.xml:103(para)
 msgid "a valid primary group"
 msgstr ""
 
-#: pwck.8.xml:77(para)
+#: pwck.8.xml:106(para)
 msgid "a valid home directory"
 msgstr ""
 
-#: pwck.8.xml:80(para)
+#: pwck.8.xml:109(para)
 msgid "a valid login shell"
 msgstr ""
 
-#: pwck.8.xml:84(para)
+#: pwck.8.xml:113(para)
 msgid ""
 "The checks for correct number of fields and unique user name are fatal. If "
 "the entry has the wrong number of fields, the user will be prompted to "
@@ -2790,34 +3141,34 @@
 "<command>usermod</command> command to correct the error."
 msgstr ""
 
-#: pwck.8.xml:95(para)
+#: pwck.8.xml:124(para)
 msgid ""
 "The commands which operate on the <filename>/etc/passwd</filename> file are "
 "not able to alter corrupted or duplicated entries. <command>pwck</command> "
 "should be used in those circumstances to remove the offending entry."
 msgstr ""
 
-#: pwck.8.xml:105(para)
+#: pwck.8.xml:134(para)
 msgid "The options which apply to the <command>pwck</command> command are:"
 msgstr "Polecenie <command>pwck</command> posiada następujące opcje:"
 
-#: pwck.8.xml:114(para)
+#: pwck.8.xml:143(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
 msgstr ""
 
-#: pwck.8.xml:125(para)
+#: pwck.8.xml:154(para)
 msgid "Execute the <command>pwck</command> command in read-only mode."
 msgstr ""
 
-#: pwck.8.xml:135(para)
+#: pwck.8.xml:164(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
 msgstr ""
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:172(para)
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename>. The user may select "
@@ -2825,39 +3176,59 @@
 "<emphasis remap=\"I\">shadow</emphasis> parameters."
 msgstr ""
 
-#: pwck.8.xml:192(para)
+#: pwck.8.xml:221(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>group</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"citerefentry>, <citerefentry><refentrytitle>grpck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>usermod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>usermod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"citerefentry>."
 
-#: pwck.8.xml:227(para)
+#: pwck.8.xml:260(para)
 msgid "one or more bad password entries"
 msgstr ""
 
-#: pwck.8.xml:233(para)
+#: pwck.8.xml:266(para)
 msgid "can't open password files"
 msgstr ""
 
-#: pwck.8.xml:239(para)
+#: pwck.8.xml:272(para)
 msgid "can't lock password files"
 msgstr ""
 
-#: pwck.8.xml:245(para)
+#: pwck.8.xml:278(para)
 msgid "can't update password files"
 msgstr ""
 
-#: pwck.8.xml:209(para)
+#: pwck.8.xml:284(para)
+#, fuzzy
+#| msgid "can't update password file"
+msgid "can't sort password files"
+msgstr "nie można zaktualizować pliku z hasłami"
+
+#: pwck.8.xml:242(para)
 msgid ""
 "The <command>pwck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -2865,21 +3236,21 @@
 "Polecenie <command>pwck</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: porttime.5.xml:5(refentrytitle) porttime.5.xml:10(refname)
+#: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
 msgid "porttime"
 msgstr ""
 
-#: porttime.5.xml:11(refpurpose)
+#: porttime.5.xml:40(refpurpose)
 msgid "port access time file"
 msgstr ""
 
-#: porttime.5.xml:16(para)
+#: porttime.5.xml:45(para)
 msgid ""
 "<emphasis remap=\"I\">porttime</emphasis> contains a list of tty devices, "
 "user names, and permitted login times."
 msgstr ""
 
-#: porttime.5.xml:21(para)
+#: porttime.5.xml:50(para)
 msgid ""
 "Each entry consists of three colon separated fields. The first field is a "
 "comma separated list of tty devices, or an asterisk to indicate that all tty "
@@ -2889,7 +3260,7 @@
 "permitted access times."
 msgstr ""
 
-#: porttime.5.xml:30(para)
+#: porttime.5.xml:59(para)
 msgid ""
 "Each access time entry consists of zero or more days of the week, "
 "abbreviated <emphasis>Su</emphasis>, <emphasis>Mo</emphasis>, <emphasis>Tu</"
@@ -2900,21 +3271,21 @@
 "indicate every day. If no days are given, <emphasis>Al</emphasis> is assumed."
 msgstr ""
 
-#: porttime.5.xml:44(title)
+#: porttime.5.xml:73(title)
 msgid "EXAMPLES"
 msgstr "PRZYKŁADY"
 
-#: porttime.5.xml:45(para)
+#: porttime.5.xml:74(para)
 msgid ""
 "The following entry allows access to user <emphasis remap=\"B\">jfh</"
 "emphasis> on every port during weekdays from 9am to 5pm."
 msgstr ""
 
-#: porttime.5.xml:51(para)
+#: porttime.5.xml:80(para)
 msgid "*:jfh:Wk0900-1700"
 msgstr "*:jfh:Wk0900-1700"
 
-#: porttime.5.xml:53(para)
+#: porttime.5.xml:82(para)
 msgid ""
 "The following entries allow access only to the users <emphasis>root</"
 "emphasis> and <emphasis>oper</emphasis> on <filename>/dev/console</filename> "
@@ -2923,7 +3294,7 @@
 "second entry which does not permit access at any time."
 msgstr ""
 
-#: porttime.5.xml:62(programlisting)
+#: porttime.5.xml:91(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2936,25 +3307,25 @@
 "      console:*:\n"
 "    "
 
-#: porttime.5.xml:67(para)
+#: porttime.5.xml:96(para)
 msgid ""
 "The following entry allows access for the user <emphasis>games</emphasis> on "
 "any port during non-working hours."
 msgstr ""
 
-#: porttime.5.xml:72(para)
+#: porttime.5.xml:101(para)
 msgid "*:games:Wk1700-0900,SaSu0000-2400"
 msgstr "*:games:Wk1700-0900,SaSu0000-2400"
 
-#: porttime.5.xml:79(filename) logoutd.8.xml:38(filename)
+#: porttime.5.xml:108(filename) logoutd.8.xml:67(filename)
 msgid "/etc/porttime"
 msgstr "/etc/porttime"
 
-#: porttime.5.xml:81(para) logoutd.8.xml:40(para)
+#: porttime.5.xml:110(para) logoutd.8.xml:69(para)
 msgid "File containing port access."
 msgstr ""
 
-#: porttime.5.xml:89(para) login.access.5.xml:79(para)
+#: porttime.5.xml:118(para) login.access.5.xml:109(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -2962,41 +3333,41 @@
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: passwd.5.xml:11(refpurpose)
+#: passwd.5.xml:40(refpurpose)
 msgid "the password file"
 msgstr ""
 
-#: passwd.5.xml:16(para)
+#: passwd.5.xml:45(para)
 msgid ""
 "<filename>/etc/passwd</filename> contains one line for each user account, "
 "with seven fields delimited by colons (<quote>:</quote>). These fields are:"
 msgstr ""
 
-#: passwd.5.xml:27(para)
+#: passwd.5.xml:56(para)
 msgid "optional encrypted password"
 msgstr ""
 
-#: passwd.5.xml:30(para)
+#: passwd.5.xml:59(para)
 msgid "numerical user ID"
 msgstr ""
 
-#: passwd.5.xml:33(para)
+#: passwd.5.xml:62(para)
 msgid "numerical group ID"
 msgstr ""
 
-#: passwd.5.xml:36(para)
+#: passwd.5.xml:65(para)
 msgid "user name or comment field"
 msgstr ""
 
-#: passwd.5.xml:39(para)
+#: passwd.5.xml:68(para)
 msgid "user home directory"
 msgstr ""
 
-#: passwd.5.xml:42(para)
+#: passwd.5.xml:71(para)
 msgid "optional user command interpreter"
 msgstr ""
 
-#: passwd.5.xml:46(para)
+#: passwd.5.xml:75(para)
 msgid ""
 "The encrypted password field may be blank, in which case no password is "
 "required to authenticate as the specified login name. However, some "
@@ -3014,21 +3385,21 @@
 "citerefentry>."
 msgstr ""
 
-#: passwd.5.xml:65(para)
+#: passwd.5.xml:94(para)
 msgid ""
 "The comment field is used by various system utilities, such as "
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 msgstr ""
 
-#: passwd.5.xml:71(para)
+#: passwd.5.xml:100(para)
 msgid ""
 "The home directory field provides the name of the initial working directory. "
 "The <command>login</command> program uses this information to set the value "
 "of the <envar>$HOME</envar> environmental variable."
 msgstr ""
 
-#: passwd.5.xml:77(para)
+#: passwd.5.xml:106(para)
 msgid ""
 "The command interpreter field provides the name of the user's command "
 "language interpreter, or the name of the initial program to execute. The "
@@ -3037,62 +3408,83 @@
 "defaults to the value <filename>/bin/sh</filename>."
 msgstr ""
 
-#: passwd.5.xml:98(para)
+#: passwd.5.xml:127(para)
 msgid "optional encrypted password file"
 msgstr ""
 
-#: passwd.5.xml:106(para)
+#: passwd.5.xml:135(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
+#| "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>login</"
+"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>getent</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
-"refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"citerefentry>, <citerefentry><refentrytitle>pwck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>pwconv</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>pwunconv</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>login</"
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
+"citerefentry>, <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwconv</refentrytitle><manvolnum>8</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>pwunconv</"
+"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
+"<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: passwd.1.xml:21(refpurpose)
+#: passwd.1.xml:50(refpurpose)
 msgid "change user password"
 msgstr "zmiana hasła użytkownika"
 
-#: passwd.1.xml:38(para)
+#: passwd.1.xml:67(para)
 msgid ""
 "The <command>passwd</command> command changes passwords for user accounts. A "
 "normal user may only change the password for his/her own account, while the "
 "superuser may change the password for any account. <command>passwd</command> "
-"also changes account information, such as the full name of the user, the "
-"user's login shell, or his/her password expiry date and interval."
+"also changes the account or associated password validity period."
 msgstr ""
 
-#: passwd.1.xml:48(title)
+#: passwd.1.xml:76(title)
 msgid "Password Changes"
 msgstr ""
 
-#: passwd.1.xml:49(para)
+#: passwd.1.xml:77(para)
 msgid ""
 "The user is first prompted for his/her old password, if one is present. This "
 "password is then encrypted and compared against the stored password. The "
@@ -3100,51 +3492,51 @@
 "permitted to bypass this step so that forgotten passwords may be changed."
 msgstr ""
 
-#: passwd.1.xml:57(para)
+#: passwd.1.xml:85(para)
 msgid ""
 "After the password has been entered, password aging information is checked "
 "to see if the user is permitted to change the password at this time. If not, "
 "<command>passwd</command> refuses to change the password and exits."
 msgstr ""
 
-#: passwd.1.xml:64(para)
+#: passwd.1.xml:92(para)
 msgid ""
 "The user is then prompted twice for a replacement password. The second entry "
 "is compared against the first and both are required to match in order for "
 "the password to be changed."
 msgstr ""
 
-#: passwd.1.xml:70(para)
+#: passwd.1.xml:98(para)
 msgid ""
 "Then, the password is tested for complexity. As a general guideline, "
 "passwords should consist of 6 to 8 characters including one or more "
 "characters from each of the following sets:"
 msgstr ""
 
-#: passwd.1.xml:78(para)
+#: passwd.1.xml:106(para)
 msgid "lower case alphabetics"
 msgstr ""
 
-#: passwd.1.xml:81(para)
+#: passwd.1.xml:109(para)
 msgid "digits 0 thru 9"
 msgstr ""
 
-#: passwd.1.xml:84(para)
+#: passwd.1.xml:112(para)
 msgid "punctuation marks"
 msgstr ""
 
-#: passwd.1.xml:88(para)
+#: passwd.1.xml:116(para)
 msgid ""
 "Care must be taken not to include the system default erase or kill "
 "characters. <command>passwd</command> will reject any password which is not "
 "suitably complex."
 msgstr ""
 
-#: passwd.1.xml:97(title)
+#: passwd.1.xml:125(title)
 msgid "Hints for user passwords"
 msgstr ""
 
-#: passwd.1.xml:98(para)
+#: passwd.1.xml:126(para)
 msgid ""
 "The security of a password depends upon the strength of the encryption "
 "algorithm and the size of the key space. The <emphasis>UNIX</emphasis> "
@@ -3153,7 +3545,7 @@
 "password which is selected."
 msgstr ""
 
-#: passwd.1.xml:106(para)
+#: passwd.1.xml:134(para)
 msgid ""
 "Compromises in password security normally result from careless password "
 "selection or handling. For this reason, you should not select a password "
@@ -3162,47 +3554,47 @@
 "address. Any of these may be used as guesses to violate system security."
 msgstr ""
 
-#: passwd.1.xml:115(para)
+#: passwd.1.xml:143(para)
 msgid ""
 "You can find advices on how to choose a strong password on http://en."
 "wikipedia.org/wiki/Password_strength"
 msgstr ""
 
-#: passwd.1.xml:124(para)
+#: passwd.1.xml:152(para)
 msgid "The options which apply to the <command>passwd</command> command are:"
 msgstr "Polecenie <command>passwd</command> posiada następujące opcje:"
 
-#: passwd.1.xml:129(term) faillog.8.xml:42(term)
+#: passwd.1.xml:157(term) faillog.8.xml:71(term)
 msgid "<option>-a</option>, <option>--all</option>"
 msgstr "<option>-a</option>, <option>--all</option>"
 
-#: passwd.1.xml:133(para)
+#: passwd.1.xml:161(para)
 msgid ""
 "This option can be used only with <option>-S</option> and causes show status "
 "for all users."
 msgstr ""
 
-#: passwd.1.xml:140(term)
+#: passwd.1.xml:168(term)
 msgid "<option>-d</option>, <option>--delete</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
-#: passwd.1.xml:144(para)
+#: passwd.1.xml:172(para)
 msgid ""
 "Delete a user's password (make it empty). This is a quick way to disable a "
 "password for an account. It will set the named account passwordless."
 msgstr ""
 
-#: passwd.1.xml:152(term)
+#: passwd.1.xml:180(term)
 msgid "<option>-e</option>, <option>--expire</option>"
 msgstr "<option>-e</option>, <option>--expire</option>"
 
-#: passwd.1.xml:156(para)
+#: passwd.1.xml:184(para)
 msgid ""
 "Immediately expire an account's password. This in effect can force a user to "
 "change his/her password at the user's next login."
 msgstr ""
 
-#: passwd.1.xml:169(term)
+#: passwd.1.xml:197(term)
 msgid ""
 "<option>-i</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -3210,7 +3602,7 @@
 "<option>-i</option>, <option>--inactive</option><replaceable>NIEAKTYWNE</"
 "replaceable>"
 
-#: passwd.1.xml:173(para)
+#: passwd.1.xml:201(para)
 msgid ""
 "This option is used to disable an account after the password has been "
 "expired for a number of days. After a user account has had an expired "
@@ -3218,37 +3610,49 @@
 "longer sign on to the account."
 msgstr ""
 
-#: passwd.1.xml:182(term)
+#: passwd.1.xml:210(term)
 msgid "<option>-k</option>, <option>--keep-tokens</option>"
 msgstr "<option>-k</option>, <option>--keep-tokens</option>"
 
-#: passwd.1.xml:186(para)
+#: passwd.1.xml:214(para)
 msgid ""
 "Indicate password change should be performed only for expired authentication "
 "tokens (passwords). The user wishes to keep their non-expired tokens as "
 "before."
 msgstr ""
 
-#: passwd.1.xml:194(term)
+#: passwd.1.xml:222(term)
 msgid "<option>-l</option>, <option>--lock</option>"
 msgstr "<option>-l</option>, <option>--lock</option>"
 
-#: passwd.1.xml:198(para)
+#: passwd.1.xml:226(para)
 msgid ""
-"Lock the named account. This option disables an account by changing the "
-"password to a value which matches no possible encrypted value, and by "
-"setting the account expiry field to 1."
+"Lock the password of the named account. This option disables a password by "
+"changing it to a value which matches no possible encrypted value (it adds a "
+"´!´ at the beginning of the password)."
 msgstr ""
 
-#: passwd.1.xml:206(term) chage.1.xml:109(term)
+#: passwd.1.xml:232(para)
 msgid ""
+"Note that this does not disable the account. The user may still be able to "
+"login using another authentication token (e.g. an SSH key). To disable the "
+"account, administrators should use <command>usermod --expiredate 1</command> "
+"(this set the account's expire date to Jan 2, 1970)."
+msgstr ""
+
+#: passwd.1.xml:239(para)
+msgid "Users with a locked password are not allowed to change their password."
+msgstr ""
+
+#: passwd.1.xml:246(term) chage.1.xml:138(term)
+msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DNI</"
 "replaceable>"
 
-#: passwd.1.xml:210(para) chage.1.xml:113(para)
+#: passwd.1.xml:250(para) chage.1.xml:142(para)
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
@@ -3258,7 +3662,7 @@
 "<replaceable>MIN_DAYS</replaceable>. Wartość zerowa oznacza, że użytkownik "
 "może je zmieniać w dowolnym czasie."
 
-#: passwd.1.xml:228(term)
+#: passwd.1.xml:268(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
@@ -3266,36 +3670,38 @@
 "<option>-r</option>, <option>--repository</option><replaceable>REPOZYTORIUM</"
 "replaceable>"
 
-#: passwd.1.xml:232(para)
+#: passwd.1.xml:272(para)
 msgid "change password in <replaceable>REPOSITORY</replaceable> repository"
 msgstr ""
 
-#: passwd.1.xml:238(term)
+#: passwd.1.xml:278(term)
 msgid "<option>-S</option>, <option>--status</option>"
 msgstr "<option>-S</option>, <option>--status</option>"
 
-#: passwd.1.xml:242(para)
+#: passwd.1.xml:282(para)
 msgid ""
 "Display account status information. The status information consists of 7 "
 "fields. The first field is the user's login name. The second field indicates "
-"if the user account is locked (L), has no password (NP), or has a usable "
-"password (P). The third field gives the date of the last password change. "
-"The next four fields are the minimum age, maximum age, warning period, and "
-"inactivity period for the password. These ages are expressed in days."
+"if the user account has a locked password (L), has no password (NP), or has "
+"a usable password (P). The third field gives the date of the last password "
+"change. The next four fields are the minimum age, maximum age, warning "
+"period, and inactivity period for the password. These ages are expressed in "
+"days."
 msgstr ""
 
-#: passwd.1.xml:255(term)
+#: passwd.1.xml:296(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
 msgstr "<option>-u</option>, <option>--unlock</option>"
 
-#: passwd.1.xml:259(para)
+#: passwd.1.xml:300(para)
 msgid ""
-"Unlock the named account. This option re-enables an account by changing the "
-"password back to its previous value (to value before using <option>-l</"
-"option> option), and by resetting the account expiry field."
+"Unlock the password of the named account. This option re-enables a password "
+"by changing the password back to its previous value (to the value before "
+"using the <option>-l</option> option), and by resetting the account expiry "
+"field."
 msgstr ""
 
-#: passwd.1.xml:268(term)
+#: passwd.1.xml:310(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -3303,7 +3709,7 @@
 "<option>-w</option>, <option>--warndays</option><replaceable>DNI_OSTRZ</"
 "replaceable>"
 
-#: passwd.1.xml:272(para)
+#: passwd.1.xml:314(para)
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
@@ -3311,7 +3717,7 @@
 "about to expire."
 msgstr ""
 
-#: passwd.1.xml:281(term)
+#: passwd.1.xml:323(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -3319,13 +3725,13 @@
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DNI</"
 "replaceable>"
 
-#: passwd.1.xml:285(para)
+#: passwd.1.xml:327(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
 msgstr ""
 
-#: passwd.1.xml:297(para)
+#: passwd.1.xml:339(para)
 msgid ""
 "Not all options may be supported. Password complexity checking may vary from "
 "site to site. The user is urged to select a password as complex as he or she "
@@ -3333,68 +3739,68 @@
 "system if NIS is enabled and they are not logged into the NIS server."
 msgstr ""
 
-#: passwd.1.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: gpasswd.1.xml:2(term) chpasswd.8.xml:2(term) chgpasswd.8.xml:2(term)
+#: passwd.1.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: gpasswd.1.xml:30(term) chpasswd.8.xml:30(term) chgpasswd.8.xml:30(term)
 msgid "<option>ENCRYPT_METHOD</option> (string)"
 msgstr ""
 
-#: passwd.1.xml:4(para) newusers.8.xml:4(para) login.defs.5.xml:4(para)
-#: gpasswd.1.xml:4(para) chpasswd.8.xml:4(para) chgpasswd.8.xml:4(para)
+#: passwd.1.xml:32(para) newusers.8.xml:32(para) login.defs.5.xml:32(para)
+#: gpasswd.1.xml:32(para) chpasswd.8.xml:32(para) chgpasswd.8.xml:32(para)
 msgid ""
 "This defines the system default encryption algorithm for encrypting "
 "passwords (if no algorithm are specified on the command line)."
 msgstr ""
 
-#: passwd.1.xml:12(para) newusers.8.xml:12(para) login.defs.5.xml:12(para)
-#: gpasswd.1.xml:12(para) chpasswd.8.xml:12(para) chgpasswd.8.xml:12(para)
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
 msgid "<replaceable>DES</replaceable> (default)"
 msgstr ""
 
-#: passwd.1.xml:15(replaceable) newusers.8.xml:15(replaceable)
-#: login.defs.5.xml:15(replaceable) gpasswd.1.xml:15(replaceable)
-#: chpasswd.8.xml:15(replaceable) chgpasswd.8.xml:15(replaceable)
+#: passwd.1.xml:43(replaceable) newusers.8.xml:43(replaceable)
+#: login.defs.5.xml:43(replaceable) gpasswd.1.xml:43(replaceable)
+#: chpasswd.8.xml:43(replaceable) chgpasswd.8.xml:43(replaceable)
 msgid "MD5"
 msgstr ""
 
-#: passwd.1.xml:18(replaceable) newusers.8.xml:18(replaceable)
-#: login.defs.5.xml:18(replaceable) gpasswd.1.xml:18(replaceable)
-#: chpasswd.8.xml:18(replaceable) chgpasswd.8.xml:18(replaceable)
+#: passwd.1.xml:46(replaceable) newusers.8.xml:46(replaceable)
+#: login.defs.5.xml:46(replaceable) gpasswd.1.xml:46(replaceable)
+#: chpasswd.8.xml:46(replaceable) chgpasswd.8.xml:46(replaceable)
 msgid "SHA256"
 msgstr ""
 
-#: passwd.1.xml:21(replaceable) newusers.8.xml:21(replaceable)
-#: login.defs.5.xml:21(replaceable) gpasswd.1.xml:21(replaceable)
-#: chpasswd.8.xml:21(replaceable) chgpasswd.8.xml:21(replaceable)
+#: passwd.1.xml:49(replaceable) newusers.8.xml:49(replaceable)
+#: login.defs.5.xml:49(replaceable) gpasswd.1.xml:49(replaceable)
+#: chpasswd.8.xml:49(replaceable) chgpasswd.8.xml:49(replaceable)
 msgid "SHA512"
 msgstr ""
 
-#: passwd.1.xml:8(para) newusers.8.xml:8(para) login.defs.5.xml:8(para)
-#: gpasswd.1.xml:8(para) chpasswd.8.xml:8(para) chgpasswd.8.xml:8(para)
+#: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
+#: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
 msgid "It can take one of these values: <placeholder-1/>"
 msgstr ""
 
-#: passwd.1.xml:25(para) newusers.8.xml:25(para) login.defs.5.xml:25(para)
-#: gpasswd.1.xml:25(para) chpasswd.8.xml:25(para) chgpasswd.8.xml:25(para)
+#: passwd.1.xml:53(para) newusers.8.xml:53(para) login.defs.5.xml:53(para)
+#: gpasswd.1.xml:53(para) chpasswd.8.xml:53(para) chgpasswd.8.xml:53(para)
 msgid ""
 "Note: this parameter overrides the <option>MD5_CRYPT_ENAB</option> variable."
 msgstr ""
 
-#: passwd.1.xml:29(para) passwd.1.xml:23(para) newusers.8.xml:29(para)
-#: newusers.8.xml:23(para) login.defs.5.xml:29(para) login.defs.5.xml:23(para)
-#: gpasswd.1.xml:29(para) gpasswd.1.xml:23(para) chpasswd.8.xml:29(para)
-#: chpasswd.8.xml:23(para) chgpasswd.8.xml:29(para) chgpasswd.8.xml:23(para)
+#: passwd.1.xml:57(para) passwd.1.xml:53(para) newusers.8.xml:57(para)
+#: newusers.8.xml:53(para) login.defs.5.xml:57(para) login.defs.5.xml:53(para)
+#: gpasswd.1.xml:57(para) gpasswd.1.xml:53(para) chpasswd.8.xml:57(para)
+#: chpasswd.8.xml:53(para) chgpasswd.8.xml:57(para) chgpasswd.8.xml:53(para)
 msgid ""
 "Note: if you use PAM, it is recommended to set this variable consistently "
 "with the PAM modules configuration."
 msgstr ""
 
-#: passwd.1.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: gpasswd.1.xml:2(term) chpasswd.8.xml:2(term) chgpasswd.8.xml:2(term)
+#: passwd.1.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: gpasswd.1.xml:32(term) chpasswd.8.xml:32(term) chgpasswd.8.xml:32(term)
 msgid "<option>MD5_CRYPT_ENAB</option> (boolean)"
 msgstr ""
 
-#: passwd.1.xml:4(para) newusers.8.xml:4(para) login.defs.5.xml:4(para)
-#: gpasswd.1.xml:4(para) chpasswd.8.xml:4(para) chgpasswd.8.xml:4(para)
+#: passwd.1.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
+#: gpasswd.1.xml:34(para) chpasswd.8.xml:34(para) chgpasswd.8.xml:34(para)
 msgid ""
 "Indicate if passwords must be encrypted using the MD5-based algorithm. If "
 "set to <replaceable>yes</replaceable>, new passwords will be encrypted using "
@@ -3405,57 +3811,57 @@
 "<replaceable>no</replaceable>."
 msgstr ""
 
-#: passwd.1.xml:14(para) newusers.8.xml:14(para) login.defs.5.xml:14(para)
-#: gpasswd.1.xml:14(para) chpasswd.8.xml:14(para) chgpasswd.8.xml:14(para)
+#: passwd.1.xml:44(para) newusers.8.xml:44(para) login.defs.5.xml:44(para)
+#: gpasswd.1.xml:44(para) chpasswd.8.xml:44(para) chgpasswd.8.xml:44(para)
 msgid ""
 "This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
 "or by any command line option used to configure the encryption algorithm."
 msgstr ""
 
-#: passwd.1.xml:19(para) newusers.8.xml:19(para) login.defs.5.xml:19(para)
-#: gpasswd.1.xml:19(para) chpasswd.8.xml:19(para) chgpasswd.8.xml:19(para)
+#: passwd.1.xml:49(para) newusers.8.xml:49(para) login.defs.5.xml:49(para)
+#: gpasswd.1.xml:49(para) chpasswd.8.xml:49(para) chgpasswd.8.xml:49(para)
 msgid ""
 "This variable is deprecated. You should use <option>ENCRYPT_METHOD</option>."
 msgstr ""
 
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>OBSCURE_CHECKS_ENAB</option> (boolean)"
 msgstr "GID_MAX (numer)"
 
-#: passwd.1.xml:4(para) login.defs.5.xml:4(para)
+#: passwd.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Enable additional checks upon password changes."
 msgstr ""
 
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_ALWAYS_WARN</option> (boolean)"
 msgstr "GID_MAX (numer)"
 
-#: passwd.1.xml:4(para) login.defs.5.xml:4(para)
+#: passwd.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Warn about weak passwords (but still allow them) if you are root."
 msgstr ""
 
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_CHANGE_TRIES</option> (number)"
 msgstr "PASS_WARN_AGE (numer)"
 
-#: passwd.1.xml:4(para) login.defs.5.xml:4(para)
+#: passwd.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Maximum number of attempts to change password if rejected (too easy)."
 msgstr ""
 
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_MAX_LEN</option> (number)"
 msgstr "PASS_MAX_DAYS (numer)"
 
-#: passwd.1.xml:3(term) login.defs.5.xml:3(term)
+#: passwd.1.xml:33(term) login.defs.5.xml:33(term)
 #, fuzzy
 msgid "<option>PASS_MIN_LEN</option> (number)"
 msgstr "PASS_MIN_DAYS (numer)"
 
-#: passwd.1.xml:5(para) login.defs.5.xml:5(para)
+#: passwd.1.xml:35(para) login.defs.5.xml:35(para)
 msgid ""
 "Number of significant characters in the password for crypt(). "
 "<option>PASS_MAX_LEN</option> is 8 by default. Don't change unless your crypt"
@@ -3463,18 +3869,18 @@
 "<replaceable>yes</replaceable>."
 msgstr ""
 
-#: passwd.1.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: gpasswd.1.xml:2(term) chpasswd.8.xml:2(term) chgpasswd.8.xml:2(term)
+#: passwd.1.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: gpasswd.1.xml:30(term) chpasswd.8.xml:30(term) chgpasswd.8.xml:30(term)
 msgid "<option>SHA_CRYPT_MIN_ROUNDS</option> (number)"
 msgstr ""
 
-#: passwd.1.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
-#: gpasswd.1.xml:3(term) chpasswd.8.xml:3(term) chgpasswd.8.xml:3(term)
+#: passwd.1.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
+#: gpasswd.1.xml:31(term) chpasswd.8.xml:31(term) chgpasswd.8.xml:31(term)
 msgid "<option>SHA_CRYPT_MAX_ROUNDS</option> (number)"
 msgstr ""
 
-#: passwd.1.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
-#: gpasswd.1.xml:5(para) chpasswd.8.xml:5(para) chgpasswd.8.xml:5(para)
+#: passwd.1.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
+#: gpasswd.1.xml:33(para) chpasswd.8.xml:33(para) chgpasswd.8.xml:33(para)
 msgid ""
 "When <option>ENCRYPT_METHOD</option> is set to <replaceable>SHA256</"
 "replaceable> or <replaceable>SHA512</replaceable>, this defines the number "
@@ -3482,60 +3888,60 @@
 "of rounds is not specified on the command line)."
 msgstr ""
 
-#: passwd.1.xml:12(para) newusers.8.xml:12(para) login.defs.5.xml:12(para)
-#: gpasswd.1.xml:12(para) chpasswd.8.xml:12(para) chgpasswd.8.xml:12(para)
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
 msgid ""
 "With a lot of rounds, it is more difficult to brute forcing the password. "
 "But note also that more CPU resources will be needed to authenticate users."
 msgstr ""
 
-#: passwd.1.xml:17(para) newusers.8.xml:17(para) login.defs.5.xml:17(para)
-#: gpasswd.1.xml:17(para) chpasswd.8.xml:17(para) chgpasswd.8.xml:17(para)
+#: passwd.1.xml:45(para) newusers.8.xml:45(para) login.defs.5.xml:45(para)
+#: gpasswd.1.xml:45(para) chpasswd.8.xml:45(para) chgpasswd.8.xml:45(para)
 msgid ""
 "If not specified, the libc will choose the default number of rounds (5000)."
 msgstr ""
 
-#: passwd.1.xml:21(para) newusers.8.xml:21(para) login.defs.5.xml:21(para)
-#: gpasswd.1.xml:21(para) chpasswd.8.xml:21(para) chgpasswd.8.xml:21(para)
+#: passwd.1.xml:49(para) newusers.8.xml:49(para) login.defs.5.xml:49(para)
+#: gpasswd.1.xml:49(para) chpasswd.8.xml:49(para) chgpasswd.8.xml:49(para)
 msgid "The values must be inside the 1000-999999999 range."
 msgstr ""
 
-#: passwd.1.xml:24(para) newusers.8.xml:24(para) login.defs.5.xml:24(para)
-#: gpasswd.1.xml:24(para) chpasswd.8.xml:24(para) chgpasswd.8.xml:24(para)
+#: passwd.1.xml:52(para) newusers.8.xml:52(para) login.defs.5.xml:52(para)
+#: gpasswd.1.xml:52(para) chpasswd.8.xml:52(para) chgpasswd.8.xml:52(para)
 msgid ""
 "If only one of the <option>SHA_CRYPT_MIN_ROUNDS</option> or "
 "<option>SHA_CRYPT_MAX_ROUNDS</option> values is set, then this value will be "
 "used."
 msgstr ""
 
-#: passwd.1.xml:29(para) newusers.8.xml:29(para) login.defs.5.xml:29(para)
-#: gpasswd.1.xml:29(para) chpasswd.8.xml:29(para) chgpasswd.8.xml:29(para)
+#: passwd.1.xml:57(para) newusers.8.xml:57(para) login.defs.5.xml:57(para)
+#: gpasswd.1.xml:57(para) chpasswd.8.xml:57(para) chgpasswd.8.xml:57(para)
 msgid ""
 "If <option>SHA_CRYPT_MIN_ROUNDS</option> &gt; <option>SHA_CRYPT_MAX_ROUNDS</"
 "option>, the highest value will be used."
 msgstr ""
 
-#: passwd.1.xml:356(para) chage.1.xml:212(para)
+#: passwd.1.xml:398(para) chage.1.xml:241(para)
 msgid "permission denied"
 msgstr "brak dostępu"
 
-#: passwd.1.xml:362(para)
+#: passwd.1.xml:404(para)
 msgid "invalid combination of options"
 msgstr "nieprawidłowa kombinacja opcji"
 
-#: passwd.1.xml:368(para)
+#: passwd.1.xml:410(para)
 msgid "unexpected failure, nothing done"
 msgstr ""
 
-#: passwd.1.xml:374(para)
+#: passwd.1.xml:416(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr ""
 
-#: passwd.1.xml:380(para)
+#: passwd.1.xml:422(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr ""
 
-#: passwd.1.xml:344(para)
+#: passwd.1.xml:386(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -3543,78 +3949,96 @@
 "Polecenie <command>passwd</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: passwd.1.xml:395(para)
+#: passwd.1.xml:437(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
+"citerefentry>. <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
+"citerefentry>, <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: nologin.8.xml:5(refentrytitle) nologin.8.xml:10(refname)
-#: nologin.8.xml:16(command)
+#: nologin.8.xml:34(refentrytitle) nologin.8.xml:39(refname)
+#: nologin.8.xml:45(command)
 msgid "nologin"
 msgstr "nologin"
 
-#: nologin.8.xml:11(refpurpose)
+#: nologin.8.xml:40(refpurpose)
 msgid "politely refuse a login"
 msgstr ""
 
-#: nologin.8.xml:22(para)
+#: nologin.8.xml:51(para)
 msgid ""
 "The <command>nologin</command> command displays a message that an account is "
 "not available and exits non-zero. It is intended as a replacement shell "
 "field for accounts that have been disabled."
 msgstr ""
 
-#: nologin.8.xml:27(para)
+#: nologin.8.xml:56(para)
 msgid ""
 "To disable all logins, investigate <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
-#: nologin.8.xml:36(para)
+#: nologin.8.xml:65(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
 
-#: nologin.8.xml:47(title)
-msgid "HYSTORY"
+#: nologin.8.xml:76(title)
+msgid "HISTORY"
 msgstr ""
 
-#: nologin.8.xml:48(para)
-msgid "The <command>nologin</command> command appeared in BSD 4.4."
+#: nologin.8.xml:77(para)
+msgid "The <command>nologin</command> command appearred in BSD 4.4."
 msgstr ""
 
-#: newusers.8.xml:21(refentrytitle) newusers.8.xml:26(refname)
-#: newusers.8.xml:32(command) login.defs.5.xml:321(term)
+#: newusers.8.xml:50(refentrytitle) newusers.8.xml:55(refname)
+#: newusers.8.xml:61(command) login.defs.5.xml:353(term)
 msgid "newusers"
 msgstr "newusers"
 
-#: newusers.8.xml:27(refpurpose)
+#: newusers.8.xml:56(refpurpose)
 msgid "update and create new users in batch"
 msgstr "wsadowa aktualizacja i tworzenie nowych użytkowników"
 
-#: newusers.8.xml:34(replaceable)
+#: newusers.8.xml:63(replaceable)
 msgid "new_users"
 msgstr "new_users"
 
-#: newusers.8.xml:41(para)
+#: newusers.8.xml:70(para)
+#, fuzzy
+#| msgid ""
+#| "The <command>newusers</command> command reads a file of user name and "
+#| "clear-text password pairs and uses this information to update a group of "
+#| "existing users or to create new users. Each line is in the same format as "
+#| "the standard password file (see <citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the following "
+#| "exceptions:"
 msgid ""
 "The <command>newusers</command> command reads a file of user name and clear-"
 "text password pairs and uses this information to update a group of existing "
 "users or to create new users. Each line is in the same format as the "
 "standard password file (see <citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the following "
-"exceptions:"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the exceptions "
+"explained below:"
 msgstr ""
 "Polecenie <command>newusers</command> odczytuje z pliku nazwa użytkowników i "
 "podane jawnym tekstem hasło. Odczytane informacje wykorzystywane są do "
@@ -3623,111 +4047,226 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>), z następującymi wyjątkami:"
 
-#: newusers.8.xml:53(emphasis)
+#: newusers.8.xml:78(para)
+msgid "pw_name:pw_passwd:pw_uid:pw_gid:pw_gecos:pw_dir:pw_shell"
+msgstr ""
+
+#: newusers.8.xml:83(emphasis)
+#, fuzzy
+#| msgid "*name"
+msgid "pw_name"
+msgstr "*name"
+
+#: newusers.8.xml:86(para)
+msgid "This is the name of the user."
+msgstr ""
+
+#: newusers.8.xml:89(para)
+msgid ""
+"It can be the name of a new user or the name of an existing user (or an user "
+"created before by <command>newusers</command>). In case of an existing user, "
+"the user's information will be changed, otherwise a new user will be created."
+msgstr ""
+
+#: newusers.8.xml:100(emphasis)
 msgid "pw_passwd"
 msgstr "pw_passwd"
 
-#: newusers.8.xml:56(para)
+#: newusers.8.xml:103(para)
 msgid ""
 "This field will be encrypted and used as the new value of the encrypted "
 "password."
 msgstr ""
 "To pole zostanie zakodowane i użyte jako nowa wartość zakodowanego hasła."
 
-#: newusers.8.xml:64(emphasis)
+#: newusers.8.xml:111(emphasis)
+#, fuzzy
+#| msgid "pw_gid"
+msgid "pw_uid"
+msgstr "pw_gid"
+
+#: newusers.8.xml:114(para)
+msgid "This field is used to define the UID of the user."
+msgstr ""
+
+#: newusers.8.xml:117(para)
+msgid ""
+"If the field is empty, an new (unused) UID will be defined automatically by "
+"<command>newusers</command>."
+msgstr ""
+
+#: newusers.8.xml:121(para)
+msgid "If this field contains a number, this number will be used as the UID."
+msgstr ""
+
+#: newusers.8.xml:125(para)
+msgid ""
+"If this field contains the name of an existing user (or the name of an user "
+"created before by <command>newusers</command>), the UID of the specified "
+"user will be used."
+msgstr ""
+
+#: newusers.8.xml:135(emphasis)
 msgid "pw_gid"
 msgstr "pw_gid"
 
-#: newusers.8.xml:67(para)
+#: newusers.8.xml:138(para)
+msgid "This field is used to define the primary group ID for the user."
+msgstr ""
+
+#: newusers.8.xml:141(para)
 msgid ""
-"This field must contain the name (or number) of a group. The user will be "
-"added as a member to this group. When a non-existent group name or number is "
-"specified, a new group will be created. In the case of a non-existent group "
-"number, both the name and the number of the new group will be this number."
+"If this field contains the name of an existing group (or a group created "
+"before by <command>newusers</command>), the GID of this group will be used "
+"as the primary group ID for the user."
 msgstr ""
 
-#: newusers.8.xml:78(emphasis)
+#: newusers.8.xml:147(para)
+msgid ""
+"If this field is a number, this number will be used as the primary group ID "
+"of the user. If no groups exist with this GID, a new group will be created "
+"with this GID, and the name of the user."
+msgstr ""
+
+#: newusers.8.xml:153(para)
+msgid ""
+"If this field is empty, a new group will be created with the name of the "
+"user and a GID will be automatically defined by <command>newusers</command> "
+"to be used as the primary group ID for the user and as the GID for the new "
+"group."
+msgstr ""
+
+#: newusers.8.xml:159(para)
+msgid ""
+"If this field contains the name of a group which does not exist (and was not "
+"created earlier wbefore by <command>newusers</command>), a new group will be "
+"created with the specified name and a GID will be automatically defined by "
+"<command>newusers</command> to be used as the primary group ID for the user "
+"and Gs the ID for the new group."
+msgstr ""
+
+#: newusers.8.xml:171(emphasis)
+msgid "pw_gecos"
+msgstr ""
+
+#: newusers.8.xml:174(para)
+msgid "This field is copied in the GECOS field of the user."
+msgstr ""
+
+#: newusers.8.xml:181(emphasis)
 msgid "pw_dir"
 msgstr "pw_dir"
 
-#: newusers.8.xml:81(para)
+#: newusers.8.xml:184(para)
+msgid "This field is used to define the home directory of the user."
+msgstr ""
+
+#: newusers.8.xml:187(para)
 msgid ""
-"This field will be checked for existence as a directory, and a new directory "
-"with this name will be created if it does not already exist. The ownership "
-"of the directory will be set to be that of the user being created or updated."
+"If this field does not specify an existing directory, the specified "
+"directory is created, with ownership set to the user being created or "
+"updated and its primary group."
 msgstr ""
 
-#: newusers.8.xml:91(para)
+#: newusers.8.xml:196(emphasis)
+msgid "pw_shell"
+msgstr ""
+
+#: newusers.8.xml:199(para)
 msgid ""
+"This field defines the shell of the user. No checks are performed on this "
+"field."
+msgstr ""
+
+#: newusers.8.xml:207(para)
+msgid ""
+"<command>newusers</command> first tries to create or change all the "
+"specified users, and then write these changes to the user or group "
+"databases. If an error occurs (except in the final writes to the databases), "
+"no changes are committed to the databases."
+msgstr ""
+
+#: newusers.8.xml:214(para)
+msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are updated at a single time."
 msgstr ""
 
-#: newusers.8.xml:99(para)
+#: newusers.8.xml:222(para)
 #, fuzzy
 #| msgid ""
 #| "The options which apply to the <command>usermod</command> command are:"
 msgid "The options which apply to the <command>newusers</command> command are:"
 msgstr "Polecenie <command>usermod</command> posiada następujące opcje:"
 
-#: newusers.8.xml:103(term) chpasswd.8.xml:66(term) chgpasswd.8.xml:66(term)
+#: newusers.8.xml:226(term) chpasswd.8.xml:95(term) chgpasswd.8.xml:95(term)
 #, fuzzy
 msgid "<option>-c</option>, <option>--crypt-method</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: newusers.8.xml:105(para) chpasswd.8.xml:68(para) chgpasswd.8.xml:68(para)
+#: newusers.8.xml:228(para) chpasswd.8.xml:97(para) chgpasswd.8.xml:97(para)
 msgid "Use the specified method to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:106(para) chpasswd.8.xml:69(para) chgpasswd.8.xml:69(para)
+#: newusers.8.xml:229(para) chpasswd.8.xml:101(para) chgpasswd.8.xml:101(para)
 msgid ""
 "The available methods are DES, MD5, NONE, and SHA256 or SHA512 if your libc "
 "support these methods."
 msgstr ""
 
-#: newusers.8.xml:132(term) chpasswd.8.xml:97(term) chgpasswd.8.xml:97(term)
+#: newusers.8.xml:243(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: newusers.8.xml:255(term) chpasswd.8.xml:129(term) chgpasswd.8.xml:129(term)
 #, fuzzy
 msgid "<option>-s</option>, <option>--sha-rounds</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: newusers.8.xml:134(para) chpasswd.8.xml:99(para) chgpasswd.8.xml:99(para)
+#: newusers.8.xml:257(para) chpasswd.8.xml:131(para) chgpasswd.8.xml:131(para)
 msgid "Use the specified number of rounds to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:137(para) chpasswd.8.xml:102(para) chgpasswd.8.xml:102(para)
+#: newusers.8.xml:260(para) chpasswd.8.xml:134(para) chgpasswd.8.xml:134(para)
 msgid ""
 "The value 0 means that the system will choose the default number of rounds "
 "for the crypt method (5000)."
 msgstr ""
 
-#: newusers.8.xml:141(para) chpasswd.8.xml:106(para) chgpasswd.8.xml:106(para)
+#: newusers.8.xml:264(para) chpasswd.8.xml:138(para) chgpasswd.8.xml:138(para)
 msgid ""
 "A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
 msgstr ""
 
-#: newusers.8.xml:145(para) chpasswd.8.xml:110(para) chgpasswd.8.xml:110(para)
+#: newusers.8.xml:268(para) chpasswd.8.xml:142(para) chgpasswd.8.xml:142(para)
 msgid "You can only use this option with the SHA256 or SHA512 crypt method."
 msgstr ""
 
-#: newusers.8.xml:149(para) chpasswd.8.xml:114(para) chgpasswd.8.xml:114(para)
+#: newusers.8.xml:272(para) chpasswd.8.xml:146(para) chgpasswd.8.xml:146(para)
 msgid ""
 "By default, the number of rounds is defined by the SHA_CRYPT_MIN_ROUNDS and "
 "SHA_CRYPT_MAX_ROUNDS variables in <filename>/etc/login.defs</filename>."
 msgstr ""
 
-#: newusers.8.xml:161(para)
+#: newusers.8.xml:284(para)
 msgid ""
 "The input file must be protected since it contains unencrypted passwords."
 msgstr ""
 
-#: newusers.8.xml:165(para) chpasswd.8.xml:130(para)
+#: newusers.8.xml:288(para) chpasswd.8.xml:162(para)
 msgid ""
 "PAM is not used to update the passwords. Only <filename>/etc/passwd</"
 "filename> and <filename>/etc/shadow</filename> are updated, and the various "
 "checks or options provided by PAM modules are not used."
 msgstr ""
 
-#: newusers.8.xml:234(para)
+#: newusers.8.xml:357(para)
 msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -3741,22 +4280,22 @@
 "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: newgrp.1.xml:9(refentrytitle) newgrp.1.xml:14(refname)
-#: newgrp.1.xml:20(command) login.defs.5.xml:313(term)
+#: newgrp.1.xml:38(refentrytitle) newgrp.1.xml:43(refname)
+#: newgrp.1.xml:49(command)
 msgid "newgrp"
 msgstr "newgrp"
 
-#: newgrp.1.xml:15(refpurpose)
+#: newgrp.1.xml:44(refpurpose)
 msgid "log in to a new group"
 msgstr ""
 
-#: newgrp.1.xml:21(replaceable) grpck.8.xml:22(replaceable)
-#: grpck.8.xml:31(replaceable) groupdel.8.xml:22(replaceable)
-#: groupadd.8.xml:30(replaceable) gpasswd.1.xml:34(replaceable)
+#: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
+#: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
+#: groupadd.8.xml:56(replaceable) gpasswd.1.xml:63(replaceable)
 msgid "group"
 msgstr "group"
 
-#: newgrp.1.xml:27(para)
+#: newgrp.1.xml:56(para)
 msgid ""
 "The <command>newgrp</command> command is used to change the current group ID "
 "during a login session. If the optional <option>-</option> flag is given, "
@@ -3765,7 +4304,7 @@
 "remains unchanged."
 msgstr ""
 
-#: newgrp.1.xml:35(para)
+#: newgrp.1.xml:64(para)
 msgid ""
 "<command>newgrp</command> changes the current real group ID to the named "
 "group, or to the default group listed in <filename>/etc/passwd</filename> if "
@@ -3779,7 +4318,7 @@
 "as a member."
 msgstr ""
 
-#: newgrp.1.xml:49(para)
+#: newgrp.1.xml:78(para)
 msgid ""
 "If there is an entry for this group in <filename>/etc/gshadow</filename>, "
 "then the list of members and the password of this group will be taken from "
@@ -3787,7 +4326,7 @@
 "considered."
 msgstr ""
 
-#: newgrp.1.xml:101(para)
+#: newgrp.1.xml:130(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -3812,16 +4351,16 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
-#: logoutd.8.xml:5(refentrytitle) logoutd.8.xml:10(refname)
-#: logoutd.8.xml:16(command)
+#: logoutd.8.xml:34(refentrytitle) logoutd.8.xml:39(refname)
+#: logoutd.8.xml:45(command)
 msgid "logoutd"
 msgstr "logoutd"
 
-#: logoutd.8.xml:11(refpurpose)
+#: logoutd.8.xml:40(refpurpose)
 msgid "Enforce login time restrictions"
 msgstr ""
 
-#: logoutd.8.xml:22(para)
+#: logoutd.8.xml:51(para)
 msgid ""
 "<command>logoutd</command> enforces the login time and port restrictions "
 "specified in <filename>/etc/porttime</filename>. <command>logoutd</command> "
@@ -3832,23 +4371,23 @@
 "porttime</filename> is terminated."
 msgstr ""
 
-#: logoutd.8.xml:44(filename) login.1.xml:283(filename)
+#: logoutd.8.xml:73(filename) login.1.xml:319(filename)
 msgid "/var/run/utmp"
 msgstr "/var/run/utmp"
 
-#: logoutd.8.xml:46(para) login.1.xml:285(para)
+#: logoutd.8.xml:75(para) login.1.xml:321(para)
 msgid "List of current login sessions."
 msgstr ""
 
-#: login.defs.5.xml:66(refentrytitle) login.defs.5.xml:71(refname)
+#: login.defs.5.xml:97(refentrytitle) login.defs.5.xml:102(refname)
 msgid "login.defs"
 msgstr "login.defs"
 
-#: login.defs.5.xml:72(refpurpose)
+#: login.defs.5.xml:103(refpurpose)
 msgid "shadow password suite configuration"
 msgstr ""
 
-#: login.defs.5.xml:77(para)
+#: login.defs.5.xml:108(para)
 msgid ""
 "The <filename>/etc/login.defs</filename> file defines the site-specific "
 "configuration for the shadow password suite. This file is required. Absence "
@@ -3856,7 +4395,7 @@
 "undesirable operation."
 msgstr ""
 
-#: login.defs.5.xml:84(para)
+#: login.defs.5.xml:115(para)
 msgid ""
 "This file is a readable text file, each line of the file describing one "
 "configuration parameter. The lines consist of a configuration name and "
@@ -3865,7 +4404,7 @@
 "the first non-white character of the line."
 msgstr ""
 
-#: login.defs.5.xml:92(para)
+#: login.defs.5.xml:123(para)
 msgid ""
 "Parameter values may be of four types: strings, booleans, numbers, and long "
 "numbers. A string is comprised of any printable characters. A boolean should "
@@ -3878,27 +4417,27 @@
 "and long numeric parameters is machine-dependent."
 msgstr ""
 
-#: login.defs.5.xml:107(para)
+#: login.defs.5.xml:138(para)
 msgid "The following configuration items are provided:"
 msgstr ""
 
-#: login.defs.5.xml:2(term) chfn.1.xml:2(term)
+#: login.defs.5.xml:32(term) chfn.1.xml:32(term)
 msgid "<option>CHFN_AUTH</option> (boolean)"
 msgstr ""
 
-#: login.defs.5.xml:4(para) chfn.1.xml:4(para)
+#: login.defs.5.xml:34(para) chfn.1.xml:34(para)
 msgid ""
 "If <replaceable>yes</replaceable>, the <command>chfn</command> program will "
 "require authentication before making any changes, unless run by the "
 "superuser."
 msgstr ""
 
-#: login.defs.5.xml:2(term) chfn.1.xml:2(term)
+#: login.defs.5.xml:32(term) chfn.1.xml:32(term)
 #, fuzzy
 msgid "<option>CHFN_RESTRICT</option> (string)"
 msgstr "CHFN_RESTRICT (łańcuch)"
 
-#: login.defs.5.xml:4(para) chfn.1.xml:4(para)
+#: login.defs.5.xml:34(para) chfn.1.xml:34(para)
 msgid ""
 "This parameter specifies which values in the <emphasis remap=\"I\">gecos</"
 "emphasis> field of the <filename>/etc/passwd</filename> file may be changed "
@@ -3913,24 +4452,24 @@
 "achieved by not installing <command>chfn</command> SUID."
 msgstr ""
 
-#: login.defs.5.xml:2(term) chsh.1.xml:2(term)
+#: login.defs.5.xml:32(term) chsh.1.xml:32(term)
 #, fuzzy
 msgid "<option>CHSH_AUTH</option> (boolean)"
 msgstr "GID_MAX (numer)"
 
-#: login.defs.5.xml:4(para) chsh.1.xml:4(para)
+#: login.defs.5.xml:34(para) chsh.1.xml:34(para)
 msgid ""
 "If <replaceable>yes</replaceable>, the <command>chsh</command> program will "
 "require authentication before making any changes, unless run by the "
 "superuser."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ERASECHAR</option> (number)"
 msgstr "UMASK (number)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 #, fuzzy
 msgid ""
 "Terminal ERASE character (<replaceable>010</replaceable> = backspace, "
@@ -3939,61 +4478,61 @@
 "Nazwa grupy zostanie zmieniona z <replaceable>GRUPA</replaceable> na nazwę "
 "<replaceable>NOWA_GRUPA</replaceable>."
 
-#: login.defs.5.xml:8(para) login.defs.5.xml:7(para) login.1.xml:8(para)
-#: login.1.xml:7(para)
+#: login.defs.5.xml:38(para) login.defs.5.xml:37(para) login.1.xml:38(para)
+#: login.1.xml:37(para)
 msgid ""
 "The value can be prefixed \"0\" for an octal value, or \"0x\" for an "
 "hexadecimal value."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FAIL_DELAY</option> (number)"
 msgstr "PASS_MIN_DAYS (numer)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Delay in seconds before being allowed another attempt after a login failure."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FAILLOG_ENAB</option> (boolean)"
 msgstr "GID_MAX (numer)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Enable logging and display of <filename>/var/log/faillog</filename> login "
 "failure info."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FAKE_SHELL</option> (string)"
 msgstr "MAIL_DIR (łańcuch)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, <command>login</command> will execute this shell instead of the "
 "users' shell specified in <filename>/etc/passwd</filename>."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FTMP_FILE</option> (string)"
 msgstr "MAIL_DIR (łańcuch)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, login failures will be logged in this file in a utmp format."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>HUSHLOGIN_FILE</option> (string)"
 msgstr "CHFN_RESTRICT (łańcuch)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, this file can inhibit all the usual chatter during the login "
 "sequence. If a full pathname is specified, then hushed mode will be enabled "
@@ -4002,151 +4541,151 @@
 "directory."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ISSUE_FILE</option> (string)"
 msgstr "MAIL_DIR (łańcuch)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "If defined, this file will be displayed before each login prompt."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>KILLCHAR</option> (number)"
 msgstr "GID_MAX (numer)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Terminal KILL character (<replaceable>025</replaceable> = CTRL/U)."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LASTLOG_ENAB</option> (boolean)"
 msgstr "GID_MAX (numer)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable logging and display of /var/log/lastlog login time info."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOG_OK_LOGINS</option> (boolean)"
 msgstr "GID_MAX (numer)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable logging of successful logins."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOG_UNKFAIL_ENAB</option> (boolean)"
 msgstr "GID_MAX (numer)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable display of unknown usernames when login failures are recorded."
 msgstr ""
 
-#: login.defs.5.xml:8(para) login.1.xml:8(para)
+#: login.defs.5.xml:38(para) login.1.xml:38(para)
 msgid ""
 "Note: logging unknown usernames may be a security issue if an user enter her "
 "password instead of her login name."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOGIN_RETRIES</option> (number)"
 msgstr "GID_MIN (numer)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Maximum number of login retries in case of bad password."
 msgstr ""
 
-#: login.defs.5.xml:7(para) login.1.xml:7(para)
+#: login.defs.5.xml:37(para) login.1.xml:37(para)
 msgid ""
 "This will most likely be overriden by PAM, since the default pam_unix module "
 "has it's own built in of 3 retries. However, this is a safe fallback in case "
 "you are using an authentication module that does not enforce PAM_MAXTRIES."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOGIN_TIMEOUT</option> (number)"
 msgstr "GID_MAX (numer)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Max time in seconds for login."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>MOTD_FILE</option> (string)"
 msgstr "MAIL_DIR (łańcuch)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, \":\" delimited list of \"message of the day\" files to be "
 "displayed upon login."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>NOLOGINS_FILE</option> (string)"
 msgstr "CHFN_RESTRICT (łańcuch)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, name of file whose presence will inhibit non-root logins. The "
 "contents of this file should be a message indicating why logins are "
 "inhibited."
 msgstr ""
 
-#: login.defs.5.xml:149(para)
+#: login.defs.5.xml:181(para)
 msgid ""
 "<option>PASS_MAX_DAYS</option>, <option>PASS_MIN_DAYS</option> and "
 "<option>PASS_WARN_AGE</option> are only used at the time of account "
 "creation. Any changes to these settings won't affect existing accounts."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>PORTTIME_CHECKS_ENAB</option> (boolean)"
 msgstr "GID_MAX (numer)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable checking of time restrictions specified in /etc/porttime."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>TTYGROUP</option> (string)"
 msgstr "MAIL_DIR (łańcuch)"
 
-#: login.defs.5.xml:3(term) login.1.xml:3(term)
+#: login.defs.5.xml:33(term) login.1.xml:33(term)
 #, fuzzy
 msgid "<option>TTYPERM</option> (string)"
 msgstr "USERDEL_CMD (łańcuch)"
 
-#: login.defs.5.xml:5(para) login.1.xml:5(para)
+#: login.defs.5.xml:35(para) login.1.xml:35(para)
 msgid ""
 "The terminal permissions: the login tty will be owned by the "
 "<option>TTYGROUP</option> group, and the permissions will be set to "
 "<option>TTYPERM</option>."
 msgstr ""
 
-#: login.defs.5.xml:10(para) login.1.xml:10(para)
+#: login.defs.5.xml:40(para) login.1.xml:40(para)
 msgid ""
 "By default, the ownership of the terminal is set to the user's primary group "
 "and the permissions are set to <replaceable>0600</replaceable>."
 msgstr ""
 
-#: login.defs.5.xml:15(para) login.1.xml:15(para)
+#: login.defs.5.xml:45(para) login.1.xml:45(para)
 msgid ""
 "<option>TTYGROUP</option> can be either the name of a group or a numeric "
 "group identifier."
 msgstr ""
 
-#: login.defs.5.xml:19(para) login.1.xml:19(para)
+#: login.defs.5.xml:49(para) login.1.xml:49(para)
 msgid ""
 "If you have a <command>write</command> program which is \"setgid\" to a "
 "special group which owns the terminals, define TTYGROUP to the group number "
@@ -4154,130 +4693,129 @@
 "TTYPERM to either 622 or 600."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>TTYTYPE_FILE</option> (string)"
 msgstr "MAIL_DIR (łańcuch)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, file which maps tty line to TERM environment parameter. Each "
 "line of the file is in a format something like \"vt100 tty01\"."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ULIMIT</option> (number)"
 msgstr "UID_MIN (numer)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Default <command>ulimit</command> value."
 msgstr ""
 
-#: login.defs.5.xml:177(title)
+#: login.defs.5.xml:209(title)
 msgid "CROSS REFERENCES"
 msgstr ""
 
-#: login.defs.5.xml:178(para)
+#: login.defs.5.xml:210(para)
 msgid ""
 "The following cross references show which programs in the shadow password "
 "suite use which parameters."
 msgstr ""
 
-#: login.defs.5.xml:186(term) chfn.1.xml:12(refentrytitle)
-#: chfn.1.xml:17(refname) chfn.1.xml:23(command)
+#: login.defs.5.xml:218(term) chfn.1.xml:41(refentrytitle)
+#: chfn.1.xml:46(refname) chfn.1.xml:52(command)
 msgid "chfn"
 msgstr "chfn"
 
-#: login.defs.5.xml:188(para)
+#: login.defs.5.xml:220(para)
 msgid ""
 "<phrase condition=\"no_pam\">CHFN_AUTH</phrase> CHFN_RESTRICT <phrase "
 "condition=\"no_pam\">LOGIN_STRING</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:196(term) chgpasswd.8.xml:13(refentrytitle)
-#: chgpasswd.8.xml:18(refname) chgpasswd.8.xml:24(command)
+#: login.defs.5.xml:228(term) chgpasswd.8.xml:42(refentrytitle)
+#: chgpasswd.8.xml:47(refname) chgpasswd.8.xml:53(command)
 msgid "chgpasswd"
 msgstr "chgpasswd"
 
-#: login.defs.5.xml:198(para) login.defs.5.xml:228(para)
+#: login.defs.5.xml:230(para) login.defs.5.xml:260(para)
 msgid ""
 "ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB <phrase condition="
 "\"sha_crypt\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:206(term) chpasswd.8.xml:12(refentrytitle)
-#: chpasswd.8.xml:17(refname) chpasswd.8.xml:23(command)
+#: login.defs.5.xml:238(term) chpasswd.8.xml:41(refentrytitle)
+#: chpasswd.8.xml:46(refname) chpasswd.8.xml:52(command)
 msgid "chpasswd"
 msgstr "chpasswd"
 
-#: login.defs.5.xml:208(para)
+#: login.defs.5.xml:240(para)
 msgid ""
 "ENCRYPT_METHOD MD5_CRYPT_ENAB <phrase condition=\"sha_crypt"
 "\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:216(term) chsh.1.xml:11(refentrytitle)
-#: chsh.1.xml:16(refname) chsh.1.xml:22(command)
+#: login.defs.5.xml:248(term) chsh.1.xml:40(refentrytitle)
+#: chsh.1.xml:45(refname) chsh.1.xml:51(command)
 msgid "chsh"
 msgstr "chsh"
 
-#: login.defs.5.xml:218(para)
+#: login.defs.5.xml:250(para)
 #, fuzzy
 msgid "CHSH_AUTH LOGIN_STRING"
 msgstr "CHFN_AUTH CHFN_RESTRICT"
 
-#: login.defs.5.xml:226(term) gpasswd.1.xml:13(refentrytitle)
-#: gpasswd.1.xml:18(refname) gpasswd.1.xml:29(command)
+#: login.defs.5.xml:258(term) gpasswd.1.xml:42(refentrytitle)
+#: gpasswd.1.xml:47(refname) gpasswd.1.xml:58(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
-#: login.defs.5.xml:236(term) groupadd.8.xml:11(refentrytitle)
-#: groupadd.8.xml:16(refname) groupadd.8.xml:22(command)
+#: login.defs.5.xml:268(term) groupadd.8.xml:42(refentrytitle)
+#: groupadd.8.xml:47(refname) groupadd.8.xml:53(command)
 msgid "groupadd"
 msgstr "groupadd"
 
-#: login.defs.5.xml:238(para)
+#: login.defs.5.xml:270(para)
 #, fuzzy
 msgid "GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP SYS_GID_MAX SYS_GID_MIN"
 msgstr ""
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:245(term) groupdel.8.xml:9(refentrytitle)
-#: groupdel.8.xml:14(refname) groupdel.8.xml:20(command)
+#: login.defs.5.xml:277(term) groupdel.8.xml:38(refentrytitle)
+#: groupdel.8.xml:43(refname) groupdel.8.xml:49(command)
 msgid "groupdel"
 msgstr "groupdel"
 
-#: login.defs.5.xml:247(para) login.defs.5.xml:253(para)
-#: login.defs.5.xml:259(para) login.defs.5.xml:266(para)
-#: login.defs.5.xml:272(para) login.defs.5.xml:278(para)
-#: login.defs.5.xml:421(para)
+#: login.defs.5.xml:279(para) login.defs.5.xml:285(para)
+#: login.defs.5.xml:291(para) login.defs.5.xml:298(para)
+#: login.defs.5.xml:304(para) login.defs.5.xml:310(para)
 msgid "MAX_MEMBERS_PER_GROUP"
 msgstr ""
 
-#: login.defs.5.xml:251(term) groupmems.8.xml:9(refentrytitle)
-#: groupmems.8.xml:14(refname) groupmems.8.xml:20(command)
+#: login.defs.5.xml:283(term) groupmems.8.xml:38(refentrytitle)
+#: groupmems.8.xml:43(refname) groupmems.8.xml:49(command)
 msgid "groupmems"
 msgstr "groupmems"
 
-#: login.defs.5.xml:257(term) groupmod.8.xml:9(refentrytitle)
-#: groupmod.8.xml:14(refname) groupmod.8.xml:20(command)
+#: login.defs.5.xml:289(term) groupmod.8.xml:38(refentrytitle)
+#: groupmod.8.xml:43(refname) groupmod.8.xml:49(command)
 msgid "groupmod"
 msgstr "groupmod"
 
-#: login.defs.5.xml:264(term) grpck.8.xml:9(refentrytitle)
-#: grpck.8.xml:14(refname) grpck.8.xml:20(command) grpck.8.xml:29(command)
+#: login.defs.5.xml:296(term) grpck.8.xml:38(refentrytitle)
+#: grpck.8.xml:43(refname) grpck.8.xml:49(command) grpck.8.xml:58(command)
 msgid "grpck"
 msgstr "grpck"
 
-#: login.defs.5.xml:284(term) login.1.xml:41(refentrytitle)
-#: login.1.xml:46(refname) login.1.xml:52(command) login.1.xml:59(command)
-#: login.1.xml:65(command)
+#: login.defs.5.xml:316(term) login.1.xml:70(refentrytitle)
+#: login.1.xml:75(refname) login.1.xml:81(command) login.1.xml:89(command)
+#: login.1.xml:96(command)
 msgid "login"
 msgstr "login"
 
-#: login.defs.5.xml:286(para)
+#: login.defs.5.xml:318(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENV_PATH ENV_SUPATH ENV_TZ ENVIRON_FILE</"
@@ -4292,11 +4830,17 @@
 "phrase> USERGROUPS_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:315(para)
+#: login.defs.5.xml:345(term)
+#, fuzzy
+#| msgid "newgrp"
+msgid "newgrp / sg"
+msgstr "newgrp"
+
+#: login.defs.5.xml:347(para)
 msgid "SYSLOG_SG_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:323(para)
+#: login.defs.5.xml:355(para)
 #, fuzzy
 msgid ""
 "ENCRYPT_METHOD GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB "
@@ -4307,18 +4851,18 @@
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:339(para)
+#: login.defs.5.xml:371(para)
 msgid ""
 "ENCRYPT_METHOD MD5_CRYPT_ENAB OBSCURE_CHECKS_ENAB PASS_ALWAYS_WARN "
 "PASS_CHANGE_TRIES PASS_MAX_LEN PASS_MIN_LEN <phrase condition=\"sha_crypt"
 "\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:350(para) login.defs.5.xml:358(para)
+#: login.defs.5.xml:382(para) login.defs.5.xml:390(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 
-#: login.defs.5.xml:365(para)
+#: login.defs.5.xml:397(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENVIRON_FILE</phrase> ENV_PATH "
@@ -4328,46 +4872,60 @@
 "\">USERGROUPS_ENAB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:380(term)
+#: login.defs.5.xml:412(term)
 #, fuzzy
 msgid "sulogin"
 msgstr "login"
 
-#: login.defs.5.xml:382(para)
+#: login.defs.5.xml:414(para)
 msgid "ENV_HZ <phrase condition=\"no_pam\">ENV_TZ</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:391(para)
+#: login.defs.5.xml:423(para)
 #, fuzzy
 msgid ""
-"GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS PASS_MIN_DAYS "
-"PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN UID_MAX "
-"UID_MIN UMASK"
+"CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS "
+"PASS_MIN_DAYS PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN "
+"UID_MAX UID_MIN UMASK"
 msgstr ""
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:404(para)
+#: login.defs.5.xml:436(para)
 msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:413(para)
+#: login.defs.5.xml:445(para)
 msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP"
 msgstr ""
 
-#: login.defs.5.xml:429(para)
+#: login.defs.5.xml:456(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgid ""
 "Much of the functionality that used to be provided by the shadow password "
 "suite is now handled by PAM. Thus, <filename>/etc/login.defs</filename> is "
-"no longer used by programs such as: <citerefentry><refentrytitle>login</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>. Please refer to the corresponding PAM "
-"configuration files instead."
+"no longer used by <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, or less used by "
+"<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, and <citerefentry><refentrytitle>su</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>. Please refer to the "
+"corresponding PAM configuration files instead."
 msgstr ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: login.defs.5.xml:446(para)
+#: login.defs.5.xml:472(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -4389,22 +4947,22 @@
 "citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: login.access.5.xml:5(refentrytitle) login.access.5.xml:10(refname)
+#: login.access.5.xml:35(refentrytitle) login.access.5.xml:40(refname)
 msgid "login.access"
 msgstr "login.access"
 
-#: login.access.5.xml:11(refpurpose)
+#: login.access.5.xml:41(refpurpose)
 msgid "login access control table"
 msgstr ""
 
-#: login.access.5.xml:16(para)
+#: login.access.5.xml:46(para)
 msgid ""
 "The <emphasis remap=\"I\">login.access</emphasis> file specifies (user, "
 "host) combinations and/or (user, tty) combinations for which a login will be "
 "either accepted or refused."
 msgstr ""
 
-#: login.access.5.xml:22(para)
+#: login.access.5.xml:52(para)
 msgid ""
 "When someone logs in, the <emphasis remap=\"I\">login.access</emphasis> is "
 "scanned for the first entry that matches the (user, host) combination, or, "
@@ -4413,19 +4971,19 @@
 "whether the login will be accepted or refused."
 msgstr ""
 
-#: login.access.5.xml:30(para)
+#: login.access.5.xml:60(para)
 msgid ""
 "Each line of the login access control table has three fields separated by a "
 "\":\" character:"
 msgstr ""
 
-#: login.access.5.xml:35(para)
+#: login.access.5.xml:65(para)
 msgid ""
 "<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I\">users</"
 "emphasis>:<emphasis remap=\"I\">origins</emphasis>"
 msgstr ""
 
-#: login.access.5.xml:39(para)
+#: login.access.5.xml:69(para)
 msgid ""
 "The first field should be a \"<emphasis>+</emphasis>\" (access granted) or "
 "\"<emphasis>-</emphasis>\" (access denied) character. The second field "
@@ -4439,53 +4997,50 @@
 "@netgroupname in host or user patterns."
 msgstr ""
 
-#: login.access.5.xml:53(para)
+#: login.access.5.xml:83(para)
 msgid ""
 "The <emphasis>EXCEPT</emphasis> operator makes it possible to write very "
 "compact rules."
 msgstr ""
 
-#: login.access.5.xml:58(para)
+#: login.access.5.xml:88(para)
 msgid ""
 "The group file is searched only when a name does not match that of the "
 "logged-in user. Only groups are matched in which users are explicitly "
 "listed: the program does not look at a user's primary group id value."
 msgstr ""
 
-#: login.1.xml:47(refpurpose)
+#: login.1.xml:76(refpurpose)
 msgid "begin session on the system"
 msgstr ""
 
-#: login.1.xml:53(arg) login.1.xml:60(arg) login.1.xml:66(arg)
-#: login.1.xml:178(option) groupmems.8.xml:24(arg) groupmems.8.xml:65(option)
+#: login.1.xml:82(arg) login.1.xml:90(arg) login.1.xml:97(arg)
+#: login.1.xml:214(option) groupmems.8.xml:54(arg)
 msgid "-p"
 msgstr "-p"
 
-#: login.1.xml:55(replaceable) login.1.xml:62(replaceable)
-msgid "username"
-msgstr ""
-
-#: login.1.xml:56(replaceable)
-msgid "ENV=VAR"
-msgstr "ENV=VAR"
-
-#: login.1.xml:61(replaceable) login.1.xml:67(replaceable)
+#: login.1.xml:83(replaceable) login.1.xml:91(replaceable)
+#: login.1.xml:98(replaceable)
 msgid "host"
 msgstr ""
 
-#: login.1.xml:61(arg) chfn.1.xml:27(arg)
+#: login.1.xml:83(arg) login.1.xml:91(arg) chfn.1.xml:56(arg)
 msgid "-h <placeholder-1/>"
 msgstr "-h <placeholder-1/>"
 
-#: login.1.xml:62(arg) chfn.1.xml:24(arg)
-msgid "-f <placeholder-1/>"
-msgstr "-f <placeholder-1/>"
+#: login.1.xml:86(replaceable)
+msgid "ENV=VAR"
+msgstr "ENV=VAR"
 
-#: login.1.xml:67(arg) chfn.1.xml:25(arg)
+#: login.1.xml:92(arg) login.1.xml:192(option) expiry.1.xml:54(arg)
+msgid "-f"
+msgstr "-f"
+
+#: login.1.xml:98(arg) chfn.1.xml:54(arg)
 msgid "-r <placeholder-1/>"
 msgstr "-r <placeholder-1/>"
 
-#: login.1.xml:73(para)
+#: login.1.xml:104(para)
 msgid ""
 "The <command>login</command> program is used to establish a new session with "
 "the system. It is normally invoked automatically by responding to the "
@@ -4499,7 +5054,7 @@
 "produce an error message."
 msgstr ""
 
-#: login.1.xml:87(para)
+#: login.1.xml:118(para)
 msgid ""
 "The user is then prompted for a password, where appropriate. Echoing is "
 "disabled to prevent revealing the password. Only a small number of password "
@@ -4507,7 +5062,7 @@
 "communications link is severed."
 msgstr ""
 
-#: login.1.xml:94(para)
+#: login.1.xml:125(para)
 msgid ""
 "If password aging has been enabled for your account, you may be prompted for "
 "a new password before proceeding. You will be forced to provide your old "
@@ -4516,7 +5071,7 @@
 "citerefentry> for more information."
 msgstr ""
 
-#: login.1.xml:103(para)
+#: login.1.xml:134(para)
 msgid ""
 "After a successful login, you will be informed of any system messages and "
 "the presence of mail. You may turn off the printing of the system message "
@@ -4527,7 +5082,7 @@
 "the condition of your mailbox."
 msgstr ""
 
-#: login.1.xml:114(para)
+#: login.1.xml:145(para)
 msgid ""
 "Your user and group ID will be set according to their values in the "
 "<filename>/etc/passwd</filename> file. The value for <envar>$HOME</envar>, "
@@ -4537,21 +5092,21 @@
 "entries in the GECOS field."
 msgstr ""
 
-#: login.1.xml:123(para)
+#: login.1.xml:154(para)
 msgid ""
 "On some installations, the environmental variable <envar>$TERM</envar> will "
 "be initialized to the terminal type on your tty line, as specified in "
 "<filename>/etc/ttytype</filename>."
 msgstr ""
 
-#: login.1.xml:129(para)
+#: login.1.xml:160(para)
 msgid ""
 "An initialization script for your command interpreter may also be executed. "
 "Please see the appropriate manual section for more information on this "
 "function."
 msgstr ""
 
-#: login.1.xml:141(para) login.1.xml:212(para)
+#: login.1.xml:172(para) login.1.xml:248(para)
 msgid ""
 "The <command>login</command> program is NOT responsible for removing users "
 "from the utmp file. It is the responsibility of "
@@ -4564,48 +5119,48 @@
 "\"."
 msgstr ""
 
-#: login.1.xml:161(option) groupadd.8.xml:27(arg) expiry.1.xml:24(arg)
-msgid "-f"
-msgstr "-f"
-
-#: login.1.xml:164(para)
+#: login.1.xml:195(para)
 msgid "Do not perform authentication, user is preauthenticated."
 msgstr ""
 
-#: login.1.xml:170(option)
+#: login.1.xml:198(para)
+msgid "Note: In that case, <replaceable>username</replaceable> is mandatory."
+msgstr ""
+
+#: login.1.xml:206(option)
 msgid "-h"
 msgstr "-h"
 
-#: login.1.xml:173(para)
+#: login.1.xml:209(para)
 msgid "Name of the remote host for this login."
 msgstr ""
 
-#: login.1.xml:181(para)
+#: login.1.xml:217(para)
 msgid "Preserve environment."
 msgstr ""
 
-#: login.1.xml:189(para)
+#: login.1.xml:225(para)
 msgid "Perform autologin protocol for rlogin."
 msgstr ""
 
-#: login.1.xml:194(para)
+#: login.1.xml:230(para)
 msgid ""
 "The <option>-r</option>, <option>-h</option> and <option>-f</option> options "
 "are only used when <command>login</command> is invoked by root."
 msgstr ""
 
-#: login.1.xml:203(para)
+#: login.1.xml:239(para)
 msgid ""
 "This version of <command>login</command> has many compilation options, only "
 "some of which may be in use at any particular site."
 msgstr ""
 
-#: login.1.xml:208(para)
+#: login.1.xml:244(para)
 msgid ""
 "The location of files is subject to differences in system configuration."
 msgstr ""
 
-#: login.1.xml:224(para)
+#: login.1.xml:260(para)
 msgid ""
 "As with any program, <command>login</command>'s appearance can be faked. If "
 "non-trusted users have physical access to a machine, an attacker could use "
@@ -4614,47 +5169,47 @@
 "trusted path and prevent this kind of attack."
 msgstr ""
 
-#: login.1.xml:289(filename)
+#: login.1.xml:325(filename)
 msgid "/var/log/wtmp"
 msgstr "/var/log/wtmp"
 
-#: login.1.xml:291(para)
+#: login.1.xml:327(para)
 msgid "List of previous login sessions."
 msgstr ""
 
-#: login.1.xml:307(filename)
+#: login.1.xml:343(filename)
 msgid "/etc/motd"
 msgstr "/etc/motd"
 
-#: login.1.xml:309(para)
+#: login.1.xml:345(para)
 msgid "System message of the day file."
 msgstr ""
 
-#: login.1.xml:313(filename)
+#: login.1.xml:349(filename)
 msgid "/etc/nologin"
 msgstr "/etc/nologin"
 
-#: login.1.xml:315(para)
+#: login.1.xml:351(para)
 msgid "Prevent non-root users from logging in."
 msgstr ""
 
-#: login.1.xml:319(filename)
+#: login.1.xml:355(filename)
 msgid "/etc/ttytype"
 msgstr "/etc/ttytype"
 
-#: login.1.xml:321(para)
+#: login.1.xml:357(para)
 msgid "List of terminal types."
 msgstr ""
 
-#: login.1.xml:325(filename)
+#: login.1.xml:361(filename)
 msgid "$HOME/.hushlogin"
 msgstr "$HOME/.hushlogin"
 
-#: login.1.xml:327(para)
+#: login.1.xml:363(para)
 msgid "Suppress printing of system messages."
 msgstr ""
 
-#: login.1.xml:335(para)
+#: login.1.xml:371(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -4684,15 +5239,15 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getty</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: limits.5.xml:5(refentrytitle) limits.5.xml:10(refname)
+#: limits.5.xml:35(refentrytitle) limits.5.xml:40(refname)
 msgid "limits"
 msgstr "limits"
 
-#: limits.5.xml:11(refpurpose)
+#: limits.5.xml:41(refpurpose)
 msgid "resource limits definition"
 msgstr ""
 
-#: limits.5.xml:17(para)
+#: limits.5.xml:47(para)
 msgid ""
 "The <emphasis remap=\"I\">limits</emphasis> file (<filename>/etc/limits</"
 "filename> by default or LIMITS_FILE defined <filename>config.h</filename>) "
@@ -4700,103 +5255,103 @@
 "and readable by root account only."
 msgstr ""
 
-#: limits.5.xml:25(para)
+#: limits.5.xml:55(para)
 msgid ""
 "By default no quota is imposed on 'root'. In fact, there is no way to impose "
 "limits via this procedure to root-equiv accounts (accounts with UID 0)."
 msgstr ""
 
-#: limits.5.xml:31(para)
+#: limits.5.xml:61(para)
 msgid "Each line describes a limit for a user in the form:"
 msgstr ""
 
-#: limits.5.xml:34(emphasis)
+#: limits.5.xml:64(emphasis)
 msgid "user LIMITS_STRING"
 msgstr ""
 
-#: limits.5.xml:37(para)
+#: limits.5.xml:67(para)
 msgid ""
 "The <emphasis>LIMITS_STRING</emphasis> is a string of a concatenated list of "
 "resource limits. Each limit consists of a letter identifier followed by a "
 "numerical limit."
 msgstr ""
 
-#: limits.5.xml:43(para)
+#: limits.5.xml:73(para)
 msgid "The valid identifiers are:"
 msgstr ""
 
-#: limits.5.xml:46(para)
+#: limits.5.xml:76(para)
 msgid "A: max address space (KB)"
 msgstr ""
 
-#: limits.5.xml:47(para)
+#: limits.5.xml:77(para)
 msgid "C: max core file size (KB)"
 msgstr ""
 
-#: limits.5.xml:48(para)
+#: limits.5.xml:78(para)
 msgid "D: max data size (KB)"
 msgstr ""
 
-#: limits.5.xml:49(para)
+#: limits.5.xml:79(para)
 msgid "F: maximum filesize (KB)"
 msgstr ""
 
-#: limits.5.xml:50(para)
+#: limits.5.xml:80(para)
 msgid "M: max locked-in-memory address space (KB)"
 msgstr ""
 
-#: limits.5.xml:51(para)
+#: limits.5.xml:81(para)
 msgid "N: max number of open files"
 msgstr ""
 
-#: limits.5.xml:52(para)
+#: limits.5.xml:82(para)
 msgid "R: max resident set size (KB)"
 msgstr ""
 
-#: limits.5.xml:53(para)
+#: limits.5.xml:83(para)
 msgid "S: max stack size (KB)"
 msgstr ""
 
-#: limits.5.xml:54(para)
+#: limits.5.xml:84(para)
 msgid "T: max CPU time (MIN)"
 msgstr ""
 
-#: limits.5.xml:55(para)
+#: limits.5.xml:85(para)
 msgid "U: max number of processes"
 msgstr ""
 
-#: limits.5.xml:56(para)
+#: limits.5.xml:86(para)
 msgid ""
 "K: file creation mask, set by <citerefentry><refentrytitle>umask</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 msgstr ""
 
-#: limits.5.xml:61(para)
+#: limits.5.xml:91(para)
 msgid "L: max number of logins for this user"
 msgstr ""
 
-#: limits.5.xml:62(para)
+#: limits.5.xml:92(para)
 msgid ""
 "P: process priority, set by <citerefentry><refentrytitle>setpriority</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 msgstr ""
 
-#: limits.5.xml:67(para)
+#: limits.5.xml:97(para)
 msgid "I: max nice value (0..39 which translates to 20..-19)"
 msgstr ""
 
-#: limits.5.xml:69(para)
+#: limits.5.xml:99(para)
 msgid "O: max real time priority"
 msgstr ""
 
-#: limits.5.xml:72(para)
+#: limits.5.xml:102(para)
 msgid ""
 "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
-"<emphasis>LIMITS_STRING </emphasis>. For reading convenience, the following "
+"<emphasis>LIMITS_STRING</emphasis>. For reading convenience, the following "
 "entries are equivalent:"
 msgstr ""
 
-#: limits.5.xml:78(programlisting)
+#: limits.5.xml:108(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -4809,7 +5364,7 @@
 "      username L2 D2048 N5\n"
 "    "
 
-#: limits.5.xml:83(para)
+#: limits.5.xml:113(para)
 msgid ""
 "Be aware that after <emphasis remap=\"I\">username</emphasis> the rest of "
 "the line is considered a limit string, thus comments are not allowed. A "
@@ -4817,7 +5372,7 @@
 "<command>login</command> program."
 msgstr ""
 
-#: limits.5.xml:90(para)
+#: limits.5.xml:120(para)
 msgid ""
 "The default entry is denoted by username \"<emphasis>*</emphasis>\". If you "
 "have multiple <emphasis remap=\"I\">default</emphasis> entries in your "
@@ -4825,24 +5380,24 @@
 "default entry."
 msgstr ""
 
-#: limits.5.xml:97(para)
+#: limits.5.xml:127(para)
 msgid ""
 "To completely disable limits for a user, a single dash \"<emphasis>-</"
 "emphasis>\" will do."
 msgstr ""
 
-#: limits.5.xml:102(para)
+#: limits.5.xml:132(para)
 msgid ""
 "Also, please note that all limit settings are set PER LOGIN. They are not "
 "global, nor are they permanent. Perhaps global limits will come, but for now "
 "this will have to do ;)"
 msgstr ""
 
-#: limits.5.xml:113(filename)
+#: limits.5.xml:143(filename)
 msgid "/etc/limits"
 msgstr "/etc/limits"
 
-#: limits.5.xml:121(para)
+#: limits.5.xml:151(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>setpriority</"
@@ -4856,18 +5411,18 @@
 "<citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</"
 "manvolnum></citerefentry>."
 
-#: lastlog.8.xml:5(refentrytitle) lastlog.8.xml:10(refname)
-#: lastlog.8.xml:16(command)
+#: lastlog.8.xml:35(refentrytitle) lastlog.8.xml:40(refname)
+#: lastlog.8.xml:46(command)
 msgid "lastlog"
 msgstr "lastlog"
 
-#: lastlog.8.xml:11(refpurpose)
+#: lastlog.8.xml:41(refpurpose)
 msgid "reports the most recent login of all users or of a given user"
 msgstr ""
 "wyświetla informacje o ostanim logowaniu dla wybranego lub wszystkich "
 "użytkowaników"
 
-#: lastlog.8.xml:25(para)
+#: lastlog.8.xml:55(para)
 msgid ""
 "<command>lastlog</command> formats and prints the contents of the last login "
 "log <filename>/var/log/lastlog</filename> file. The <emphasis>login-name</"
@@ -4882,30 +5437,30 @@
 "flag) pozycje wyświetlane są w kolejności w jakiej są w pliku <filename>/etc/"
 "passwd</filename>."
 
-#: lastlog.8.xml:37(para)
+#: lastlog.8.xml:67(para)
 msgid "The options which apply to the <command>lastlog</command> command are:"
 msgstr "Polecenie <command>lastlog</command> posiada następujące opcje:"
 
-#: lastlog.8.xml:42(term)
+#: lastlog.8.xml:72(term)
 msgid ""
 "<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-b</option>, <option>--before</option><replaceable>DNI</replaceable>"
 
-#: lastlog.8.xml:46(para)
+#: lastlog.8.xml:76(para)
 msgid ""
 "Print only lastlog records older than <emphasis remap=\"I\">DAYS</emphasis>."
 msgstr ""
 "Wyświetlenie rekordów lastlog starszych niż zadana <emphasis remap=\"I"
 "\">DNI</emphasis>."
 
-#: lastlog.8.xml:60(term) faillog.8.xml:93(term)
+#: lastlog.8.xml:90(term) faillog.8.xml:142(term)
 msgid ""
 "<option>-t</option>, <option>--time</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>DNI</replaceable>"
 
-#: lastlog.8.xml:65(para)
+#: lastlog.8.xml:95(para)
 msgid ""
 "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</"
 "emphasis>."
@@ -4913,7 +5468,7 @@
 "Wyświetlenie rekordów lastlog nie starszych niż zadana ilość <emphasis remap="
 "\"I\">DNI</emphasis>."
 
-#: lastlog.8.xml:72(term)
+#: lastlog.8.xml:102(term) faillog.8.xml:153(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-K</option>, <option>--key</option><replaceable>KEY</"
@@ -4925,7 +5480,7 @@
 "<option>-K</option>, <option>--key</option><replaceable>KLUCZ</"
 "replaceable>=<replaceable>WARTOŚĆ</replaceable>"
 
-#: lastlog.8.xml:77(para)
+#: lastlog.8.xml:107(para)
 #, fuzzy
 #| msgid ""
 #| "Print the lastlog record for user with specified <emphasis remap=\"I"
@@ -4935,7 +5490,7 @@
 "Wyświetlenie informacji o ostanim logowaniu dla użytkownika "
 "<replaceable>LOGIN</replaceable>."
 
-#: lastlog.8.xml:80(para)
+#: lastlog.8.xml:110(para) faillog.8.xml:163(para)
 msgid ""
 "The users can be specified by a login name, a numerical user ID, or a "
 "<replaceable>RANGE</replaceable> of users. This <replaceable>RANGE</"
@@ -4944,7 +5499,7 @@
 "UID_MAX</replaceable>), or a min value (<replaceable>UID_MIN-</replaceable>)."
 msgstr ""
 
-#: lastlog.8.xml:92(para)
+#: lastlog.8.xml:122(para)
 msgid ""
 "If the user has never logged in the message <emphasis>** Never logged in**</"
 "emphasis> will be displayed instead of the port and time."
@@ -4953,12 +5508,18 @@
 "logowania wyświetlany jest komunikat <emphasis>**Nigdy nie zalogowany**</"
 "emphasis> (użytkownik nigdy się nie logował)."
 
-#: lastlog.8.xml:99(title) groups.1.xml:36(title) chsh.1.xml:77(title)
-#: chage.1.xml:164(title)
+#: lastlog.8.xml:127(para)
+msgid ""
+"Only the entries for the current users of the system will be displayed. "
+"Other entries may exist for users that were deleted previously."
+msgstr ""
+
+#: lastlog.8.xml:135(title) groups.1.xml:65(title) chsh.1.xml:106(title)
+#: chage.1.xml:193(title)
 msgid "NOTE"
 msgstr "UWAGI"
 
-#: lastlog.8.xml:100(para)
+#: lastlog.8.xml:136(para)
 msgid ""
 "The <filename>lastlog</filename> file is a database which contains info on "
 "the last login of each user. You should not rotate it. It is a sparse file, "
@@ -4976,15 +5537,15 @@
 "wartościami UID). Mozesz wyświetlić rzeczywisty rozmiar tego pliku używając "
 "polecenia \"<command>ls -s</command>\"."
 
-#: lastlog.8.xml:114(filename)
+#: lastlog.8.xml:150(filename)
 msgid "/var/log/lastlog"
 msgstr "/var/log/lastlog"
 
-#: lastlog.8.xml:116(para)
+#: lastlog.8.xml:152(para)
 msgid "Database times of previous user logins."
 msgstr "Baza danych ostatnich logowań użytkowników."
 
-#: lastlog.8.xml:124(para)
+#: lastlog.8.xml:160(para)
 msgid ""
 "Large gaps in UID numbers will cause the lastlog program to run longer with "
 "no output to the screen (i.e. if in lastlog database there is no entries for "
@@ -4996,33 +5557,33 @@
 "pomiedzy 170, a 800, to program będzie sprawiał wrażenie zawieszonego w "
 "trakcie przetwarzania wpisów dla użytkowanikół o UID 171-799)."
 
-#: gshadow.5.xml:5(refentrytitle) gshadow.5.xml:10(refname)
+#: gshadow.5.xml:33(refentrytitle) gshadow.5.xml:38(refname)
 msgid "gshadow"
 msgstr "gshadow"
 
-#: gshadow.5.xml:11(refpurpose)
+#: gshadow.5.xml:39(refpurpose)
 msgid "shadowed group file"
 msgstr ""
 
-#: gshadow.5.xml:16(para)
+#: gshadow.5.xml:44(para)
 msgid ""
 "<filename>/etc/gshadow</filename> contains the shadowed information for "
 "group accounts. It contains lines with the following colon-separated fields:"
 msgstr ""
 
-#: gshadow.5.xml:23(para)
+#: gshadow.5.xml:51(para)
 msgid "group name"
 msgstr "nazwa grupy"
 
-#: gshadow.5.xml:29(para)
+#: gshadow.5.xml:57(para)
 msgid "comma-separated list of group administrators"
 msgstr ""
 
-#: gshadow.5.xml:32(para)
+#: gshadow.5.xml:60(para)
 msgid "comma-separated list of group members"
 msgstr ""
 
-#: gshadow.5.xml:36(para)
+#: gshadow.5.xml:64(para)
 msgid ""
 "The group name and password fields must be filled. The encrypted password "
 "consists of characters from the 64-character alphabet a thru z, A thru Z, 0 "
@@ -5036,32 +5597,47 @@
 "citerefentry>."
 msgstr ""
 
-#: gshadow.5.xml:49(para)
+#: gshadow.5.xml:77(para)
 msgid ""
 "This information supersedes any password present in <filename>/etc/group</"
 "filename>."
 msgstr ""
 
-#: gshadow.5.xml:80(para)
+#: gshadow.5.xml:108(para)
 #, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>group</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>grpconv</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</manvolnum></"
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: grpck.8.xml:15(refpurpose)
+#: grpck.8.xml:44(refpurpose)
 msgid "verify integrity of group files"
 msgstr ""
 
-#: grpck.8.xml:41(para)
+#: grpck.8.xml:70(para)
 msgid ""
 "The <command>grpck</command> command verifies the integrity of the system "
 "authentication information. All entries in <filename>/etc/group</"
@@ -5071,15 +5647,15 @@
 "are improperly formatted or which have other uncorrectable errors."
 msgstr ""
 
-#: grpck.8.xml:58(para)
+#: grpck.8.xml:87(para)
 msgid "a unique group name"
 msgstr ""
 
-#: grpck.8.xml:61(para)
+#: grpck.8.xml:90(para)
 msgid "a valid list of members and administrators"
 msgstr ""
 
-#: grpck.8.xml:65(para)
+#: grpck.8.xml:94(para)
 msgid ""
 "The checks for correct number of fields and unique group name are fatal. If "
 "the entry has the wrong number of fields, the user will be prompted to "
@@ -5090,33 +5666,33 @@
 "<command>groupmod</command> command to correct the error."
 msgstr ""
 
-#: grpck.8.xml:76(para)
+#: grpck.8.xml:105(para)
 msgid ""
 "The commands which operate on the <filename>/etc/group</filename> file are "
 "not able to alter corrupted or duplicated entries. <command>grpck</command> "
 "should be used in those circumstances to remove the offending entry."
 msgstr ""
 
-#: grpck.8.xml:86(para)
+#: grpck.8.xml:115(para)
 #, fuzzy
 #| msgid "The options which apply to the <command>pwck</command> command are:"
 msgid "The options which apply to the <command>grpck</command> command are:"
 msgstr "Polecenie <command>pwck</command> posiada następujące opcje:"
 
-#: grpck.8.xml:93(para)
+#: grpck.8.xml:122(para)
 msgid ""
 "Execute the <command>grpck</command> command in read-only mode. This causes "
 "all questions regarding changes to be answered <emphasis>no</emphasis> "
 "without user intervention."
 msgstr ""
 
-#: grpck.8.xml:103(para)
+#: grpck.8.xml:132(para)
 msgid ""
 "Sort entries in <filename>/etc/group</filename><phrase condition=\"gshadow"
 "\">and <filename>/etc/gshadow</filename></phrase> by GID."
 msgstr ""
 
-#: grpck.8.xml:112(para)
+#: grpck.8.xml:141(para)
 msgid ""
 "By default, <command>grpck</command> operates on <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\"> and <filename>/etc/gshadow</"
@@ -5126,53 +5702,56 @@
 "emphasis> parameters.</phrase>"
 msgstr ""
 
-#: grpck.8.xml:162(para)
+#: grpck.8.xml:191(para)
 #, fuzzy
 #| msgid ""
-#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
-#| "citerefentry>, <citerefentry><refentrytitle>group</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>."
+#| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>login</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum>, </"
-"citerefentry><citerefentry><refentrytitle>passwd</"
+"citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
+"condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum>, </citerefentry><citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>groupmod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>shadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>group</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
+"<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gshadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: grpck.8.xml:201(para)
+#: grpck.8.xml:233(para)
 msgid "one or more bad group entries"
 msgstr ""
 
-#: grpck.8.xml:207(para)
+#: grpck.8.xml:239(para)
 msgid "can't open group files"
 msgstr ""
 
-#: grpck.8.xml:213(para)
+#: grpck.8.xml:245(para)
 msgid "can't lock group files"
 msgstr ""
 
-#: grpck.8.xml:219(para)
+#: grpck.8.xml:251(para)
 msgid "can't update group files"
 msgstr ""
 
-#: grpck.8.xml:183(para)
+#: grpck.8.xml:215(para)
 msgid ""
 "The <command>grpck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -5180,21 +5759,20 @@
 "Polecenie <command>grpckl</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: groups.1.xml:5(refentrytitle) groups.1.xml:10(refname)
-#: groups.1.xml:16(command)
+#: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
+#: groups.1.xml:45(command)
 msgid "groups"
 msgstr "groups"
 
-#: groups.1.xml:11(refpurpose)
+#: groups.1.xml:40(refpurpose)
 msgid "display current group names"
 msgstr ""
 
-#: groups.1.xml:18(replaceable) gpasswd.1.xml:94(replaceable)
-#: gpasswd.1.xml:107(replaceable) chfn.1.xml:29(replaceable)
+#: groups.1.xml:47(replaceable) chfn.1.xml:58(replaceable)
 msgid "user"
 msgstr ""
 
-#: groups.1.xml:25(para)
+#: groups.1.xml:54(para)
 msgid ""
 "The <command>groups</command> command displays the current group names or ID "
 "values. If the value does not have a corresponding entry in <filename>/etc/"
@@ -5203,7 +5781,7 @@
 "the groups for the named <emphasis remap=\"I\">user</emphasis>."
 msgstr ""
 
-#: groups.1.xml:37(para)
+#: groups.1.xml:66(para)
 msgid ""
 "Systems which do not support concurrent group sets will have the information "
 "from <filename>/etc/group</filename> reported. The user must use "
@@ -5211,7 +5789,7 @@
 "real and effective group ID."
 msgstr ""
 
-#: groups.1.xml:59(para)
+#: groups.1.xml:88(para)
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getgid</"
@@ -5227,15 +5805,15 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getuid</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 
-#: groupmod.8.xml:15(refpurpose)
+#: groupmod.8.xml:44(refpurpose)
 msgid "modify a group definition on the system"
 msgstr "modyfikuj definicję grupy systemowej"
 
-#: groupmod.8.xml:24(replaceable)
+#: groupmod.8.xml:53(replaceable)
 msgid "GROUP"
 msgstr "GRUPA"
 
-#: groupmod.8.xml:30(para)
+#: groupmod.8.xml:59(para)
 msgid ""
 "The <command>groupmod</command> command modifies the definition of the "
 "specified <replaceable>GROUP</replaceable> by modifying the appropriate "
@@ -5245,17 +5823,17 @@
 "<replaceable>GRUPA</replaceable> poprzez modifikację stosownego wpisu w "
 "bazie grup."
 
-#: groupmod.8.xml:39(para)
+#: groupmod.8.xml:68(para)
 msgid "The options which apply to the <command>groupmod</command> command are:"
 msgstr "Polecenie <command>groupmod</command> posiada następujące opcje:"
 
-#: groupmod.8.xml:45(term) groupadd.8.xml:66(term)
+#: groupmod.8.xml:74(term) groupadd.8.xml:92(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 
-#: groupmod.8.xml:49(para)
+#: groupmod.8.xml:78(para)
 #, fuzzy
 msgid ""
 "The group ID of the given <replaceable>GROUP</replaceable> will be changed "
@@ -5273,7 +5851,7 @@
 "Pliki, dla których stary identyfikator jest identyfikatorem grupy pliku, "
 "wymagają ręcznej zmiany ID grupy."
 
-#: groupmod.8.xml:70(term)
+#: groupmod.8.xml:99(term)
 msgid ""
 "<option>-n</option>, <option>--new-name</option><replaceable>NEW_GROUP</"
 "replaceable>"
@@ -5281,7 +5859,7 @@
 "<option>-a</option>, <option>--append</option><replaceable>NOWA_GRUPA</"
 "replaceable>"
 
-#: groupmod.8.xml:75(para)
+#: groupmod.8.xml:104(para)
 msgid ""
 "The name of the group will be changed from <replaceable>GROUP</replaceable> "
 "to <replaceable>NEW_GROUP</replaceable> name."
@@ -5289,7 +5867,7 @@
 "Nazwa grupy zostanie zmieniona z <replaceable>GRUPA</replaceable> na nazwę "
 "<replaceable>NOWA_GRUPA</replaceable>."
 
-#: groupmod.8.xml:86(para)
+#: groupmod.8.xml:115(para)
 #, fuzzy
 msgid ""
 "When used with the <option>-g</option> option, allow to change the group "
@@ -5298,7 +5876,7 @@
 "Użyte z opcją <option>-g</option> umożliwia zmiane <replaceable>GID</"
 "replaceable> grupy na wartość nieunikalną."
 
-#: groupmod.8.xml:98(para) groupadd.8.xml:122(para)
+#: groupmod.8.xml:127(para) groupadd.8.xml:148(para)
 #, fuzzy
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
@@ -5309,11 +5887,11 @@
 "jest zmieniana przy pomocy polecenia <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: groupmod.8.xml:176(para)
+#: groupmod.8.xml:205(para)
 msgid "group name already in use"
 msgstr "nazwa grupy już jest w użyciu"
 
-#: groupmod.8.xml:140(para)
+#: groupmod.8.xml:169(para)
 msgid ""
 "The <command>groupmod</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -5321,7 +5899,7 @@
 "Polecenie <command>groupmod</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: groupmod.8.xml:191(para)
+#: groupmod.8.xml:220(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -5353,32 +5931,35 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: groupmems.8.xml:15(refpurpose)
+#: groupmems.8.xml:44(refpurpose)
 msgid "administer members of a user's primary group"
 msgstr ""
 
-#: groupmems.8.xml:22(replaceable) groupmems.8.xml:23(replaceable)
-#: groupmems.8.xml:53(replaceable) groupmems.8.xml:59(replaceable)
+#: groupmems.8.xml:51(replaceable) groupmems.8.xml:52(replaceable)
 msgid "user_name"
 msgstr "user_name"
 
-#: groupmems.8.xml:22(arg)
+#: groupmems.8.xml:51(arg)
 msgid "-a <placeholder-1/>"
 msgstr "-a <placeholder-1/>"
 
-#: groupmems.8.xml:23(arg)
+#: groupmems.8.xml:52(arg)
 msgid "-d <placeholder-1/>"
 msgstr "-d <placeholder-1/>"
 
-#: groupmems.8.xml:25(replaceable) groupmems.8.xml:71(replaceable)
+#: groupmems.8.xml:53(replaceable)
 msgid "group_name"
 msgstr ""
 
-#: groupmems.8.xml:25(arg) groupadd.8.xml:24(arg)
+#: groupmems.8.xml:53(arg)
 msgid "-g <placeholder-1/>"
 msgstr "-g <placeholder-1/>"
 
-#: groupmems.8.xml:32(para)
+#: groupmems.8.xml:54(arg)
+msgid "-l"
+msgstr "-l"
+
+#: groupmems.8.xml:61(para)
 msgid ""
 "The <command>groupmems</command> command allows a user to administer his/her "
 "own group membership list without the requirement of superuser privileges. "
@@ -5386,54 +5967,97 @@
 "users to be in their own name sake primary group (i.e., guest / guest)."
 msgstr ""
 
-#: groupmems.8.xml:40(para)
+#: groupmems.8.xml:69(para)
 msgid ""
 "Only the superuser, as administrator, can use <command>groupmems</command> "
 "to alter the memberships of other groups."
 msgstr ""
 
-#: groupmems.8.xml:47(para)
+#: groupmems.8.xml:76(para)
 msgid ""
 "The options which apply to the <command>groupmems</command> command are:"
 msgstr "Polecenie <command>groupmems</command> posiada następujące opcje:"
 
-#: groupmems.8.xml:53(option) gpasswd.1.xml:94(option)
-msgid "-a"
-msgstr "-a"
+#: groupmems.8.xml:82(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+msgid ""
+"<option>-a</option>, <option>--add</option><replaceable>user_name</"
+"replaceable>"
+msgstr ""
+"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: groupmems.8.xml:55(para)
-msgid "Add a new user to the group membership list."
+#: groupmems.8.xml:84(para)
+msgid "Add an user to the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:59(option) gpasswd.1.xml:107(option)
-msgid "-d"
-msgstr "-d"
+#: groupmems.8.xml:85(para) groupmems.8.xml:101(para)
+#: groupmems.8.xml:126(para)
+msgid ""
+"If the <filename>/etc/gshadow</filename> file exist, and the group has no "
+"entry in the <filename>/etc/gshadow</filename> file, a new entry will be "
+"created."
+msgstr ""
 
-#: groupmems.8.xml:61(para)
+#: groupmems.8.xml:93(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-d</option>, <option>--delete</option><replaceable>user_name</"
+"replaceable>"
+msgstr ""
+"<option>-t</option>, <option>--time</option><replaceable>DNI</replaceable>"
+
+#: groupmems.8.xml:95(para)
 msgid "Delete a user from the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:67(para)
-msgid "Purge all users from the group membership list."
+#: groupmems.8.xml:96(para)
+msgid ""
+"If the <filename>/etc/gshadow</filename> file exist, the user will be "
+"removed from the list of members and administrators of the group."
 msgstr ""
 
-#: groupmems.8.xml:71(option)
-msgid "-g"
-msgstr "-g"
+#: groupmems.8.xml:109(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
+msgid ""
+"<option>-g</option>, <option>--group</option><replaceable>group_name</"
+"replaceable>"
+msgstr ""
+"<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 
-#: groupmems.8.xml:73(para)
+#: groupmems.8.xml:111(para)
 msgid "The superuser can specify which group membership list to modify."
 msgstr ""
 
-#: groupmems.8.xml:81(para)
+#: groupmems.8.xml:117(term) chage.1.xml:128(term)
+msgid "<option>-l</option>, <option>--list</option>"
+msgstr "<option>-l</option>, <option>--list</option>"
+
+#: groupmems.8.xml:119(para)
 msgid "List the group membership list."
 msgstr ""
 
-#: groupmems.8.xml:88(title)
+#: groupmems.8.xml:123(term)
+#, fuzzy
+#| msgid "<option>-e</option>, <option>--expire</option>"
+msgid "<option>-p</option>, <option>--purge</option>"
+msgstr "<option>-e</option>, <option>--expire</option>"
+
+#: groupmems.8.xml:125(para)
+msgid "Purge all users from the group membership list."
+msgstr ""
+
+#: groupmems.8.xml:137(title)
 msgid "SETUP"
 msgstr ""
 
-#: groupmems.8.xml:89(para)
+#: groupmems.8.xml:138(para)
 msgid ""
 "The <command>groupmems</command> executable should be in mode <literal>2770</"
 "literal> as user <emphasis>root</emphasis> and in group <emphasis>groups</"
@@ -5442,7 +6066,7 @@
 "utility to manage their own group membership list."
 msgstr ""
 
-#: groupmems.8.xml:98(programlisting)
+#: groupmems.8.xml:147(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -5459,11 +6083,11 @@
 "\t$ groupmems -g groups -a gk4\n"
 "    "
 
-#: groupmems.8.xml:130(para)
+#: groupmems.8.xml:179(para)
 msgid "secure group account information"
 msgstr ""
 
-#: groupmems.8.xml:138(para)
+#: groupmems.8.xml:187(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -5491,34 +6115,34 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: groupdel.8.xml:15(refpurpose)
+#: groupdel.8.xml:44(refpurpose)
 msgid "delete a group"
 msgstr ""
 
-#: groupdel.8.xml:29(para)
+#: groupdel.8.xml:58(para)
 msgid ""
 "The <command>groupdel</command> command modifies the system account files, "
 "deleting all entries that refer to <emphasis remap=\"I\">group</emphasis>. "
 "The named group must exist."
 msgstr ""
 
-#: groupdel.8.xml:34(para)
+#: groupdel.8.xml:63(para)
 msgid ""
 "You must manually check all file systems to insure that no files remain with "
 "the named group as the file group ID."
 msgstr ""
 
-#: groupdel.8.xml:41(para)
+#: groupdel.8.xml:70(para)
 msgid ""
 "You may not remove the primary group of any existing user. You must remove "
 "the user before you remove the group."
 msgstr ""
 
-#: groupdel.8.xml:102(para)
+#: groupdel.8.xml:131(para)
 msgid "can't remove user's primary group"
 msgstr ""
 
-#: groupdel.8.xml:78(para)
+#: groupdel.8.xml:107(para)
 msgid ""
 "The <command>groupdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -5526,7 +6150,7 @@
 "Polecenie <command>groupdel</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: groupdel.8.xml:117(para)
+#: groupdel.8.xml:146(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -5558,42 +6182,22 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>"
 
-#: groupadd.8.xml:17(refpurpose)
+#: groupadd.8.xml:48(refpurpose)
 msgid "create a new group"
 msgstr "twółrz nową grupę"
 
-#: groupadd.8.xml:24(replaceable)
-msgid "GID"
-msgstr "GID"
-
-#: groupadd.8.xml:25(arg)
-msgid "-o"
-msgstr "-o"
-
-#: groupadd.8.xml:28(replaceable)
-msgid "KEY"
-msgstr "KLUCZ"
-
-#: groupadd.8.xml:28(replaceable)
-msgid "VALUE"
-msgstr "WARTOŚĆ"
-
-#: groupadd.8.xml:28(arg)
-msgid "-K <placeholder-1/>=<placeholder-2/>"
-msgstr "-K <placeholder-1/>=<placeholder-2/>"
-
-#: groupadd.8.xml:37(para)
+#: groupadd.8.xml:63(para)
 msgid ""
 "The <command>groupadd</command> command creates a new group account using "
 "the values specified on the command line plus the default values from the "
 "system. The new group will be entered into the system files as needed."
 msgstr ""
 
-#: groupadd.8.xml:46(para)
+#: groupadd.8.xml:72(para)
 msgid "The options which apply to the <command>groupadd</command> command are:"
 msgstr "Polecenie <command>groupadd</command> posiada następujące opcje:"
 
-#: groupadd.8.xml:56(para)
+#: groupadd.8.xml:82(para)
 msgid ""
 "This option causes the command to simply exit with success status if the "
 "specified group already exists. When used with <option>-g</option>, and the "
@@ -5601,7 +6205,7 @@
 "g</option> is turned off)."
 msgstr ""
 
-#: groupadd.8.xml:70(para)
+#: groupadd.8.xml:96(para)
 msgid ""
 "The numerical value of the group's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. The "
@@ -5610,37 +6214,37 @@
 "system accounts."
 msgstr ""
 
-#: groupadd.8.xml:90(para)
+#: groupadd.8.xml:116(para)
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (GID_MIN, GID_MAX "
 "and others). Multiple <option>-K</option> options can be specified."
 msgstr ""
 
-#: groupadd.8.xml:95(para)
+#: groupadd.8.xml:121(para)
 msgid ""
 "Example: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>100</replaceable><option> -K </"
 "option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 msgstr ""
 
-#: groupadd.8.xml:99(para)
+#: groupadd.8.xml:125(para)
 msgid ""
 "Note: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</"
 "replaceable>=<replaceable>499</replaceable> doesn't work yet."
 msgstr ""
 
-#: groupadd.8.xml:111(para)
+#: groupadd.8.xml:137(para)
 msgid "This option permits to add a group with a non-unique GID."
 msgstr ""
 
-#: groupadd.8.xml:134(para)
+#: groupadd.8.xml:160(para)
 #, fuzzy
 #| msgid "create a new group"
 msgid "Create a system group."
 msgstr "twółrz nową grupę"
 
-#: groupadd.8.xml:137(para)
+#: groupadd.8.xml:163(para)
 msgid ""
 "The numeric identifiers of new system groups are choosen in the "
 "<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
@@ -5648,38 +6252,38 @@
 "<option>GID_MAX</option>."
 msgstr ""
 
-#: groupadd.8.xml:188(para)
+#: groupadd.8.xml:214(para)
 msgid ""
 "Groupnames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
-"regular expression terms: [a-z_][a-z0-9_-]*[$]"
+"regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 
-#: groupadd.8.xml:193(para)
-msgid "Groupnames may only be up to 16 characters long."
+#: groupadd.8.xml:219(para)
+msgid "Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long."
 msgstr ""
 
-#: groupadd.8.xml:196(para)
+#: groupadd.8.xml:222(para)
 msgid ""
 "You may not add a NIS or LDAP group. This must be performed on the "
 "corresponding server."
 msgstr ""
 
-#: groupadd.8.xml:200(para)
+#: groupadd.8.xml:226(para)
 msgid ""
 "If the groupname already exists in an external group database such as NIS or "
 "LDAP, <command>groupadd</command> will deny the group creation request."
 msgstr ""
 
-#: groupadd.8.xml:233(para)
+#: groupadd.8.xml:259(para)
 msgid "GID not unique (when <option>-o</option> not used)"
 msgstr ""
 
-#: groupadd.8.xml:239(para)
+#: groupadd.8.xml:265(para)
 msgid "group name not unique"
 msgstr ""
 
-#: groupadd.8.xml:209(para)
+#: groupadd.8.xml:235(para)
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -5687,7 +6291,7 @@
 "Polecenie <command>groupadd</command> kończy działanie z następującymi "
 "wartościami kodów zakończenia: <placeholder-1/>"
 
-#: groupadd.8.xml:254(para)
+#: groupadd.8.xml:280(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -5721,26 +6325,26 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:21(phrase)
+#: gpasswd.1.xml:50(phrase)
 #, fuzzy
 msgid "and <placeholder-1/> files"
 msgstr "-a <placeholder-1/>"
 
-#: gpasswd.1.xml:23(phrase)
+#: gpasswd.1.xml:52(phrase)
 msgid "file"
 msgstr ""
 
-#: gpasswd.1.xml:19(refpurpose)
+#: gpasswd.1.xml:48(refpurpose)
 #, fuzzy
 msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
 msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
-#: gpasswd.1.xml:31(replaceable)
+#: gpasswd.1.xml:60(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "opcje"
 
-#: gpasswd.1.xml:41(para)
+#: gpasswd.1.xml:70(para)
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
 "group</filename><phrase condition=\"gshadow\">, and <filename>/etc/gshadow</"
@@ -5748,14 +6352,14 @@
 "\">administrators,</phrase> members and a password."
 msgstr ""
 
-#: gpasswd.1.xml:49(para)
+#: gpasswd.1.xml:78(para)
 msgid ""
 "System administrator can use the <option>-A</option> option to define group "
 "administrator(s) and the <option>-M</option> option to define members and "
 "has all rights of group administrators and members."
 msgstr ""
 
-#: gpasswd.1.xml:54(para)
+#: gpasswd.1.xml:83(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -5763,7 +6367,7 @@
 "of the <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:61(para)
+#: gpasswd.1.xml:90(para)
 #, fuzzy
 msgid ""
 "If a password is set the members can still "
@@ -5774,91 +6378,128 @@
 "jest zmieniana przy pomocy polecenia <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:69(title)
+#: gpasswd.1.xml:98(title)
 msgid "Notes about group passwords"
 msgstr ""
 
-#: gpasswd.1.xml:70(para)
+#: gpasswd.1.xml:99(para)
 msgid ""
 "Group passwords are an inherent security problem since more than one person "
 "is permitted to know the password. However, groups are a useful tool for "
 "permitting co-operation between different users."
 msgstr ""
 
-#: gpasswd.1.xml:81(para)
+#: gpasswd.1.xml:110(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
 "options cannot be combined."
 msgstr "<option>-</option>, <option>-l</option>, <option>--login</option>"
 
-#: gpasswd.1.xml:85(para)
+#: gpasswd.1.xml:114(para)
 msgid "The options cannot be combined."
 msgstr ""
 
-#: gpasswd.1.xml:88(para)
+#: gpasswd.1.xml:117(para)
 #, fuzzy
 msgid "The options which apply to the <command>gpasswd</command> command are:"
 msgstr "Polecenie <command>passwd</command> posiada następujące opcje:"
 
-#: gpasswd.1.xml:97(para)
+#: gpasswd.1.xml:122(term)
 #, fuzzy
+#| msgid ""
+#| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgid ""
+"<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
+msgstr ""
+"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+
+#: gpasswd.1.xml:126(para)
+#, fuzzy
+msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
 "replaceable>."
 msgstr ""
 "Nazwa grupy zostanie zmieniona z <replaceable>GRUPA</replaceable> na nazwę "
 "<replaceable>NOWA_GRUPA</replaceable>."
 
-#: gpasswd.1.xml:110(para)
+#: gpasswd.1.xml:135(term)
 #, fuzzy
+#| msgid ""
+#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
+#| "replaceable>"
 msgid ""
+"<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
+msgstr ""
+"<option>-t</option>, <option>--time</option><replaceable>DNI</replaceable>"
+
+#: gpasswd.1.xml:139(para)
+#, fuzzy
+msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
 "<replaceable>group</replaceable>."
 msgstr ""
 "Nazwa grupy zostanie zmieniona z <replaceable>GRUPA</replaceable> na nazwę "
 "<replaceable>NOWA_GRUPA</replaceable>."
 
-#: gpasswd.1.xml:123(para)
+#: gpasswd.1.xml:148(term)
+#, fuzzy
+#| msgid "<option>-r</option>, <option>--remove</option>"
+msgid "<option>-r</option>, <option>--remove-password</option>"
+msgstr "<option>-r</option>, <option>--remove</option>"
+
+#: gpasswd.1.xml:152(para)
 msgid ""
 "Remove the password from the named <replaceable>group</replaceable>. Only "
 "group members will be allowed to use <command>newgrp</command> to join the "
 "named <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:135(option)
+#: gpasswd.1.xml:163(term)
 #, fuzzy
-msgid "-R"
-msgstr "-"
+#| msgid "<option>-r</option>, <option>--reset</option>"
+msgid "<option>-R</option>, <option>--restrict</option>"
+msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: gpasswd.1.xml:138(para)
+#: gpasswd.1.xml:167(para)
 msgid ""
 "Restrict the access to the named <replaceable>group</replaceable>. Only "
 "group members will be allowed to use <command>newgrp</command> to join the "
 "named <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:149(term)
+#: gpasswd.1.xml:178(term)
 #, fuzzy
-msgid "<option>-A</option><replaceable>user</replaceable>,..."
+#| msgid ""
+#| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-A</option>, <option>--administrators</option><replaceable>user</"
+"replaceable>,..."
 msgstr ""
-"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+"<option>-m</option>, <option>--mindays</option><replaceable>MIN_DNI</"
+"replaceable>"
 
-#: gpasswd.1.xml:153(para)
+#: gpasswd.1.xml:182(para)
 msgid "Set the list of administrative users."
 msgstr ""
 
-#: gpasswd.1.xml:161(term)
+#: gpasswd.1.xml:190(term)
 #, fuzzy
-msgid "<option>-M</option><replaceable>user</replaceable>,..."
+#| msgid ""
+#| "<option>-b</option>, <option>--before</option><replaceable>DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-M</option>, <option>--members</option><replaceable>user</"
+"replaceable>,..."
 msgstr ""
-"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+"<option>-b</option>, <option>--before</option><replaceable>DNI</replaceable>"
 
-#: gpasswd.1.xml:165(para)
+#: gpasswd.1.xml:194(para)
 msgid "Set the list of group members."
 msgstr ""
 
-#: gpasswd.1.xml:175(para)
+#: gpasswd.1.xml:204(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -5867,7 +6508,7 @@
 "server."
 msgstr ""
 
-#: gpasswd.1.xml:220(para)
+#: gpasswd.1.xml:249(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
@@ -5894,17 +6535,17 @@
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: faillog.8.xml:5(refentrytitle) faillog.8.xml:10(refname)
-#: faillog.8.xml:16(command) faillog.5.xml:5(refentrytitle)
-#: faillog.5.xml:10(refname) faillog.5.xml:53(refentrytitle)
+#: faillog.8.xml:34(refentrytitle) faillog.8.xml:39(refname)
+#: faillog.8.xml:45(command) faillog.5.xml:34(refentrytitle)
+#: faillog.5.xml:39(refname) faillog.5.xml:82(refentrytitle)
 msgid "faillog"
 msgstr "faillog"
 
-#: faillog.8.xml:11(refpurpose)
+#: faillog.8.xml:40(refpurpose)
 msgid "display faillog records or set login failure limits"
 msgstr ""
 
-#: faillog.8.xml:25(para)
+#: faillog.8.xml:54(para)
 msgid ""
 "<command>faillog</command> formats the contents of the failure log from "
 "<filename>/var/log/faillog</filename> database. It also can be used for "
@@ -5913,15 +6554,17 @@
 "had a login failure."
 msgstr ""
 
-#: faillog.8.xml:36(para)
+#: faillog.8.xml:65(para)
 msgid "The options which apply to the <command>faillog</command> command are:"
 msgstr "Polecenie <command>faillog</command> posiada następujące opcje:"
 
-#: faillog.8.xml:44(para)
-msgid "Display faillog records for all users."
+#: faillog.8.xml:73(para)
+msgid ""
+"Display (or act on) faillog records for all users having an entry in the "
+"<filename>faillog</filename> database."
 msgstr ""
 
-#: faillog.8.xml:54(term)
+#: faillog.8.xml:86(term)
 msgid ""
 "<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
 "replaceable>"
@@ -5929,57 +6572,87 @@
 "<option>-l</option>, <option>--lock-time</option><replaceable>SEK</"
 "replaceable>"
 
-#: faillog.8.xml:59(para)
+#: faillog.8.xml:91(para)
 msgid ""
 "Lock account to <replaceable>SEC</replaceable> seconds after failed login."
 msgstr ""
 
-#: faillog.8.xml:66(term)
+#: faillog.8.xml:95(para) faillog.8.xml:121(para) faillog.8.xml:135(para)
 msgid ""
+"Write access to <filename>/var/log/faillog</filename> is required for this "
+"option."
+msgstr ""
+
+#: faillog.8.xml:102(term)
+msgid ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 msgstr ""
 
-#: faillog.8.xml:71(para)
+#: faillog.8.xml:107(para)
 msgid ""
 "Set maximum number of login failures after the account is disabled to "
-"<replaceable>MAX</replaceable>. Selecting <replaceable>MAX</replaceable> "
-"value of 0 has the effect of not placing a limit on the number of failed "
-"logins. The maximum failure count should always be 0 for <emphasis>root</"
-"emphasis> to prevent a denial of services attack against the system."
+"<replaceable>MAX</replaceable>."
 msgstr ""
 
-#: faillog.8.xml:82(term)
+#: faillog.8.xml:111(para)
+msgid ""
+"Selecting a <replaceable>MAX</replaceable> value of 0 has the effect of not "
+"placing a limit on the number of failed logins."
+msgstr ""
+
+#: faillog.8.xml:116(para)
+msgid ""
+"The maximum failure count should always be 0 for <emphasis>root</emphasis> "
+"to prevent a denial of services attack against the system."
+msgstr ""
+
+#: faillog.8.xml:128(term)
 msgid "<option>-r</option>, <option>--reset</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: faillog.8.xml:84(para)
+#: faillog.8.xml:130(para)
 msgid ""
 "Reset the counters of login failures or one record if used with the <option>-"
-"u</option><replaceable>LOGIN</replaceable> option. Write access to "
-"<filename>/var/log/faillog</filename> is required for this option."
+"u</option><replaceable>LOGIN</replaceable> option."
 msgstr ""
 
-#: faillog.8.xml:97(para)
+#: faillog.8.xml:146(para)
+#, fuzzy
+#| msgid ""
+#| "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</"
+#| "emphasis>."
 msgid ""
-"Display faillog records more recent than <replaceable>DAYS</replaceable>. "
-"The <option>-t</option> flag overrides the use of <option>-u</option>."
+"Display faillog records more recent than <replaceable>DAYS</replaceable>."
 msgstr ""
+"Wyświetlenie rekordów lastlog nie starszych niż zadana ilość <emphasis remap="
+"\"I\">DNI</emphasis>."
 
-#: faillog.8.xml:105(term)
+#: faillog.8.xml:158(para)
 msgid ""
-"<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>"
+"Display faillog record or maintains failure counters and limits (if used "
+"with <option>-l</option>, <option>-m</option> or <option>-r</option> "
+"options) only for the specified user(s)."
 msgstr ""
-"<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>"
 
-#: faillog.8.xml:109(para)
+#: faillog.8.xml:176(para)
 msgid ""
-"Display faillog record or maintains failure counters and limits (if used "
-"with <option>-l</option>, <option>-m</option> or <option>-r</option> "
-"options) only for user with <replaceable>LOGIN</replaceable>."
+"When none of the <option>-l</option>, <option>-m</option>, or <option>-r</"
+"option> options are used, <command>faillog</command> displays the faillog "
+"record of the specified user(s)."
 msgstr ""
 
-#: faillog.8.xml:122(para)
+#: faillog.8.xml:181(para)
 msgid ""
+"NOTE: in display mode, only the records of users which currently exist in "
+"the system are displayed. In the other modes (when the <option>-l</option>, "
+"<option>-m</option>, or <option>-r</option> options are used), the records "
+"of the user, or the range of users, or all the users that may have an entry "
+"in the faillog database will be changed. This is useful to reset records of "
+"users that have been deleted or set a policy in advance for a range of users."
+msgstr ""
+
+#: faillog.8.xml:194(para)
+msgid ""
 "<command>faillog</command> only prints out users with no successful login "
 "since the last failure. To print out a user who has had a successful login "
 "since their last failure, you must explicitly request the user with the "
@@ -5987,15 +6660,15 @@
 "option> flag."
 msgstr ""
 
-#: faillog.8.xml:135(filename) faillog.5.xml:41(filename)
+#: faillog.8.xml:207(filename) faillog.5.xml:70(filename)
 msgid "/var/log/faillog"
 msgstr "/var/log/faillog"
 
-#: faillog.8.xml:137(para) faillog.5.xml:43(para)
+#: faillog.8.xml:209(para) faillog.5.xml:72(para)
 msgid "Failure logging file."
 msgstr ""
 
-#: faillog.8.xml:145(para)
+#: faillog.8.xml:217(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
@@ -6005,11 +6678,11 @@
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: faillog.5.xml:11(refpurpose)
+#: faillog.5.xml:40(refpurpose)
 msgid "login failure logging file"
 msgstr ""
 
-#: faillog.5.xml:16(para)
+#: faillog.5.xml:45(para)
 msgid ""
 "<filename>/var/log/faillog</filename> maintains a count of login failures "
 "and the limits for each account. The file is fixed length record, indexed by "
@@ -6020,11 +6693,11 @@
 "locked after a failure."
 msgstr ""
 
-#: faillog.5.xml:26(para)
+#: faillog.5.xml:55(para)
 msgid "The structure of the file is:"
 msgstr "Struktura tego pliku to:"
 
-#: faillog.5.xml:27(programlisting)
+#: faillog.5.xml:56(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -6045,16 +6718,16 @@
 "\tlong    fail_locktime;\n"
 "};"
 
-#: expiry.1.xml:11(refentrytitle) expiry.1.xml:16(refname)
-#: expiry.1.xml:22(command)
+#: expiry.1.xml:41(refentrytitle) expiry.1.xml:46(refname)
+#: expiry.1.xml:52(command)
 msgid "expiry"
 msgstr "expiry"
 
-#: expiry.1.xml:17(refpurpose)
+#: expiry.1.xml:47(refpurpose)
 msgid "check and enforce password expiration policy"
 msgstr "sprawdzenie ważności i wymuszenie zmiany hasła"
 
-#: expiry.1.xml:30(para)
+#: expiry.1.xml:60(para)
 msgid ""
 "The <command>expiry</command> command checks (<option>-c</option>) the "
 "current password expiration and forces (<option>-f</option>) changes when "
@@ -6064,7 +6737,7 @@
 "wygaśnie aktualne hasło oraz wymusza (<option>-f</option>) lub wymusza jego "
 "zmianę.Może ono być wywoływane jako zwykłe polecenie przez użytkownika."
 
-#: expiry.1.xml:57(para) chage.1.xml:233(para)
+#: expiry.1.xml:87(para) chage.1.xml:262(para)
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -6074,11 +6747,11 @@
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: chsh.1.xml:17(refpurpose)
+#: chsh.1.xml:46(refpurpose)
 msgid "change login shell"
 msgstr "zmiana powłoki zgłoszeniowej"
 
-#: chsh.1.xml:34(para)
+#: chsh.1.xml:63(para)
 msgid ""
 "The <command>chsh</command> command changes the user login shell. This "
 "determines the name of the user's initial login command. A normal user may "
@@ -6090,11 +6763,11 @@
 "Zwykły użytkownik może zmienić wyłącznie  powłokę zgłoszeniową własnego "
 "konta, superużytkownik może zmienić powłokę zgłoszeniową dla dowolnego konta."
 
-#: chsh.1.xml:45(para)
+#: chsh.1.xml:74(para)
 msgid "The options which apply to the <command>chsh</command> command are:"
 msgstr "Polecenie <command>chsh</command> posiada następujące opcje:"
 
-#: chsh.1.xml:67(para)
+#: chsh.1.xml:96(para)
 msgid ""
 "If the <option>-s</option> option is not selected, <command>chsh</command> "
 "operates in an interactive fashion, prompting the user with the current "
@@ -6108,7 +6781,7 @@
 "podanie wartości pustej  pozostawia bieżącą powłokę. Bieżąca powłoka "
 "wyświetlana jest w nawiasach <emphasis>[ ]</emphasis>"
 
-#: chsh.1.xml:78(para)
+#: chsh.1.xml:107(para)
 msgid ""
 "The only restriction placed on the login shell is that the command name must "
 "be listed in <filename>/etc/shells</filename>, unless the invoker is the "
@@ -6127,15 +6800,15 @@
 "zmiana na powłokę ograniczoną uniemożliwi użytkownikowi jakąkolwiek zmianę "
 "powłoki logowania, nawet z powrotem na dotychczasową."
 
-#: chsh.1.xml:113(filename)
+#: chsh.1.xml:142(filename)
 msgid "/etc/shells"
 msgstr "/etc/shells"
 
-#: chsh.1.xml:115(para)
+#: chsh.1.xml:144(para)
 msgid "List of valid login shells."
 msgstr "Lista dozwolonych powłok zgłoszeniowych."
 
-#: chsh.1.xml:129(para)
+#: chsh.1.xml:158(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -6149,11 +6822,11 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chpasswd.8.xml:18(refpurpose)
+#: chpasswd.8.xml:47(refpurpose)
 msgid "update passwords in batch mode"
 msgstr "wsadowa aktualizacja haseł użytkowników"
 
-#: chpasswd.8.xml:32(para)
+#: chpasswd.8.xml:61(para)
 msgid ""
 "The <command>chpasswd</command> command reads a list of user name and "
 "password pairs from standard input and uses this information to update a "
@@ -6164,7 +6837,7 @@
 "aktualizacji danych o grupie istniejących użytkowników. Każdy wiersz "
 "przekazywanych danych ma postać:"
 
-#: chpasswd.8.xml:37(para)
+#: chpasswd.8.xml:66(para)
 msgid ""
 "<emphasis remap=\"I\">user_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -6172,7 +6845,7 @@
 "<emphasis remap=\"I\">nazwa_użytkownika</emphasis>:<emphasis remap=\"I"
 "\">hasło</emphasis>"
 
-#: chpasswd.8.xml:41(para)
+#: chpasswd.8.xml:70(para)
 #, fuzzy
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
@@ -6183,7 +6856,7 @@
 "haseł używany jest domyślnie algorytm DES. W trakcie zmiany hasła "
 "aktualizowany jest także wiek hasła."
 
-#: chpasswd.8.xml:46(para) chgpasswd.8.xml:46(para)
+#: chpasswd.8.xml:75(para) chgpasswd.8.xml:75(para)
 msgid ""
 "The default encryption algorithm can be defined for the system with the "
 "ENCRYPT_METHOD variable of <filename>/etc/login.defs</filename>, and can be "
@@ -6191,7 +6864,7 @@
 "option> options."
 msgstr ""
 
-#: chpasswd.8.xml:52(para) chgpasswd.8.xml:52(para)
+#: chpasswd.8.xml:81(para) chgpasswd.8.xml:81(para)
 msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are created at a single time."
@@ -6199,24 +6872,28 @@
 "Polecenie to przeznaczone jest do użytku w dużych systemach, gdzie "
 "aktualizuje się wiele kont naraz."
 
-#: chpasswd.8.xml:60(para)
+#: chpasswd.8.xml:89(para)
 msgid "The options which apply to the <command>chpasswd</command> command are:"
 msgstr "Polecenie <command>chpasswd</command> posiada następujące opcje:"
 
-#: chpasswd.8.xml:76(term) chgpasswd.8.xml:76(term)
+#: chpasswd.8.xml:98(para) chgpasswd.8.xml:98(para)
+msgid "The available methods are DES, MD5, and NONE."
+msgstr ""
+
+#: chpasswd.8.xml:108(term) chgpasswd.8.xml:108(term)
 msgid "<option>-e</option>, <option>--encrypted</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: chpasswd.8.xml:78(para) chgpasswd.8.xml:78(para)
+#: chpasswd.8.xml:110(para) chgpasswd.8.xml:110(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr ""
 "Dostarczone na standardowe wejście hasła są traktowane jako już zakodowane."
 
-#: chpasswd.8.xml:88(term) chgpasswd.8.xml:88(term)
+#: chpasswd.8.xml:120(term) chgpasswd.8.xml:120(term)
 msgid "<option>-m</option>, <option>--md5</option>"
 msgstr "<option>-m</option>, <option>--md5</option>"
 
-#: chpasswd.8.xml:90(para) chgpasswd.8.xml:90(para)
+#: chpasswd.8.xml:122(para) chgpasswd.8.xml:122(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
@@ -6224,7 +6901,7 @@
 "Jeżeli dpostarczane hasła są w postaci jawnej użyj kodowania MD5 zamiast "
 "domyślnego DES."
 
-#: chpasswd.8.xml:126(para) chgpasswd.8.xml:126(para)
+#: chpasswd.8.xml:158(para) chgpasswd.8.xml:158(para)
 msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
@@ -6232,7 +6909,7 @@
 "Pamiętaj żeby zabezpieczyć przed odczytem plik przekazywany na standardowe "
 "wejście polecenia."
 
-#: chpasswd.8.xml:178(para)
+#: chpasswd.8.xml:210(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
@@ -6249,11 +6926,11 @@
 "citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: chgpasswd.8.xml:19(refpurpose)
+#: chgpasswd.8.xml:48(refpurpose)
 msgid "update group passwords in batch mode"
 msgstr "wsadowa aktualizacja haseł grup"
 
-#: chgpasswd.8.xml:33(para)
+#: chgpasswd.8.xml:62(para)
 msgid ""
 "The <command>chgpasswd</command> command reads a list of group name and "
 "password pairs from standard input and uses this information to update a set "
@@ -6264,7 +6941,7 @@
 "aktualizacji danych o grupach istniejących użytkowników. Każdy wiersz "
 "przekazywanych danych ma postać:"
 
-#: chgpasswd.8.xml:38(para)
+#: chgpasswd.8.xml:67(para)
 msgid ""
 "<emphasis remap=\"I\">group_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -6272,7 +6949,7 @@
 "<emphasis remap=\"I\">nazwa_grupy</emphasis>:<emphasis remap=\"I\">hasło</"
 "emphasis>"
 
-#: chgpasswd.8.xml:42(para)
+#: chgpasswd.8.xml:71(para)
 #, fuzzy
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
@@ -6281,12 +6958,12 @@
 "Domyślnie dostarczane hasła muszą być w postaci jawnej. Podczas kodowania "
 "haseł używany jest domyślnie algorytm DES."
 
-#: chgpasswd.8.xml:60(para)
+#: chgpasswd.8.xml:89(para)
 msgid ""
 "The options which apply to the <command>chgpasswd</command> command are:"
 msgstr "Polecenie <command>chgpasswd</command> posiada następujące opcje:"
 
-#: chgpasswd.8.xml:173(para)
+#: chgpasswd.8.xml:205(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
@@ -6301,39 +6978,43 @@
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chfn.1.xml:18(refpurpose)
+#: chfn.1.xml:47(refpurpose)
 msgid "change real user name and information"
 msgstr ""
 
-#: chfn.1.xml:24(replaceable)
+#: chfn.1.xml:53(replaceable)
 msgid "full_name"
 msgstr "full_name"
 
-#: chfn.1.xml:25(replaceable)
+#: chfn.1.xml:53(arg)
+msgid "-f <placeholder-1/>"
+msgstr "-f <placeholder-1/>"
+
+#: chfn.1.xml:54(replaceable)
 msgid "room_no"
 msgstr "room_no"
 
-#: chfn.1.xml:26(replaceable)
+#: chfn.1.xml:55(replaceable)
 msgid "work_ph"
 msgstr "work_ph"
 
-#: chfn.1.xml:26(arg)
+#: chfn.1.xml:55(arg)
 msgid "-w <placeholder-1/>"
 msgstr "-w <placeholder-1/>"
 
-#: chfn.1.xml:27(replaceable)
+#: chfn.1.xml:56(replaceable)
 msgid "home_ph"
 msgstr "home_ph"
 
-#: chfn.1.xml:28(replaceable)
+#: chfn.1.xml:57(replaceable)
 msgid "other"
 msgstr "other"
 
-#: chfn.1.xml:28(arg)
+#: chfn.1.xml:57(arg)
 msgid "-o <placeholder-1/>"
 msgstr "-o <placeholder-1/>"
 
-#: chfn.1.xml:35(para)
+#: chfn.1.xml:64(para)
 msgid ""
 "The <command>chfn</command> command changes user fullname, office number, "
 "office extension, and home phone number information for a user's account. "
@@ -6347,7 +7028,7 @@
 "option to change the undefined portions of the GECOS field."
 msgstr ""
 
-#: chfn.1.xml:49(para)
+#: chfn.1.xml:78(para)
 msgid ""
 "These fields must not contain any colons. Except for the <emphasis remap=\"I"
 "\">other</emphasis> field, they should not contain any comma or equal sign. "
@@ -6356,7 +7037,7 @@
 "field is used to store accounting information used by other applications."
 msgstr ""
 
-#: chfn.1.xml:58(para)
+#: chfn.1.xml:87(para)
 msgid ""
 "If none of the options are selected, <command>chfn</command> operates in an "
 "interactive fashion, prompting the user with the current values for all of "
@@ -6366,7 +7047,7 @@
 "command> prompts for the current user account."
 msgstr ""
 
-#: chfn.1.xml:103(para)
+#: chfn.1.xml:132(para)
 msgid ""
 "<citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -6380,16 +7061,16 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chage.1.xml:5(refentrytitle) chage.1.xml:10(refname)
-#: chage.1.xml:15(command)
+#: chage.1.xml:34(refentrytitle) chage.1.xml:39(refname)
+#: chage.1.xml:44(command)
 msgid "chage"
 msgstr "chage"
 
-#: chage.1.xml:11(refpurpose)
+#: chage.1.xml:40(refpurpose)
 msgid "change user password expiry information"
 msgstr "zmiana informacji o terminie ważności hasła użytkownika"
 
-#: chage.1.xml:27(para)
+#: chage.1.xml:56(para)
 msgid ""
 "The <command>chage</command> command changes the number of days between "
 "password changes and the date of the last password change. This information "
@@ -6399,11 +7080,11 @@
 "hasła i datę ostatniej zmiany hasła. Informację tę system wykorzystuje do "
 "ustalenia, kiedy użytkownik musi zmienić hasło."
 
-#: chage.1.xml:37(para)
+#: chage.1.xml:66(para)
 msgid "The options which apply to the <command>chage</command> command are:"
 msgstr "Polecenie <command>chage</command> posiada następujące opcje:"
 
-#: chage.1.xml:42(term)
+#: chage.1.xml:71(term)
 msgid ""
 "<option>-d</option>, <option>--lastday</option><replaceable>LAST_DAY</"
 "replaceable>"
@@ -6411,7 +7092,7 @@
 "<option>-d</option>, <option>--lastday</option><replaceable>OSTATNI</"
 "replaceable>"
 
-#: chage.1.xml:46(para)
+#: chage.1.xml:75(para)
 msgid ""
 "Set the number of days since January 1st, 1970 when the password was last "
 "changed. The date may also be expressed in the format YYYY-MM-DD (or the "
@@ -6421,7 +7102,7 @@
 "Data ważności może być takze prezekazana w formacie RRRR-MM-DD (lub formacie "
 "używanym lokalnie)."
 
-#: chage.1.xml:54(term)
+#: chage.1.xml:83(term)
 msgid ""
 "<option>-E</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -6429,7 +7110,7 @@
 "<option>-E</option>, <option>--expiredate</option><replaceable>DATA_WAŻN</"
 "replaceable>"
 
-#: chage.1.xml:58(para)
+#: chage.1.xml:87(para)
 msgid ""
 "Set the date or number of days since January 1, 1970 on which the user's "
 "account will no longer be accessible. The date may also be expressed in the "
@@ -6444,7 +7125,7 @@
 "konto jest zablokowane musi skontaktować się z administratorem systemu zanim "
 "będzie mógł z niego ponownie skorzystać."
 
-#: chage.1.xml:66(para)
+#: chage.1.xml:95(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>EXPIRE_DATE</replaceable> will remove an account expiration "
@@ -6453,7 +7134,7 @@
 "Przekazanie <emphasis remap=\"I\">-1</emphasis> jako <replaceable>DATA_WAŻN</"
 "replaceable> usuwa ograniczenie ważności konta użytkownika."
 
-#: chage.1.xml:80(term)
+#: chage.1.xml:109(term)
 msgid ""
 "<option>-I</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -6461,7 +7142,7 @@
 "<option>-I</option>, <option>--inactive</option><replaceable>NIEAKTYWNE</"
 "replaceable>"
 
-#: chage.1.xml:84(para)
+#: chage.1.xml:113(para)
 msgid ""
 "Set the number of days of inactivity after a password has expired before the "
 "account is locked. The <replaceable>INACTIVE</replaceable> option is the "
@@ -6474,7 +7155,7 @@
 "Użytkownik, którego konto jest zablokowane musi skontaktować się z "
 "administratorem systemu zanim będzie mógł z niego ponownie skorzystać."
 
-#: chage.1.xml:91(para)
+#: chage.1.xml:120(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>INACTIVE</replaceable> will remove an account's inactivity."
@@ -6483,15 +7164,11 @@
 "<replaceable>NIEAKTYWNE</replaceable> usuwa ograniczenie nieaktywniści konta "
 "użytkownika."
 
-#: chage.1.xml:99(term)
-msgid "<option>-l</option>, <option>--list</option>"
-msgstr "<option>-l</option>, <option>--list</option>"
-
-#: chage.1.xml:103(para)
+#: chage.1.xml:132(para)
 msgid "Show account aging information."
 msgstr "Wyświetlenie informacji o terminach ważności konta i hasła."
 
-#: chage.1.xml:121(term)
+#: chage.1.xml:150(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -6499,7 +7176,7 @@
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DNI</"
 "replaceable>"
 
-#: chage.1.xml:125(para)
+#: chage.1.xml:154(para)
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
 "<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
@@ -6515,7 +7192,7 @@
 "wyprzedzeniem przez wykorzystanie opcji <option>-W</option>, ostrzegającej "
 "zawczasu użytkownika o zbliżającym się terminie zmiany."
 
-#: chage.1.xml:134(para)
+#: chage.1.xml:163(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as "
 "<replaceable>MAX_DAYS</replaceable> will remove checking a password's "
@@ -6524,7 +7201,7 @@
 "Przekazanie <emphasis remap=\"I\">-1</emphasis> jako <replaceable>MAX_DAYS</"
 "replaceable> usuwa sprawdzanie wazności hasła."
 
-#: chage.1.xml:142(term)
+#: chage.1.xml:171(term)
 msgid ""
 "<option>-W</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -6532,7 +7209,7 @@
 "<option>-W</option>, <option>--warndays</option><replaceable>DNI_OSTRZ</"
 "replaceable>"
 
-#: chage.1.xml:146(para)
+#: chage.1.xml:175(para)
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
@@ -6543,7 +7220,7 @@
 "ważności hasła. Od tego dnia użytkownik będzie ostrzegany o nadchodzącym "
 "terminie zmiany hasła."
 
-#: chage.1.xml:155(para)
+#: chage.1.xml:184(para)
 msgid ""
 "If none of the options are selected, <command>chage</command> operates in an "
 "interactive fashion, prompting the user with the current values for all of "
@@ -6557,7 +7234,7 @@
 "wartości pustej pozostawia wartość bieżącą. Bieżąca wartość pola wyświetlana "
 "jest w nawiasach <emphasis>[ ]</emphasis>."
 
-#: chage.1.xml:165(para)
+#: chage.1.xml:194(para)
 msgid ""
 "The <command>chage</command> program requires a shadow password file to be "
 "available."
@@ -6565,7 +7242,7 @@
 "Program <command>chage</command> wymaga do działania chronionego pliku haseł "
 "użytkowników (shadow)."
 
-#: chage.1.xml:169(para)
+#: chage.1.xml:198(para)
 msgid ""
 "The <command>chage</command> command is restricted to the root user, except "
 "for the <option>-l</option> option, which may be used by an unprivileged "
@@ -6575,15 +7252,15 @@
 "l</option>. Może się nią posłużyć się użytkownik nieuprzywilejowany  do "
 "stwierdzenia, kiedy wygasa jego własne hasło lub konto."
 
-#: chage.1.xml:222(replaceable)
+#: chage.1.xml:251(replaceable)
 msgid "15"
 msgstr "15"
 
-#: chage.1.xml:224(para)
+#: chage.1.xml:253(para)
 msgid "can't find the shadow password file"
 msgstr "nie można znaleźć pliku shadow"
 
-#: chage.1.xml:200(para)
+#: chage.1.xml:229(para)
 msgid ""
 "The <command>chage</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6596,6 +7273,138 @@
 msgid "translator-credits"
 msgstr "Tomasz Kłoczko <kloczek at pld.org.pl>, 2006"
 
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>getpwnam</"
+#~ "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>getpwnam</"
+#~ "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>."
+
+#, fuzzy
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>."
+
+#~ msgid "-a"
+#~ msgstr "-a"
+
+#~ msgid "-d"
+#~ msgstr "-d"
+
+#~ msgid "-g"
+#~ msgstr "-g"
+
+#~ msgid "GID"
+#~ msgstr "GID"
+
+#~ msgid "-o"
+#~ msgstr "-o"
+
+#~ msgid "KEY"
+#~ msgstr "KLUCZ"
+
+#~ msgid "VALUE"
+#~ msgstr "WARTOŚĆ"
+
+#~ msgid "-K <placeholder-1/>=<placeholder-2/>"
+#~ msgstr "-K <placeholder-1/>=<placeholder-2/>"
+
+#, fuzzy
+#~ msgid "-R"
+#~ msgstr "-"
+
+#, fuzzy
+#~ msgid "<option>-A</option><replaceable>user</replaceable>,..."
+#~ msgstr ""
+#~ "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+
+#, fuzzy
+#~ msgid "<option>-M</option><replaceable>user</replaceable>,..."
+#~ msgstr ""
+#~ "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+
+#~ msgid ""
+#~ "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
+#~ "replaceable>"
+#~ msgstr ""
+#~ "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
+#~ "replaceable>"
+
 #~ msgid "An4wtbt"
 #~ msgstr "An4wtbt"
 
@@ -6635,27 +7444,6 @@
 #~ msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 
 #~ msgid ""
-#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>login</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
-#~ msgstr ""
-#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>login</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
-
-#~ msgid ""
 #~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
 #~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</"
 #~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "

Modified: upstream/trunk/man/po/ru.po
===================================================================
--- upstream/trunk/man/po/ru.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/man/po/ru.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1:4.0.18.2-1\n"
-"POT-Creation-Date: 2008-05-24 21:02+0200\n"
+"POT-Creation-Date: 2009-04-06 00:48+0200\n"
 "PO-Revision-Date: 2007-11-21 21:37+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -15,82 +15,81 @@
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 # type: Content of: <refentry><refsect1><para><command>
-#: vipw.8.xml:9(refentrytitle) vipw.8.xml:14(refname) vipw.8.xml:23(command)
-#: login.defs.5.xml:419(term)
+#: vipw.8.xml:38(refentrytitle) vipw.8.xml:43(refname) vipw.8.xml:52(command)
 msgid "vipw"
 msgstr "vipw"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><manvolnum>
-#: vipw.8.xml:10(manvolnum) usermod.8.xml:11(manvolnum)
-#: userdel.8.xml:13(manvolnum) userdel.8.xml:170(replaceable)
-#: useradd.8.xml:20(manvolnum) pwconv.8.xml:13(manvolnum)
-#: pwck.8.xml:12(manvolnum) nologin.8.xml:6(manvolnum)
-#: newusers.8.xml:22(manvolnum) logoutd.8.xml:6(manvolnum)
-#: lastlog.8.xml:6(manvolnum) grpck.8.xml:10(manvolnum)
-#: groupmod.8.xml:10(manvolnum) groupmems.8.xml:10(manvolnum)
-#: groupdel.8.xml:10(manvolnum) groupdel.8.xml:100(replaceable)
-#: groupadd.8.xml:12(manvolnum) faillog.8.xml:6(manvolnum)
-#: faillog.5.xml:53(manvolnum) chpasswd.8.xml:13(manvolnum)
-#: chgpasswd.8.xml:14(manvolnum)
+#: vipw.8.xml:39(manvolnum) usermod.8.xml:40(manvolnum)
+#: userdel.8.xml:42(manvolnum) userdel.8.xml:199(replaceable)
+#: useradd.8.xml:50(manvolnum) pwconv.8.xml:43(manvolnum)
+#: pwck.8.xml:41(manvolnum) nologin.8.xml:35(manvolnum)
+#: newusers.8.xml:51(manvolnum) logoutd.8.xml:35(manvolnum)
+#: lastlog.8.xml:36(manvolnum) grpck.8.xml:39(manvolnum)
+#: groupmod.8.xml:39(manvolnum) groupmems.8.xml:39(manvolnum)
+#: groupdel.8.xml:39(manvolnum) groupdel.8.xml:129(replaceable)
+#: groupadd.8.xml:43(manvolnum) faillog.8.xml:35(manvolnum)
+#: faillog.5.xml:82(manvolnum) chpasswd.8.xml:42(manvolnum)
+#: chgpasswd.8.xml:43(manvolnum)
 msgid "8"
 msgstr "8"
 
 # type: Content of: <refentry><refmeta><refmiscinfo>
-#: vipw.8.xml:11(refmiscinfo) usermod.8.xml:12(refmiscinfo)
-#: userdel.8.xml:14(refmiscinfo) useradd.8.xml:21(refmiscinfo)
-#: pwconv.8.xml:14(refmiscinfo) pwck.8.xml:13(refmiscinfo)
-#: nologin.8.xml:7(refmiscinfo) newusers.8.xml:23(refmiscinfo)
-#: logoutd.8.xml:7(refmiscinfo) lastlog.8.xml:7(refmiscinfo)
-#: grpck.8.xml:11(refmiscinfo) groupmod.8.xml:11(refmiscinfo)
-#: groupmems.8.xml:11(refmiscinfo) groupdel.8.xml:11(refmiscinfo)
-#: groupadd.8.xml:13(refmiscinfo) faillog.8.xml:7(refmiscinfo)
-#: chpasswd.8.xml:14(refmiscinfo) chgpasswd.8.xml:15(refmiscinfo)
+#: vipw.8.xml:40(refmiscinfo) usermod.8.xml:41(refmiscinfo)
+#: userdel.8.xml:43(refmiscinfo) useradd.8.xml:51(refmiscinfo)
+#: pwconv.8.xml:44(refmiscinfo) pwck.8.xml:42(refmiscinfo)
+#: nologin.8.xml:36(refmiscinfo) newusers.8.xml:52(refmiscinfo)
+#: logoutd.8.xml:36(refmiscinfo) lastlog.8.xml:37(refmiscinfo)
+#: grpck.8.xml:40(refmiscinfo) groupmod.8.xml:40(refmiscinfo)
+#: groupmems.8.xml:40(refmiscinfo) groupdel.8.xml:40(refmiscinfo)
+#: groupadd.8.xml:44(refmiscinfo) faillog.8.xml:36(refmiscinfo)
+#: chpasswd.8.xml:43(refmiscinfo) chgpasswd.8.xml:44(refmiscinfo)
 msgid "System Management Commands"
 msgstr "Команды управления системой"
 
 # type: Content of: <refentry><refsect1><para><command>
-#: vipw.8.xml:15(refname) vipw.8.xml:29(command)
+#: vipw.8.xml:44(refname) vipw.8.xml:58(command)
 msgid "vigr"
 msgstr "vigr"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: vipw.8.xml:16(refpurpose)
+#: vipw.8.xml:45(refpurpose)
 msgid "edit the password, group, shadow-password or shadow-group file"
 msgstr ""
 "служат для редактирования файлов паролей, групп, теневых паролей "
 "пользователей или групп."
 
 # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: vipw.8.xml:25(replaceable) vipw.8.xml:31(replaceable)
-#: usermod.8.xml:23(replaceable) userdel.8.xml:23(arg)
-#: useradd.8.xml:31(replaceable) useradd.8.xml:43(replaceable)
-#: su.1.xml:37(replaceable) passwd.1.xml:28(replaceable)
-#: lastlog.8.xml:18(replaceable) groupmod.8.xml:22(replaceable)
-#: faillog.8.xml:18(replaceable) chsh.1.xml:24(replaceable)
-#: chpasswd.8.xml:25(replaceable) chgpasswd.8.xml:26(replaceable)
-#: chage.1.xml:17(replaceable)
+#: vipw.8.xml:54(replaceable) vipw.8.xml:60(replaceable)
+#: usermod.8.xml:52(replaceable) userdel.8.xml:52(arg)
+#: useradd.8.xml:61(replaceable) useradd.8.xml:73(replaceable)
+#: su.1.xml:66(replaceable) passwd.1.xml:57(replaceable)
+#: lastlog.8.xml:48(replaceable) groupmod.8.xml:51(replaceable)
+#: groupadd.8.xml:55(replaceable) faillog.8.xml:47(replaceable)
+#: chsh.1.xml:53(replaceable) chpasswd.8.xml:54(replaceable)
+#: chgpasswd.8.xml:55(replaceable) chage.1.xml:46(replaceable)
 msgid "options"
 msgstr "параметры"
 
 # type: Content of: <refentry><refsect1><title>
-#: vipw.8.xml:37(title) usermod.8.xml:30(title) userdel.8.xml:31(title)
-#: useradd.8.xml:49(title) suauth.5.xml:21(title) su.1.xml:48(title)
-#: sg.1.xml:30(title) shadow.5.xml:15(title) shadow.3.xml:64(title)
-#: shadow.3.xml:120(title) pwconv.8.xml:40(title) pwck.8.xml:52(title)
-#: porttime.5.xml:15(title) passwd.5.xml:15(title) passwd.1.xml:37(title)
-#: nologin.8.xml:21(title) newusers.8.xml:40(title) newgrp.1.xml:26(title)
-#: logoutd.8.xml:21(title) login.defs.5.xml:76(title)
-#: login.access.5.xml:15(title) login.1.xml:72(title) limits.5.xml:16(title)
-#: lastlog.8.xml:24(title) gshadow.5.xml:15(title) grpck.8.xml:40(title)
-#: groups.1.xml:24(title) groupmod.8.xml:29(title) groupmems.8.xml:31(title)
-#: groupdel.8.xml:28(title) groupadd.8.xml:36(title) gpasswd.1.xml:40(title)
-#: faillog.8.xml:24(title) faillog.5.xml:15(title) expiry.1.xml:29(title)
-#: chsh.1.xml:33(title) chpasswd.8.xml:31(title) chgpasswd.8.xml:32(title)
-#: chfn.1.xml:34(title) chage.1.xml:26(title)
+#: vipw.8.xml:66(title) usermod.8.xml:59(title) userdel.8.xml:60(title)
+#: useradd.8.xml:79(title) suauth.5.xml:50(title) su.1.xml:77(title)
+#: sg.1.xml:59(title) shadow.5.xml:44(title) shadow.3.xml:93(title)
+#: shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:81(title)
+#: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
+#: nologin.8.xml:50(title) newusers.8.xml:69(title) newgrp.1.xml:55(title)
+#: logoutd.8.xml:50(title) login.defs.5.xml:107(title)
+#: login.access.5.xml:45(title) login.1.xml:103(title) limits.5.xml:46(title)
+#: lastlog.8.xml:54(title) gshadow.5.xml:43(title) grpck.8.xml:69(title)
+#: groups.1.xml:53(title) groupmod.8.xml:58(title) groupmems.8.xml:60(title)
+#: groupdel.8.xml:57(title) groupadd.8.xml:62(title) gpasswd.1.xml:69(title)
+#: faillog.8.xml:53(title) faillog.5.xml:44(title) expiry.1.xml:59(title)
+#: chsh.1.xml:62(title) chpasswd.8.xml:60(title) chgpasswd.8.xml:61(title)
+#: chfn.1.xml:63(title) chage.1.xml:55(title)
 msgid "DESCRIPTION"
 msgstr "ОПИСАНИЕ"
 
-#: vipw.8.xml:38(para)
+#: vipw.8.xml:67(para)
 msgid ""
 "The <command>vipw</command> and <command>vigr</command> commands edits the "
 "files <filename>/etc/passwd</filename> and <filename>/etc/group</filename>, "
@@ -115,280 +114,197 @@
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><title>
-#: vipw.8.xml:55(title) usermod.8.xml:38(title) userdel.8.xml:40(title)
-#: useradd.8.xml:62(title) su.1.xml:94(title) pwck.8.xml:104(title)
-#: passwd.1.xml:123(title) newusers.8.xml:98(title) login.1.xml:157(title)
-#: lastlog.8.xml:36(title) grpck.8.xml:85(title) groupmod.8.xml:38(title)
-#: groupmems.8.xml:46(title) groupadd.8.xml:45(title) gpasswd.1.xml:80(title)
-#: faillog.8.xml:35(title) chsh.1.xml:44(title) chpasswd.8.xml:59(title)
-#: chgpasswd.8.xml:59(title) chage.1.xml:36(title)
+#: vipw.8.xml:84(title) usermod.8.xml:67(title) userdel.8.xml:69(title)
+#: useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:133(title)
+#: passwd.1.xml:151(title) newusers.8.xml:221(title) login.1.xml:188(title)
+#: lastlog.8.xml:66(title) grpck.8.xml:114(title) groupmod.8.xml:67(title)
+#: groupmems.8.xml:75(title) groupadd.8.xml:71(title) gpasswd.1.xml:109(title)
+#: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:88(title)
+#: chgpasswd.8.xml:88(title) chage.1.xml:65(title)
 msgid "OPTIONS"
 msgstr "ПАРАМЕТРЫ"
 
-#: vipw.8.xml:56(para)
+#: vipw.8.xml:85(para)
 msgid ""
 "The options which apply to the <command>vipw</command> and <command>vigr</"
 "command> commands are:"
 msgstr "Параметры команд <command>vipw</command> и <command>vigr</command>:"
 
-#: vipw.8.xml:62(term)
+#: vipw.8.xml:91(term)
 msgid "<option>-g</option>, <option>--group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: vipw.8.xml:64(para)
+#: vipw.8.xml:93(para)
 msgid "Edit group database."
 msgstr "Редактирует базу данных групп."
 
-#: vipw.8.xml:68(term) userdel.8.xml:70(term) useradd.8.xml:179(term)
-#: passwd.1.xml:163(term) lastlog.8.xml:52(term) groupmod.8.xml:64(term)
-#: groupadd.8.xml:80(term) faillog.8.xml:48(term) chsh.1.xml:50(term)
-#: chpasswd.8.xml:82(term) chgpasswd.8.xml:82(term) chage.1.xml:74(term)
+#: vipw.8.xml:97(term) userdel.8.xml:99(term) useradd.8.xml:247(term)
+#: passwd.1.xml:191(term) lastlog.8.xml:82(term) groupmod.8.xml:93(term)
+#: groupadd.8.xml:106(term) faillog.8.xml:80(term) chsh.1.xml:79(term)
+#: chpasswd.8.xml:114(term) chgpasswd.8.xml:114(term) chage.1.xml:103(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr "<option>-h</option>, <option>--help</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: vipw.8.xml:70(para) userdel.8.xml:72(para) useradd.8.xml:181(para)
-#: passwd.1.xml:165(para) lastlog.8.xml:56(para) groupmod.8.xml:66(para)
-#: groupadd.8.xml:82(para) faillog.8.xml:50(para) chsh.1.xml:52(para)
-#: chpasswd.8.xml:84(para) chgpasswd.8.xml:84(para) chage.1.xml:76(para)
+#: vipw.8.xml:99(para) userdel.8.xml:101(para) useradd.8.xml:249(para)
+#: passwd.1.xml:193(para) lastlog.8.xml:86(para) groupmod.8.xml:95(para)
+#: groupadd.8.xml:108(para) faillog.8.xml:82(para) chsh.1.xml:81(para)
+#: chpasswd.8.xml:116(para) chgpasswd.8.xml:116(para) chage.1.xml:105(para)
 msgid "Display help message and exit."
 msgstr "Показать краткую справку и закончить работу."
 
-#: vipw.8.xml:74(term)
+#: vipw.8.xml:103(term)
 msgid "<option>-p</option>, <option>--passwd</option>"
 msgstr "<option>-p</option>, <option>--passwd</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: vipw.8.xml:76(para)
+#: vipw.8.xml:105(para)
 msgid "Edit passwd database."
 msgstr "Редактировать базу данных passwd."
 
-#: vipw.8.xml:80(term) passwd.1.xml:218(term)
+#: vipw.8.xml:109(term) passwd.1.xml:258(term)
 msgid "<option>-q</option>, <option>--quiet</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: vipw.8.xml:82(para) passwd.1.xml:222(para)
+#: vipw.8.xml:111(para) passwd.1.xml:262(para)
 msgid "Quiet mode."
 msgstr "Не выводить сообщений при работе."
 
-#: vipw.8.xml:86(term)
+#: vipw.8.xml:115(term)
 msgid "<option>-s</option>, <option>--shadow</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: vipw.8.xml:88(para)
+#: vipw.8.xml:117(para)
 msgid "Edit shadow or gshadow database."
 msgstr "Редактировать базу данных shadow или gshadow."
 
-#: vipw.8.xml:95(title) usermod.8.xml:265(title) userdel.8.xml:96(title)
-#: useradd.8.xml:471(title) su.1.xml:196(title) sg.1.xml:47(title)
-#: pwconv.8.xml:116(title) pwck.8.xml:153(title) passwd.1.xml:307(title)
-#: newusers.8.xml:174(title) newgrp.1.xml:58(title) login.1.xml:236(title)
-#: grpck.8.xml:125(title) groupmod.8.xml:109(title) groupmems.8.xml:107(title)
-#: groupdel.8.xml:47(title) groupadd.8.xml:149(title) gpasswd.1.xml:186(title)
-#: chsh.1.xml:91(title) chpasswd.8.xml:139(title) chgpasswd.8.xml:133(title)
-#: chfn.1.xml:70(title)
-msgid "CONFIGURATION"
-msgstr ""
-
-#: vipw.8.xml:96(para) usermod.8.xml:266(para) userdel.8.xml:97(para)
-#: useradd.8.xml:472(para) su.1.xml:197(para) sg.1.xml:48(para)
-#: pwck.8.xml:154(para) passwd.1.xml:308(para) newusers.8.xml:175(para)
-#: newgrp.1.xml:59(para) login.1.xml:237(para) grpck.8.xml:126(para)
-#: groupmod.8.xml:110(para) groupmems.8.xml:108(para) groupdel.8.xml:48(para)
-#: groupadd.8.xml:150(para) gpasswd.1.xml:187(para) chsh.1.xml:92(para)
-#: chpasswd.8.xml:140(para) chgpasswd.8.xml:134(para) chfn.1.xml:71(para)
-msgid ""
-"The following configuration variables in <filename>/etc/login.defs</"
-"filename> change the behavior of this tool:"
-msgstr ""
-
-#: vipw.8.xml:2(term) usermod.8.xml:2(term) userdel.8.xml:2(term)
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) newusers.8.xml:2(term)
-#: login.defs.5.xml:2(term) grpck.8.xml:2(term) groupmod.8.xml:2(term)
-#: groupmems.8.xml:2(term) groupdel.8.xml:2(term) groupadd.8.xml:2(term)
-#: gpasswd.1.xml:2(term) chgpasswd.8.xml:2(term)
-msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
-msgstr ""
-
-#: vipw.8.xml:4(para) usermod.8.xml:4(para) userdel.8.xml:4(para)
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) newusers.8.xml:4(para)
-#: login.defs.5.xml:4(para) grpck.8.xml:4(para) groupmod.8.xml:4(para)
-#: groupmems.8.xml:4(para) groupdel.8.xml:4(para) groupadd.8.xml:4(para)
-#: gpasswd.1.xml:4(para) chgpasswd.8.xml:4(para)
-msgid ""
-"Maximum members per group entry. When the maximum is reached, a new group "
-"entry (line) is started in <filename>/etc/group</filename> (with the same "
-"name, same password, and same GID)."
-msgstr ""
-
-#: vipw.8.xml:9(para) usermod.8.xml:9(para) userdel.8.xml:9(para)
-#: useradd.8.xml:9(para) pwconv.8.xml:9(para) newusers.8.xml:9(para)
-#: login.defs.5.xml:9(para) grpck.8.xml:9(para) groupmod.8.xml:9(para)
-#: groupmems.8.xml:9(para) groupdel.8.xml:9(para) groupadd.8.xml:9(para)
-#: gpasswd.1.xml:9(para) chgpasswd.8.xml:9(para)
-msgid ""
-"The default value is 0, meaning that there are no limits in the number of "
-"members in a group."
-msgstr ""
-
-#. Note: on HP, split groups have the same ID, but different
-#.                names.
-#: vipw.8.xml:15(para) usermod.8.xml:15(para) userdel.8.xml:15(para)
-#: useradd.8.xml:15(para) pwconv.8.xml:15(para) newusers.8.xml:15(para)
-#: login.defs.5.xml:15(para) grpck.8.xml:15(para) groupmod.8.xml:15(para)
-#: groupmems.8.xml:15(para) groupdel.8.xml:15(para) groupadd.8.xml:15(para)
-#: gpasswd.1.xml:15(para) chgpasswd.8.xml:15(para)
-msgid ""
-"This feature (split group) permits to limit the length of lines in the group "
-"file. This is useful to make sure that lines for NIS groups are not larger "
-"than 1024 characters."
-msgstr ""
-
-#: vipw.8.xml:20(para) usermod.8.xml:20(para) userdel.8.xml:20(para)
-#: useradd.8.xml:20(para) pwconv.8.xml:20(para) newusers.8.xml:20(para)
-#: login.defs.5.xml:20(para) grpck.8.xml:20(para) groupmod.8.xml:20(para)
-#: groupmems.8.xml:20(para) groupdel.8.xml:20(para) groupadd.8.xml:20(para)
-#: gpasswd.1.xml:20(para) chgpasswd.8.xml:20(para)
-msgid "If you need to enforce such limit, you can use 25."
-msgstr ""
-
-#: vipw.8.xml:23(para) usermod.8.xml:23(para) userdel.8.xml:23(para)
-#: useradd.8.xml:23(para) pwconv.8.xml:23(para) newusers.8.xml:23(para)
-#: login.defs.5.xml:23(para) grpck.8.xml:23(para) groupmod.8.xml:23(para)
-#: groupmems.8.xml:23(para) groupdel.8.xml:23(para) groupadd.8.xml:23(para)
-#: gpasswd.1.xml:23(para) chgpasswd.8.xml:23(para)
-msgid ""
-"Note: split groups may not be supported by all tools (even in the Shadow "
-"toolsuite. You should not use this variable unless you really need it."
-msgstr ""
-
 # type: Content of: <refentry><refsect1><title>
-#: vipw.8.xml:107(title) usermod.8.xml:278(title) userdel.8.xml:111(title)
-#: useradd.8.xml:493(title) suauth.5.xml:139(title) su.1.xml:224(title)
-#: sg.1.xml:59(title) shadow.5.xml:105(title) shadow.3.xml:172(title)
-#: pwconv.8.xml:138(title) pwck.8.xml:167(title) porttime.5.xml:76(title)
-#: passwd.5.xml:87(title) passwd.1.xml:325(title) newusers.8.xml:197(title)
-#: newgrp.1.xml:70(title) logoutd.8.xml:35(title) login.access.5.xml:66(title)
-#: login.1.xml:280(title) limits.5.xml:110(title) lastlog.8.xml:111(title)
-#: gshadow.5.xml:61(title) grpck.8.xml:137(title) groups.1.xml:46(title)
-#: groupmod.8.xml:121(title) groupmems.8.xml:119(title)
-#: groupdel.8.xml:59(title) groupadd.8.xml:163(title) gpasswd.1.xml:201(title)
-#: faillog.8.xml:132(title) faillog.5.xml:38(title) expiry.1.xml:38(title)
-#: chsh.1.xml:104(title) chpasswd.8.xml:153(title) chgpasswd.8.xml:148(title)
-#: chfn.1.xml:84(title) chage.1.xml:177(title)
+#: vipw.8.xml:124(title) usermod.8.xml:322(title) userdel.8.xml:140(title)
+#: useradd.8.xml:619(title) suauth.5.xml:168(title) su.1.xml:253(title)
+#: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
+#: pwconv.8.xml:168(title) pwck.8.xml:196(title) porttime.5.xml:105(title)
+#: passwd.5.xml:116(title) passwd.1.xml:367(title) newusers.8.xml:320(title)
+#: newgrp.1.xml:99(title) logoutd.8.xml:64(title) login.access.5.xml:96(title)
+#: login.1.xml:316(title) limits.5.xml:140(title) lastlog.8.xml:147(title)
+#: gshadow.5.xml:89(title) grpck.8.xml:166(title) groups.1.xml:75(title)
+#: groupmod.8.xml:150(title) groupmems.8.xml:168(title)
+#: groupdel.8.xml:88(title) groupadd.8.xml:189(title) gpasswd.1.xml:230(title)
+#: faillog.8.xml:204(title) faillog.5.xml:67(title) expiry.1.xml:68(title)
+#: chsh.1.xml:133(title) chpasswd.8.xml:185(title) chgpasswd.8.xml:180(title)
+#: chfn.1.xml:113(title) chage.1.xml:206(title)
 msgid "FILES"
 msgstr "ФАЙЛЫ"
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: vipw.8.xml:110(filename) usermod.8.xml:281(filename)
-#: userdel.8.xml:114(filename) useradd.8.xml:508(filename)
-#: sg.1.xml:74(filename) pwck.8.xml:170(filename) newusers.8.xml:212(filename)
-#: newgrp.1.xml:85(filename) gshadow.5.xml:64(filename)
-#: grpck.8.xml:140(filename) groups.1.xml:49(filename)
-#: groupmod.8.xml:124(filename) groupmems.8.xml:122(filename)
-#: groupdel.8.xml:62(filename) groupadd.8.xml:166(filename)
-#: gpasswd.1.xml:20(filename) gpasswd.1.xml:204(filename)
-#: chgpasswd.8.xml:151(filename)
+#: vipw.8.xml:127(filename) usermod.8.xml:325(filename)
+#: userdel.8.xml:143(filename) useradd.8.xml:634(filename)
+#: sg.1.xml:103(filename) pwck.8.xml:199(filename)
+#: newusers.8.xml:335(filename) newgrp.1.xml:114(filename)
+#: gshadow.5.xml:92(filename) grpck.8.xml:169(filename)
+#: groups.1.xml:78(filename) groupmod.8.xml:153(filename)
+#: groupmems.8.xml:171(filename) groupdel.8.xml:91(filename)
+#: groupadd.8.xml:192(filename) gpasswd.1.xml:49(filename)
+#: gpasswd.1.xml:233(filename) chgpasswd.8.xml:183(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: vipw.8.xml:112(para) usermod.8.xml:283(para) userdel.8.xml:116(para)
-#: useradd.8.xml:510(para) sg.1.xml:76(para) pwck.8.xml:172(para)
-#: newusers.8.xml:214(para) newgrp.1.xml:87(para) gshadow.5.xml:66(para)
-#: grpck.8.xml:142(para) groups.1.xml:51(para) groupmod.8.xml:126(para)
-#: groupmems.8.xml:124(para) groupdel.8.xml:64(para) groupadd.8.xml:168(para)
-#: gpasswd.1.xml:206(para) chgpasswd.8.xml:153(para)
+#: vipw.8.xml:129(para) usermod.8.xml:327(para) userdel.8.xml:145(para)
+#: useradd.8.xml:636(para) sg.1.xml:105(para) pwck.8.xml:201(para)
+#: newusers.8.xml:337(para) newgrp.1.xml:116(para) gshadow.5.xml:94(para)
+#: grpck.8.xml:171(para) groups.1.xml:80(para) groupmod.8.xml:155(para)
+#: groupmems.8.xml:173(para) groupdel.8.xml:93(para) groupadd.8.xml:194(para)
+#: gpasswd.1.xml:235(para) chgpasswd.8.xml:185(para)
 msgid "Group account information."
 msgstr "содержит информацию о группах"
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: vipw.8.xml:116(filename) useradd.8.xml:514(filename) sg.1.xml:80(filename)
-#: newusers.8.xml:218(filename) newgrp.1.xml:91(filename)
-#: gshadow.5.xml:70(filename) grpck.8.xml:146(filename)
-#: groupmod.8.xml:130(filename) groupmems.8.xml:128(filename)
-#: groupdel.8.xml:68(filename) groupadd.8.xml:172(filename)
-#: gpasswd.1.xml:21(filename) gpasswd.1.xml:210(filename)
-#: chgpasswd.8.xml:157(filename)
+#: vipw.8.xml:133(filename) useradd.8.xml:640(filename) sg.1.xml:109(filename)
+#: newusers.8.xml:341(filename) newgrp.1.xml:120(filename)
+#: gshadow.5.xml:98(filename) grpck.8.xml:175(filename)
+#: groupmod.8.xml:159(filename) groupmems.8.xml:177(filename)
+#: groupdel.8.xml:97(filename) groupadd.8.xml:198(filename)
+#: gpasswd.1.xml:50(filename) gpasswd.1.xml:239(filename)
+#: chgpasswd.8.xml:189(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: vipw.8.xml:118(para) useradd.8.xml:516(para) sg.1.xml:82(para)
-#: newusers.8.xml:220(para) newgrp.1.xml:93(para) gshadow.5.xml:72(para)
-#: grpck.8.xml:148(para) groupmod.8.xml:132(para) groupdel.8.xml:70(para)
-#: groupadd.8.xml:174(para) gpasswd.1.xml:212(para) chgpasswd.8.xml:159(para)
+#: vipw.8.xml:135(para) useradd.8.xml:642(para) sg.1.xml:111(para)
+#: newusers.8.xml:343(para) newgrp.1.xml:122(para) gshadow.5.xml:100(para)
+#: grpck.8.xml:177(para) groupmod.8.xml:161(para) groupdel.8.xml:99(para)
+#: groupadd.8.xml:200(para) gpasswd.1.xml:241(para) chgpasswd.8.xml:191(para)
 msgid "Secure group account information."
 msgstr "содержит защищаемую информацию о группах"
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: vipw.8.xml:122(filename) usermod.8.xml:287(filename)
-#: userdel.8.xml:126(filename) useradd.8.xml:496(filename)
-#: su.1.xml:227(filename) sg.1.xml:62(filename) shadow.5.xml:108(filename)
-#: pwck.8.xml:176(filename) passwd.5.xml:90(filename)
-#: passwd.1.xml:328(filename) newusers.8.xml:200(filename)
-#: newgrp.1.xml:73(filename) login.1.xml:295(filename)
-#: grpck.8.xml:152(filename) expiry.1.xml:41(filename)
-#: chsh.1.xml:107(filename) chpasswd.8.xml:156(filename)
-#: chfn.1.xml:93(filename) chage.1.xml:181(filename)
+#: vipw.8.xml:139(filename) usermod.8.xml:331(filename)
+#: userdel.8.xml:155(filename) useradd.8.xml:622(filename)
+#: su.1.xml:256(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
+#: pwck.8.xml:205(filename) passwd.5.xml:119(filename)
+#: passwd.1.xml:370(filename) newusers.8.xml:323(filename)
+#: newgrp.1.xml:102(filename) login.1.xml:331(filename)
+#: grpck.8.xml:181(filename) expiry.1.xml:71(filename)
+#: chsh.1.xml:136(filename) chpasswd.8.xml:188(filename)
+#: chfn.1.xml:122(filename) chage.1.xml:210(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: vipw.8.xml:124(para) usermod.8.xml:289(para) userdel.8.xml:128(para)
-#: useradd.8.xml:498(para) su.1.xml:229(para) sg.1.xml:64(para)
-#: shadow.5.xml:110(para) pwck.8.xml:178(para) passwd.5.xml:92(para)
-#: passwd.1.xml:330(para) newusers.8.xml:202(para) newgrp.1.xml:75(para)
-#: login.1.xml:297(para) grpck.8.xml:154(para) expiry.1.xml:43(para)
-#: chsh.1.xml:109(para) chpasswd.8.xml:158(para) chfn.1.xml:95(para)
-#: chage.1.xml:184(para)
+#: vipw.8.xml:141(para) usermod.8.xml:333(para) userdel.8.xml:157(para)
+#: useradd.8.xml:624(para) su.1.xml:258(para) sg.1.xml:93(para)
+#: shadow.5.xml:235(para) pwck.8.xml:207(para) passwd.5.xml:121(para)
+#: passwd.1.xml:372(para) newusers.8.xml:325(para) newgrp.1.xml:104(para)
+#: login.1.xml:333(para) grpck.8.xml:183(para) expiry.1.xml:73(para)
+#: chsh.1.xml:138(para) chpasswd.8.xml:190(para) chfn.1.xml:124(para)
+#: chage.1.xml:213(para)
 msgid "User account information."
 msgstr "содержит информацию о пользователях"
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: vipw.8.xml:128(filename) usermod.8.xml:293(filename)
-#: userdel.8.xml:132(filename) useradd.8.xml:502(filename)
-#: su.1.xml:233(filename) sg.1.xml:68(filename) shadow.5.xml:114(filename)
-#: shadow.3.xml:175(filename) pwck.8.xml:182(filename)
-#: passwd.5.xml:96(filename) passwd.1.xml:334(filename)
-#: newusers.8.xml:206(filename) newgrp.1.xml:79(filename)
-#: login.1.xml:301(filename) expiry.1.xml:47(filename)
-#: chpasswd.8.xml:162(filename) chage.1.xml:189(filename)
+#: vipw.8.xml:145(filename) usermod.8.xml:337(filename)
+#: userdel.8.xml:161(filename) useradd.8.xml:628(filename)
+#: su.1.xml:262(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
+#: shadow.3.xml:204(filename) pwck.8.xml:211(filename)
+#: passwd.5.xml:125(filename) passwd.1.xml:376(filename)
+#: newusers.8.xml:329(filename) newgrp.1.xml:108(filename)
+#: login.1.xml:337(filename) expiry.1.xml:77(filename)
+#: chpasswd.8.xml:194(filename) chage.1.xml:218(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: vipw.8.xml:130(para) usermod.8.xml:295(para) userdel.8.xml:134(para)
-#: useradd.8.xml:504(para) su.1.xml:235(para) sg.1.xml:70(para)
-#: shadow.5.xml:116(para) shadow.3.xml:177(para) pwck.8.xml:184(para)
-#: passwd.1.xml:336(para) newusers.8.xml:208(para) newgrp.1.xml:81(para)
-#: login.1.xml:303(para) expiry.1.xml:49(para) chpasswd.8.xml:164(para)
-#: chage.1.xml:192(para)
+#: vipw.8.xml:147(para) usermod.8.xml:339(para) userdel.8.xml:163(para)
+#: useradd.8.xml:630(para) su.1.xml:264(para) sg.1.xml:99(para)
+#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:213(para)
+#: passwd.1.xml:378(para) newusers.8.xml:331(para) newgrp.1.xml:110(para)
+#: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:196(para)
+#: chage.1.xml:221(para)
 msgid "Secure user account information."
 msgstr "содержит защищаемую информацию о пользователях"
 
 # type: Content of: <refentry><refsect1><title>
-#: vipw.8.xml:137(title) usermod.8.xml:302(title) userdel.8.xml:213(title)
-#: useradd.8.xml:610(title) suauth.5.xml:168(title) su.1.xml:242(title)
-#: sg.1.xml:89(title) shadow.5.xml:123(title) shadow.3.xml:184(title)
-#: pwconv.8.xml:150(title) pwck.8.xml:191(title) porttime.5.xml:88(title)
-#: passwd.5.xml:105(title) passwd.1.xml:394(title) nologin.8.xml:35(title)
-#: newusers.8.xml:233(title) newgrp.1.xml:100(title)
-#: login.defs.5.xml:445(title) login.access.5.xml:78(title)
-#: login.1.xml:334(title) limits.5.xml:120(title) gshadow.5.xml:79(title)
-#: grpck.8.xml:161(title) groups.1.xml:58(title) groupmod.8.xml:190(title)
-#: groupmems.8.xml:137(title) groupdel.8.xml:116(title)
-#: groupadd.8.xml:253(title) gpasswd.1.xml:219(title) faillog.8.xml:144(title)
-#: faillog.5.xml:50(title) expiry.1.xml:56(title) chsh.1.xml:128(title)
-#: chpasswd.8.xml:177(title) chgpasswd.8.xml:172(title) chfn.1.xml:102(title)
-#: chage.1.xml:232(title)
+#: vipw.8.xml:154(title) usermod.8.xml:346(title) userdel.8.xml:242(title)
+#: useradd.8.xml:736(title) suauth.5.xml:197(title) su.1.xml:271(title)
+#: sg.1.xml:118(title) shadow.5.xml:248(title) shadow.3.xml:213(title)
+#: pwconv.8.xml:180(title) pwck.8.xml:220(title) porttime.5.xml:117(title)
+#: passwd.5.xml:134(title) passwd.1.xml:436(title) nologin.8.xml:64(title)
+#: newusers.8.xml:356(title) newgrp.1.xml:129(title)
+#: login.defs.5.xml:471(title) login.access.5.xml:108(title)
+#: login.1.xml:370(title) limits.5.xml:150(title) gshadow.5.xml:107(title)
+#: grpck.8.xml:190(title) groups.1.xml:87(title) groupmod.8.xml:219(title)
+#: groupmems.8.xml:186(title) groupdel.8.xml:145(title)
+#: groupadd.8.xml:279(title) gpasswd.1.xml:248(title) faillog.8.xml:216(title)
+#: faillog.5.xml:79(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
+#: chpasswd.8.xml:209(title) chgpasswd.8.xml:204(title) chfn.1.xml:131(title)
+#: chage.1.xml:261(title)
 msgid "SEE ALSO"
 msgstr "СМОТРИТЕ ТАКЖЕ"
 
-#: vipw.8.xml:138(para)
+#: vipw.8.xml:155(para)
 msgid ""
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>group</"
@@ -409,26 +325,25 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: usermod.8.xml:10(refentrytitle) usermod.8.xml:15(refname)
-#: usermod.8.xml:21(command) login.defs.5.xml:411(term)
+#: usermod.8.xml:39(refentrytitle) usermod.8.xml:44(refname)
+#: usermod.8.xml:50(command) login.defs.5.xml:443(term)
 msgid "usermod"
 msgstr "usermod"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: usermod.8.xml:16(refpurpose)
+#: usermod.8.xml:45(refpurpose)
 msgid "modify a user account"
 msgstr "изменяет учётную запись пользователя"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><emphasis>
-#: usermod.8.xml:25(replaceable) userdel.8.xml:25(replaceable)
-#: useradd.8.xml:33(replaceable) su.1.xml:41(replaceable)
-#: passwd.1.xml:31(replaceable) chsh.1.xml:27(replaceable)
-#: chage.1.xml:20(replaceable)
+#: usermod.8.xml:54(replaceable) userdel.8.xml:54(replaceable)
+#: useradd.8.xml:63(replaceable) passwd.1.xml:60(replaceable)
+#: chsh.1.xml:56(replaceable) chage.1.xml:49(replaceable)
 msgid "LOGIN"
 msgstr "LOGIN"
 
 # type: Content of: <refentry><refsect1><para>
-#: usermod.8.xml:31(para)
+#: usermod.8.xml:60(para)
 msgid ""
 "The <command>usermod</command> command modifies the system account files to "
 "reflect the changes that are specified on the command line."
@@ -437,16 +352,16 @@
 "согласно переданным в командной строке параметрам."
 
 # type: Content of: <refentry><refsect1><para>
-#: usermod.8.xml:39(para)
+#: usermod.8.xml:68(para)
 msgid "The options which apply to the <command>usermod</command> command are:"
 msgstr "Параметры команды <command>usermod</command>:"
 
-#: usermod.8.xml:45(term)
+#: usermod.8.xml:74(term)
 msgid "<option>-a</option>, <option>--append</option>"
 msgstr "<option>-a</option>, <option>--append</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:49(para)
+#: usermod.8.xml:78(para)
 msgid ""
 "Add the user to the supplemental group(s). Use only with <option>-G</option> "
 "option."
@@ -454,7 +369,7 @@
 "Добавить пользователя в дополнительную группу(ы). Использовать только вместе "
 "с параметром <option>-G</option>."
 
-#: usermod.8.xml:56(term) useradd.8.xml:83(term)
+#: usermod.8.xml:85(term) useradd.8.xml:125(term)
 msgid ""
 "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
 "replaceable>"
@@ -463,7 +378,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:61(para)
+#: usermod.8.xml:90(para)
 msgid ""
 "The new value of the user's password file comment field. It is normally "
 "modified using the <citerefentry><refentrytitle>chfn</"
@@ -473,7 +388,7 @@
 "изменяют с помощью программы <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: usermod.8.xml:70(term) useradd.8.xml:96(term)
+#: usermod.8.xml:99(term) useradd.8.xml:138(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
@@ -481,18 +396,30 @@
 "<option>-d</option>, <option>--home</option><replaceable>ДОМАШНИЙ_КАТАЛОГ</"
 "replaceable>"
 
+# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: usermod.8.xml:104(para)
+#, fuzzy
+#| msgid "user home directory"
+msgid "The user's new login directory."
+msgstr "домашний каталог пользователя"
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:75(para)
+#: usermod.8.xml:107(para)
+#, fuzzy
+#| msgid ""
+#| "The user's new login directory. If the <option>-m</option> option is "
+#| "given the contents of the current home directory will be moved to the new "
+#| "home directory, which is created if it does not already exist."
 msgid ""
-"The user's new login directory. If the <option>-m</option> option is given "
-"the contents of the current home directory will be moved to the new home "
-"directory, which is created if it does not already exist."
+"If the <option>-m</option> option is given the contents of the current home "
+"directory will be moved to the new home directory, which is created if it "
+"does not already exist."
 msgstr ""
 "Новый домашний каталог пользователя. Если указан параметр <option>-m</"
 "option>, то содержимое текущего домашнего каталога будет перемещено в новый "
 "домашний каталог, который будет создан, если он ещё не существует."
 
-#: usermod.8.xml:84(term) useradd.8.xml:123(term) useradd.8.xml:394(term)
+#: usermod.8.xml:116(term) useradd.8.xml:165(term) useradd.8.xml:494(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -501,7 +428,7 @@
 "option><replaceable>ДАТА_УСТАРЕВАНИЯ</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:89(para) useradd.8.xml:128(para)
+#: usermod.8.xml:121(para) useradd.8.xml:170(para)
 msgid ""
 "The date on which the user account will be disabled. The date is specified "
 "in the format <emphasis remap=\"I\">YYYY-MM-DD</emphasis>."
@@ -509,7 +436,7 @@
 "Дата, когда учётная запись пользователя будет заблокирована. Дата задаётся в "
 "формате <emphasis remap=\"I\">ГГГГ-ММ-ДД</emphasis>."
 
-#: usermod.8.xml:96(term) useradd.8.xml:135(term) useradd.8.xml:403(term)
+#: usermod.8.xml:128(term) useradd.8.xml:183(term) useradd.8.xml:507(term)
 msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -517,26 +444,44 @@
 "<option>-f</option>, <option>--inactive</option><replaceable>ДНЕЙ</"
 "replaceable>"
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:101(para) useradd.8.xml:140(para)
+# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: usermod.8.xml:133(para)
+#, fuzzy
+#| msgid ""
+#| "The number of days after a password has expired before the account will "
+#| "be disabled."
 msgid ""
 "The number of days after a password expires until the account is permanently "
-"disabled. A value of 0 disables the account as soon as the password has "
-"expired, and a value of -1 disables the feature. The default value is -1."
+"disabled."
 msgstr ""
+"Число дней, которые должны пройти после устаревания пароля, перед тем как "
+"учётная запись будет заблокирована."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: usermod.8.xml:137(para)
+#, fuzzy
+#| msgid ""
+#| "The number of days after a password expires until the account is "
+#| "permanently disabled. A value of 0 disables the account as soon as the "
+#| "password has expired, and a value of -1 disables the feature. The default "
+#| "value is -1."
+msgid ""
+"A value of 0 disables the account as soon as the password has expired, and a "
+"value of -1 disables the feature. The default value is -1."
+msgstr ""
 "Число дней, которые должны пройти после устаревания пароля, чтобы учётная "
 "запись заблокировалась навсегда. Если указано значение 0, то учётная запись "
 "блокируется сразу после устаревания пароля, а при значении -1 данная "
 "возможность не используется. По умолчанию используется значение -1."
 
-#: usermod.8.xml:110(term) useradd.8.xml:149(term) useradd.8.xml:415(term)
+#: usermod.8.xml:145(term) useradd.8.xml:203(term) useradd.8.xml:523(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>ГРУППА</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:115(para)
+#: usermod.8.xml:150(para)
 msgid ""
 "The group name or number of the user's new initial login group. The group "
 "name must exist. A group number must refer to an already existing group. The "
@@ -546,7 +491,7 @@
 "таким именем должна существовать. Идентификатор группы должен указывать на "
 "уже существующую группу. По умолчанию идентификатор группы установлен в 1."
 
-#: usermod.8.xml:123(term) useradd.8.xml:163(term)
+#: usermod.8.xml:158(term) useradd.8.xml:231(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -557,27 +502,45 @@
 "\"I\">,ГРУППАN</emphasis>]]]"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:128(para)
+#: usermod.8.xml:163(para)
 #, fuzzy
+#| msgid ""
+#| "A list of supplementary groups which the user is also a member of. Each "
+#| "group is separated from the next by a comma, with no intervening "
+#| "whitespace. The groups are subject to the same restrictions as the group "
+#| "given with the <option>-g</option> option. The default is for the user to "
+#| "belong only to the initial group."
 msgid ""
 "A list of supplementary groups which the user is also a member of. Each "
 "group is separated from the next by a comma, with no intervening whitespace. "
 "The groups are subject to the same restrictions as the group given with the "
-"<option>-g</option> option. If the user is currently a member of a group "
-"which is not listed, the user will be removed from the group. This behaviour "
-"can be changed via the <option>-a</option> option, which appends the user to "
-"the current supplementary group list."
+"<option>-g</option> option."
 msgstr ""
 "Список дополнительных групп, в которых числится пользователь. Перечисление "
 "групп осуществляется через запятую, без промежуточных пробелов. На указанные "
 "группы действуют те же ограничения, что и для группы указанной в параметре "
+"<option>-g</option>. По умолчанию пользователь входит только в начальную "
+"группу."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: usermod.8.xml:170(para)
+#, fuzzy
+msgid ""
+"If the user is currently a member of a group which is not listed, the user "
+"will be removed from the group. This behaviour can be changed via the "
+"<option>-a</option> option, which appends the user to the current "
+"supplementary group list."
+msgstr ""
+"Список дополнительных групп, в которых числится пользователь. Перечисление "
+"групп осуществляется через запятую, без промежуточных пробелов. На указанные "
+"группы действуют те же ограничения, что и для группы указанной в параметре "
 "<option>-g</option>. Если пользователь член группы, которой в указанном "
 "списке нет, то пользователь удаляется из этой группы. Такое поведение можно "
 "изменить с помощью параметра <option>-a</option>, при указании которого к "
 "уже имеющемуся списку групп пользователя добавляется список указанных "
 "дополнительных групп."
 
-#: usermod.8.xml:141(term)
+#: usermod.8.xml:179(term)
 msgid ""
 "<option>-l</option>, <option>--login</option><replaceable>NEW_LOGIN</"
 "replaceable>"
@@ -586,25 +549,25 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:146(para)
+#: usermod.8.xml:184(para)
 #, fuzzy
 msgid ""
-"The name of the user will be changed from <emphasis remap=\"I\">LOGIN</"
-"emphasis> to <emphasis remap=\"I\">NEW_LOGIN</emphasis>. Nothing else is "
-"changed. In particular, the user's home directory name should probably be "
-"changed manually to reflect the new login name."
+"The name of the user will be changed from <replaceable>LOGIN</replaceable> "
+"to <replaceable>NEW_LOGIN</replaceable>. Nothing else is changed. In "
+"particular, the user's home directory name should probably be changed "
+"manually to reflect the new login name."
 msgstr ""
 "Имя пользователя будет изменено с emphasis remap=\"I\">ИМЯ</emphasis> на "
 "<emphasis remap=\"I\">НОВОЕ_ИМЯ</emphasis>. Больше ничего не меняется. В "
 "частности, вероятно, должно быть изменено имя домашнего каталога "
 "пользователя, чтобы отразить изменение имени пользователя."
 
-#: usermod.8.xml:156(term)
+#: usermod.8.xml:194(term)
 msgid "<option>-L</option>, <option>--lock</option>"
 msgstr "<option>-L</option>, <option>--lock</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:160(para)
+#: usermod.8.xml:198(para)
 msgid ""
 "Lock a user's password. This puts a '!' in front of the encrypted password, "
 "effectively disabling the password. You can't use this option with <option>-"
@@ -615,20 +578,20 @@
 "используйте этот параметр вместе с <option>-p</option> или <option>-U</"
 "option>."
 
-#: usermod.8.xml:166(para)
+#: usermod.8.xml:204(para)
 msgid ""
 "Note: if you wish to lock the account (not only access with a password), you "
 "should also set the <replaceable>EXPIRE_DATE</replaceable> to "
 "<replaceable>1</replaceable>."
 msgstr ""
 
-#: usermod.8.xml:175(term) useradd.8.xml:282(term) groupmod.8.xml:82(term)
-#: groupadd.8.xml:107(term)
+#: usermod.8.xml:213(term) useradd.8.xml:364(term) groupmod.8.xml:111(term)
+#: groupadd.8.xml:133(term)
 msgid "<option>-o</option>, <option>--non-unique</option>"
 msgstr "<option>-o</option>, <option>--non-unique</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:179(para)
+#: usermod.8.xml:217(para)
 msgid ""
 "When used with the <option>-u</option> option, this option allows to change "
 "the user ID to a non-unique value."
@@ -636,8 +599,8 @@
 "При использовании с параметром <option>-u</option>, этот параметр позволяет "
 "указывать не уникальный числовой идентификатор пользователя."
 
-#: usermod.8.xml:186(term) useradd.8.xml:290(term) groupmod.8.xml:93(term)
-#: groupadd.8.xml:117(term)
+#: usermod.8.xml:224(term) useradd.8.xml:376(term) groupmod.8.xml:122(term)
+#: groupadd.8.xml:143(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
@@ -645,7 +608,7 @@
 "<option>-p</option>, <option>--password</option><replaceable>ПАРОЛЬ</"
 "replaceable>"
 
-#: usermod.8.xml:191(para)
+#: usermod.8.xml:229(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
@@ -654,8 +617,8 @@
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>."
 
-#: usermod.8.xml:199(term) useradd.8.xml:322(term) useradd.8.xml:428(term)
-#: su.1.xml:128(term) chsh.1.xml:56(term)
+#: usermod.8.xml:237(term) useradd.8.xml:416(term) useradd.8.xml:544(term)
+#: su.1.xml:157(term) chsh.1.xml:85(term)
 msgid ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
@@ -663,7 +626,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:204(para) chsh.1.xml:60(para)
+#: usermod.8.xml:242(para) chsh.1.xml:89(para)
 msgid ""
 "The name of the user's new login shell. Setting this field to blank causes "
 "the system to select the default login shell."
@@ -671,22 +634,53 @@
 "Имя новой регистрационной оболочки пользователя. Если задать пустое "
 "значение, то будет использована регистрационная оболочка по умолчанию."
 
-#: usermod.8.xml:211(term) useradd.8.xml:335(term)
+#: usermod.8.xml:249(term) useradd.8.xml:431(term)
 msgid ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
+#: usermod.8.xml:254(para)
+msgid "The new numerical value of the user's ID."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:216(para)
+#: usermod.8.xml:257(para)
+#, fuzzy
+#| msgid ""
+#| "The numerical value of the user's ID. This value must be unique, unless "
+#| "the <option>-o</option> option is used. The value must be non-negative. "
+#| "The default is to use the smallest ID value greater than 999 and greater "
+#| "than every other user. Values between 0 and 999 are typically reserved "
+#| "for system accounts."
 msgid ""
-"The numerical value of the user's ID. This value must be unique, unless the "
-"<option>-o</option> option is used. The value must be non-negative. Values "
-"between 0 and 999 are typically reserved for system accounts. Any files "
-"which the user owns and which are located in the directory tree rooted at "
-"the user's home directory will have the file user ID changed automatically. "
-"Files outside of the user's home directory must be altered manually."
+"This value must be unique, unless the <option>-o</option> option is used. "
+"The value must be non-negative. Values between 0 and 999 are typically "
+"reserved for system accounts."
 msgstr ""
+"Числовое значение идентификатора пользователя (ID). Оно должно быть "
+"уникальным, если не используется параметр <option>-o</option>. Значение "
+"должно быть неотрицательным. По умолчанию используется наименьшее значение "
+"ID большее 999 и большее любого другого значения пользователя. Значения от 0 "
+"до 999 обычно зарезервированы для системных учётных записей."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: usermod.8.xml:263(para)
+#, fuzzy
+#| msgid ""
+#| "The numerical value of the user's ID. This value must be unique, unless "
+#| "the <option>-o</option> option is used. The value must be non-negative. "
+#| "Values between 0 and 999 are typically reserved for system accounts. Any "
+#| "files which the user owns and which are located in the directory tree "
+#| "rooted at the user's home directory will have the file user ID changed "
+#| "automatically. Files outside of the user's home directory must be altered "
+#| "manually."
+msgid ""
+"Any files which the user owns and which are located in the directory tree "
+"rooted at the user's home directory will have the file user ID changed "
+"automatically. Files outside of the user's home directory must be altered "
+"manually."
+msgstr ""
 "Числовое значение идентификатора пользователя (ID). Значение должно быть "
 "уникальным, если не задан параметр <option>-o</option>. Значение должно быть "
 "неотрицательным. Значения от 0 до 999 обычно зарезервированы для системных "
@@ -695,12 +689,12 @@
 "изменён автоматически. Для файлов, расположенных вне домашнего каталога "
 "идентификатор нужно изменять вручную."
 
-#: usermod.8.xml:229(term)
+#: usermod.8.xml:273(term)
 msgid "<option>-U</option>, <option>--unlock</option>"
 msgstr "<option>-U</option>, <option>--unlock</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:233(para)
+#: usermod.8.xml:277(para)
 msgid ""
 "Unlock a user's password. This removes the '!' in front of the encrypted "
 "password. You can't use this option with <option>-p</option> or <option>-L</"
@@ -710,7 +704,7 @@
 "начала шифрованного пароля. Не используйте этот параметр вместе с <option>-"
 "p</option> или <option>-L</option>."
 
-#: usermod.8.xml:238(para)
+#: usermod.8.xml:282(para)
 msgid ""
 "Note: if you wish to unlock the account (not only access with a password), "
 "you should also set the <replaceable>EXPIRE_DATE</replaceable> (for example "
@@ -719,19 +713,28 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
-#: usermod.8.xml:252(title) userdel.8.xml:192(title) useradd.8.xml:451(title)
-#: su.1.xml:188(title) shadow.3.xml:164(title) passwd.1.xml:296(title)
-#: newusers.8.xml:160(title) login.1.xml:202(title) lastlog.8.xml:123(title)
-#: groupdel.8.xml:40(title) groupadd.8.xml:187(title) gpasswd.1.xml:174(title)
-#: faillog.8.xml:121(title) chpasswd.8.xml:125(title)
-#: chgpasswd.8.xml:125(title)
+#: usermod.8.xml:296(title) userdel.8.xml:221(title) useradd.8.xml:573(title)
+#: su.1.xml:217(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
+#: newusers.8.xml:283(title) login.1.xml:238(title) lastlog.8.xml:159(title)
+#: groupdel.8.xml:69(title) groupadd.8.xml:213(title) gpasswd.1.xml:203(title)
+#: faillog.8.xml:193(title) chpasswd.8.xml:157(title)
+#: chgpasswd.8.xml:157(title)
 msgid "CAVEATS"
 msgstr "ПРЕДОСТЕРЕЖЕНИЯ"
 
 # type: Content of: <refentry><refsect1><para>
-#: usermod.8.xml:253(para)
+#: usermod.8.xml:297(para)
+#, fuzzy
+#| msgid ""
+#| "<command>usermod</command> will not allow you to change the name of a "
+#| "user who is logged in. You must make certain that the named user is not "
+#| "executing any processes when this command is being executed if the user's "
+#| "numerical user ID is being changed. You must change the owner of any "
+#| "<command>crontab</command> files manually. You must change the owner of "
+#| "any <command>at</command> jobs manually. You must make any changes "
+#| "involving NIS on the NIS server."
 msgid ""
-"<command>usermod</command> will not allow you to change the name of a user "
+"<command>usermod</command> will not allow you to change the name of an user "
 "who is logged in. You must make certain that the named user is not executing "
 "any processes when this command is being executed if the user's numerical "
 "user ID is being changed. You must change the owner of any <command>crontab</"
@@ -747,16 +750,39 @@
 "нужно изменять вручную. Также вручную нужно сделать все изменения связанные "
 "с NIS на сервере NIS."
 
+#: usermod.8.xml:309(title) userdel.8.xml:125(title) useradd.8.xml:596(title)
+#: su.1.xml:225(title) sg.1.xml:76(title) pwconv.8.xml:146(title)
+#: pwck.8.xml:182(title) passwd.1.xml:349(title) newusers.8.xml:297(title)
+#: newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:154(title)
+#: groupmod.8.xml:138(title) groupmems.8.xml:156(title)
+#: groupdel.8.xml:76(title) groupadd.8.xml:175(title) gpasswd.1.xml:215(title)
+#: chsh.1.xml:120(title) chpasswd.8.xml:171(title) chgpasswd.8.xml:165(title)
+#: chfn.1.xml:99(title)
+msgid "CONFIGURATION"
+msgstr ""
+
+#: usermod.8.xml:310(para) userdel.8.xml:126(para) useradd.8.xml:597(para)
+#: su.1.xml:226(para) sg.1.xml:77(para) pwck.8.xml:183(para)
+#: passwd.1.xml:350(para) newusers.8.xml:298(para) newgrp.1.xml:88(para)
+#: login.1.xml:273(para) grpck.8.xml:155(para) groupmod.8.xml:139(para)
+#: groupmems.8.xml:157(para) groupdel.8.xml:77(para) groupadd.8.xml:176(para)
+#: gpasswd.1.xml:216(para) chsh.1.xml:121(para) chpasswd.8.xml:172(para)
+#: chgpasswd.8.xml:166(para) chfn.1.xml:100(para)
+msgid ""
+"The following configuration variables in <filename>/etc/login.defs</"
+"filename> change the behavior of this tool:"
+msgstr ""
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: usermod.8.xml:2(term) userdel.8.xml:2(term) useradd.8.xml:2(term)
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: usermod.8.xml:32(term) userdel.8.xml:32(term) useradd.8.xml:32(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>MAIL_DIR</option> (string)"
 msgstr "MAIL_DIR (строка)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: usermod.8.xml:4(para) userdel.8.xml:4(para) useradd.8.xml:4(para)
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: usermod.8.xml:34(para) userdel.8.xml:34(para) useradd.8.xml:34(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "The mail spool directory. This is needed to manipulate the mailbox when its "
 "corresponding user account is modified or deleted. If not specified, a "
@@ -767,30 +793,30 @@
 "то используется значение указанное при сборке."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: usermod.8.xml:11(term) userdel.8.xml:11(term) useradd.8.xml:11(term)
-#: su.1.xml:11(term) login.defs.5.xml:11(term) login.1.xml:11(term)
+#: usermod.8.xml:41(term) userdel.8.xml:41(term) useradd.8.xml:41(term)
+#: su.1.xml:41(term) login.defs.5.xml:41(term) login.1.xml:41(term)
 #, fuzzy
 msgid "<option>MAIL_FILE</option> (string)"
 msgstr "MAIL_DIR (строка)"
 
-#: usermod.8.xml:13(para) userdel.8.xml:13(para) useradd.8.xml:13(para)
-#: su.1.xml:13(para) login.defs.5.xml:13(para) login.1.xml:13(para)
+#: usermod.8.xml:43(para) userdel.8.xml:43(para) useradd.8.xml:43(para)
+#: su.1.xml:43(para) login.defs.5.xml:43(para) login.1.xml:43(para)
 msgid ""
 "Defines the location of the users mail spool files relatively to their home "
 "directory."
 msgstr ""
 
 #. FIXME: MAIL_FILE not used in useradd
-#: usermod.8.xml:20(para) userdel.8.xml:20(para) useradd.8.xml:20(para)
-#: su.1.xml:20(para) login.defs.5.xml:20(para) login.1.xml:20(para)
+#: usermod.8.xml:50(para) userdel.8.xml:50(para) useradd.8.xml:50(para)
+#: su.1.xml:50(para) login.defs.5.xml:50(para) login.1.xml:50(para)
 msgid ""
 "The <option>MAIL_DIR</option> and <option>MAIL_FILE</option> variables are "
 "used by <command>useradd</command>, <command>usermod</command>, and "
 "<command>userdel</command> to create, move, or delete the user's mail spool."
 msgstr ""
 
-#: usermod.8.xml:26(para) userdel.8.xml:26(para) useradd.8.xml:26(para)
-#: su.1.xml:26(para) login.defs.5.xml:26(para) login.1.xml:26(para)
+#: usermod.8.xml:56(para) userdel.8.xml:56(para) useradd.8.xml:56(para)
+#: su.1.xml:56(para) login.defs.5.xml:56(para) login.1.xml:56(para)
 #, fuzzy
 msgid ""
 "If <option>MAIL_CHECK_ENAB</option> is set to <replaceable>yes</"
@@ -800,8 +826,68 @@
 "Если используется <option>--preserve-environment</option>, то оболочка "
 "задаётся переменной среды <envar>$SHELL</envar>."
 
-#: usermod.8.xml:303(para)
+#: usermod.8.xml:30(term) userdel.8.xml:30(term) useradd.8.xml:30(term)
+#: pwconv.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: grpck.8.xml:30(term) groupmod.8.xml:30(term) groupmems.8.xml:30(term)
+#: groupdel.8.xml:30(term) groupadd.8.xml:30(term) gpasswd.1.xml:30(term)
+#: chgpasswd.8.xml:30(term)
+msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
+msgstr ""
+
+#: usermod.8.xml:32(para) userdel.8.xml:32(para) useradd.8.xml:32(para)
+#: pwconv.8.xml:32(para) newusers.8.xml:32(para) login.defs.5.xml:32(para)
+#: grpck.8.xml:32(para) groupmod.8.xml:32(para) groupmems.8.xml:32(para)
+#: groupdel.8.xml:32(para) groupadd.8.xml:32(para) gpasswd.1.xml:32(para)
+#: chgpasswd.8.xml:32(para)
 msgid ""
+"Maximum members per group entry. When the maximum is reached, a new group "
+"entry (line) is started in <filename>/etc/group</filename> (with the same "
+"name, same password, and same GID)."
+msgstr ""
+
+#: usermod.8.xml:37(para) userdel.8.xml:37(para) useradd.8.xml:37(para)
+#: pwconv.8.xml:37(para) newusers.8.xml:37(para) login.defs.5.xml:37(para)
+#: grpck.8.xml:37(para) groupmod.8.xml:37(para) groupmems.8.xml:37(para)
+#: groupdel.8.xml:37(para) groupadd.8.xml:37(para) gpasswd.1.xml:37(para)
+#: chgpasswd.8.xml:37(para)
+msgid ""
+"The default value is 0, meaning that there are no limits in the number of "
+"members in a group."
+msgstr ""
+
+#. Note: on HP, split groups have the same ID, but different
+#.                names.
+#: usermod.8.xml:43(para) userdel.8.xml:43(para) useradd.8.xml:43(para)
+#: pwconv.8.xml:43(para) newusers.8.xml:43(para) login.defs.5.xml:43(para)
+#: grpck.8.xml:43(para) groupmod.8.xml:43(para) groupmems.8.xml:43(para)
+#: groupdel.8.xml:43(para) groupadd.8.xml:43(para) gpasswd.1.xml:43(para)
+#: chgpasswd.8.xml:43(para)
+msgid ""
+"This feature (split group) permits to limit the length of lines in the group "
+"file. This is useful to make sure that lines for NIS groups are not larger "
+"than 1024 characters."
+msgstr ""
+
+#: usermod.8.xml:48(para) userdel.8.xml:48(para) useradd.8.xml:48(para)
+#: pwconv.8.xml:48(para) newusers.8.xml:48(para) login.defs.5.xml:48(para)
+#: grpck.8.xml:48(para) groupmod.8.xml:48(para) groupmems.8.xml:48(para)
+#: groupdel.8.xml:48(para) groupadd.8.xml:48(para) gpasswd.1.xml:48(para)
+#: chgpasswd.8.xml:48(para)
+msgid "If you need to enforce such limit, you can use 25."
+msgstr ""
+
+#: usermod.8.xml:51(para) userdel.8.xml:51(para) useradd.8.xml:51(para)
+#: pwconv.8.xml:51(para) newusers.8.xml:51(para) login.defs.5.xml:51(para)
+#: grpck.8.xml:51(para) groupmod.8.xml:51(para) groupmems.8.xml:51(para)
+#: groupdel.8.xml:51(para) groupadd.8.xml:51(para) gpasswd.1.xml:51(para)
+#: chgpasswd.8.xml:51(para)
+msgid ""
+"Note: split groups may not be supported by all tools (even in the Shadow "
+"toolsuite. You should not use this variable unless you really need it."
+msgstr ""
+
+#: usermod.8.xml:347(para)
+msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
@@ -839,17 +925,17 @@
 "manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><command>
-#: userdel.8.xml:12(refentrytitle) userdel.8.xml:17(refname)
-#: userdel.8.xml:22(command) login.defs.5.xml:402(term)
+#: userdel.8.xml:41(refentrytitle) userdel.8.xml:46(refname)
+#: userdel.8.xml:51(command) login.defs.5.xml:434(term)
 msgid "userdel"
 msgstr "userdel"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: userdel.8.xml:18(refpurpose)
+#: userdel.8.xml:47(refpurpose)
 msgid "delete a user account and related files"
 msgstr "удаляет учётную запись и файлы пользователя"
 
-#: userdel.8.xml:32(para)
+#: userdel.8.xml:61(para)
 #, fuzzy
 msgid ""
 "The <command>userdel</command> command modifies the system account files, "
@@ -862,15 +948,15 @@
 "существовать."
 
 # type: Content of: <refentry><refsect1><para>
-#: userdel.8.xml:41(para)
+#: userdel.8.xml:70(para)
 msgid "The options which apply to the <command>userdel</command> command are:"
 msgstr "Параметры команды <command>userdel</command>:"
 
-#: userdel.8.xml:46(term) groupadd.8.xml:52(term)
+#: userdel.8.xml:75(term) groupadd.8.xml:78(term)
 msgid "<option>-f</option>, <option>--force</option>"
 msgstr "<option>-f</option>, <option>--force</option>"
 
-#: userdel.8.xml:50(para)
+#: userdel.8.xml:79(para)
 #, fuzzy
 msgid ""
 "This option forces the removal of the user account, even if the user is "
@@ -893,7 +979,7 @@
 "если она всё ещё является первичной группой другого пользователя."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:63(para)
+#: userdel.8.xml:92(para)
 msgid ""
 "<emphasis>Note:</emphasis> This option is dangerous and may leave your "
 "system in an inconsistent state."
@@ -901,12 +987,12 @@
 "<emphasis>Примечание:</emphasis> Этот параметр опасно использовать; он может "
 "привести систему в нерабочее состояние."
 
-#: userdel.8.xml:76(term)
+#: userdel.8.xml:105(term)
 msgid "<option>-r</option>, <option>--remove</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:80(para)
+#: userdel.8.xml:109(para)
 msgid ""
 "Files in the user's home directory will be removed along with the home "
 "directory itself and the user's mail spool. Files located in other file "
@@ -916,7 +1002,7 @@
 "каталогом и почтовым ящиком. Пользовательские файлы, расположенные в других "
 "файловых системах, нужно искать и удалять вручную."
 
-#: userdel.8.xml:86(para)
+#: userdel.8.xml:115(para)
 msgid ""
 "The mail spool is defined by the <emphasis>MAIL_DIR</emphasis> variable in "
 "the <filename>login.defs</filename> file."
@@ -925,13 +1011,13 @@
 "в файле <filename>login.defs</filename>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: userdel.8.xml:2(term) login.defs.5.xml:2(term)
+#: userdel.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>USERDEL_CMD</option> (string)"
 msgstr "USERDEL_CMD (строка)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:4(para) login.defs.5.xml:4(para)
+#: userdel.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "If defined, this command is run when removing a user. It should remove any "
 "at/cron/print jobs etc. owned by the user to be removed (passed as the first "
@@ -942,139 +1028,144 @@
 "(передаётся в качестве первого аргумента)."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: userdel.8.xml:2(term) useradd.8.xml:2(term) su.1.xml:2(term)
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: userdel.8.xml:32(term) useradd.8.xml:32(term) su.1.xml:32(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>USERGROUPS_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (логический)"
 
-#: userdel.8.xml:4(para) useradd.8.xml:4(para) su.1.xml:4(para)
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: userdel.8.xml:34(para) useradd.8.xml:34(para) su.1.xml:34(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Enable setting of the umask group bits to be the same as owner bits "
 "(examples: 022 -&gt; 002, 077 -&gt; 007) for non-root users, if the uid is "
-"the same as gid, and username is the same as the primary group name. "
-"<placeholder-1/> If set to <replaceable>yes</replaceable>, <command>userdel</"
-"command> will remove the user's group if it contains no more members, and "
+"the same as gid, and username is the same as the primary group name."
+msgstr ""
+
+#: userdel.8.xml:39(para) useradd.8.xml:39(para) su.1.xml:39(para)
+#: login.defs.5.xml:39(para) login.1.xml:39(para)
+msgid ""
+"If set to <replaceable>yes</replaceable>, <command>userdel</command> will "
+"remove the user's group if it contains no more members, and "
 "<command>useradd</command> will create by default a group with the name of "
 "the user."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: userdel.8.xml:120(filename) useradd.8.xml:532(filename)
-#: pwconv.8.xml:141(filename) newusers.8.xml:224(filename)
-#: login.access.5.xml:69(filename) groupadd.8.xml:178(filename)
-#: chsh.1.xml:119(filename) chpasswd.8.xml:168(filename)
-#: chgpasswd.8.xml:163(filename) chfn.1.xml:87(filename)
+#: userdel.8.xml:149(filename) useradd.8.xml:658(filename)
+#: pwconv.8.xml:171(filename) newusers.8.xml:347(filename)
+#: login.access.5.xml:99(filename) groupadd.8.xml:204(filename)
+#: chsh.1.xml:148(filename) chpasswd.8.xml:200(filename)
+#: chgpasswd.8.xml:195(filename) chfn.1.xml:116(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:122(para) useradd.8.xml:534(para) pwconv.8.xml:143(para)
-#: newusers.8.xml:226(para) login.access.5.xml:71(para)
-#: groupadd.8.xml:180(para) chsh.1.xml:121(para) chpasswd.8.xml:170(para)
-#: chgpasswd.8.xml:165(para) chfn.1.xml:89(para)
+#: userdel.8.xml:151(para) useradd.8.xml:660(para) pwconv.8.xml:173(para)
+#: newusers.8.xml:349(para) login.access.5.xml:101(para)
+#: groupadd.8.xml:206(para) chsh.1.xml:150(para) chpasswd.8.xml:202(para)
+#: chgpasswd.8.xml:197(para) chfn.1.xml:118(para)
 msgid "Shadow password suite configuration."
 msgstr "содержит конфигурацию подсистемы теневых паролей"
 
 # type: Content of: <refentry><refsect1><title>
-#: userdel.8.xml:141(title) useradd.8.xml:541(title) pwck.8.xml:208(title)
-#: passwd.1.xml:343(title) grpck.8.xml:182(title) groupmod.8.xml:139(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:208(title) chage.1.xml:199(title)
+#: userdel.8.xml:170(title) useradd.8.xml:667(title) pwck.8.xml:241(title)
+#: passwd.1.xml:385(title) grpck.8.xml:214(title) groupmod.8.xml:168(title)
+#: groupdel.8.xml:106(title) groupadd.8.xml:234(title) chage.1.xml:228(title)
 msgid "EXIT VALUES"
 msgstr "ВОЗВРАЩАЕМЫЕ ЗНАЧЕНИЯ"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: userdel.8.xml:146(replaceable) useradd.8.xml:546(replaceable)
-#: pwck.8.xml:213(replaceable) passwd.1.xml:348(replaceable)
-#: grpck.8.xml:187(replaceable) groupmod.8.xml:144(replaceable)
-#: groupdel.8.xml:82(replaceable) groupadd.8.xml:213(replaceable)
-#: chage.1.xml:204(replaceable)
+#: userdel.8.xml:175(replaceable) useradd.8.xml:672(replaceable)
+#: pwck.8.xml:246(replaceable) passwd.1.xml:390(replaceable)
+#: grpck.8.xml:219(replaceable) groupmod.8.xml:173(replaceable)
+#: groupdel.8.xml:111(replaceable) groupadd.8.xml:239(replaceable)
+#: chage.1.xml:233(replaceable)
 msgid "0"
 msgstr "0"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:148(para) useradd.8.xml:548(para) pwck.8.xml:215(para)
-#: passwd.1.xml:350(para) grpck.8.xml:189(para) groupmod.8.xml:146(para)
-#: groupdel.8.xml:84(para) groupadd.8.xml:215(para) chage.1.xml:206(para)
+#: userdel.8.xml:177(para) useradd.8.xml:674(para) pwck.8.xml:248(para)
+#: passwd.1.xml:392(para) grpck.8.xml:221(para) groupmod.8.xml:175(para)
+#: groupdel.8.xml:113(para) groupadd.8.xml:241(para) chage.1.xml:235(para)
 msgid "success"
 msgstr "успешное выполнение"
 
 # type: Content of: <refentry><refmeta><manvolnum>
-#: userdel.8.xml:152(replaceable) useradd.8.xml:552(replaceable)
-#: su.1.xml:26(manvolnum) sg.1.xml:10(manvolnum) pwck.8.xml:219(replaceable)
-#: passwd.1.xml:16(manvolnum) passwd.1.xml:354(replaceable)
-#: newgrp.1.xml:10(manvolnum) login.1.xml:42(manvolnum)
-#: grpck.8.xml:193(replaceable) groups.1.xml:6(manvolnum)
-#: gpasswd.1.xml:14(manvolnum) expiry.1.xml:12(manvolnum)
-#: chsh.1.xml:12(manvolnum) chfn.1.xml:13(manvolnum) chage.1.xml:6(manvolnum)
-#: chage.1.xml:210(replaceable)
+#: userdel.8.xml:181(replaceable) useradd.8.xml:678(replaceable)
+#: su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:252(replaceable)
+#: passwd.1.xml:45(manvolnum) passwd.1.xml:396(replaceable)
+#: newgrp.1.xml:39(manvolnum) login.1.xml:71(manvolnum)
+#: grpck.8.xml:225(replaceable) groups.1.xml:35(manvolnum)
+#: gpasswd.1.xml:43(manvolnum) expiry.1.xml:42(manvolnum)
+#: chsh.1.xml:41(manvolnum) chfn.1.xml:42(manvolnum) chage.1.xml:35(manvolnum)
+#: chage.1.xml:239(replaceable)
 msgid "1"
 msgstr "1"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:154(para) useradd.8.xml:554(para)
+#: userdel.8.xml:183(para) useradd.8.xml:680(para)
 msgid "can't update password file"
 msgstr "не удалось изменить файл паролей"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: userdel.8.xml:158(replaceable) useradd.8.xml:558(replaceable)
-#: pwck.8.xml:225(replaceable) passwd.1.xml:360(replaceable)
-#: grpck.8.xml:199(replaceable) groupmod.8.xml:150(replaceable)
-#: groupdel.8.xml:88(replaceable) groupadd.8.xml:219(replaceable)
-#: chage.1.xml:216(replaceable)
+#: userdel.8.xml:187(replaceable) useradd.8.xml:684(replaceable)
+#: pwck.8.xml:258(replaceable) passwd.1.xml:402(replaceable)
+#: grpck.8.xml:231(replaceable) groupmod.8.xml:179(replaceable)
+#: groupdel.8.xml:117(replaceable) groupadd.8.xml:245(replaceable)
+#: chage.1.xml:245(replaceable)
 msgid "2"
 msgstr "2"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:160(para) useradd.8.xml:560(para) pwck.8.xml:221(para)
-#: grpck.8.xml:195(para) groupmod.8.xml:152(para) groupdel.8.xml:90(para)
-#: groupadd.8.xml:221(para) chage.1.xml:218(para)
+#: userdel.8.xml:189(para) useradd.8.xml:686(para) pwck.8.xml:254(para)
+#: grpck.8.xml:227(para) groupmod.8.xml:181(para) groupdel.8.xml:119(para)
+#: groupadd.8.xml:247(para) chage.1.xml:247(para)
 msgid "invalid command syntax"
 msgstr "ошибка в параметрах команды"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: userdel.8.xml:164(replaceable) useradd.8.xml:576(replaceable)
-#: passwd.1.xml:384(replaceable) groupmod.8.xml:168(replaceable)
-#: groupdel.8.xml:94(replaceable)
+#: userdel.8.xml:193(replaceable) useradd.8.xml:702(replaceable)
+#: pwck.8.xml:282(replaceable) passwd.1.xml:426(replaceable)
+#: groupmod.8.xml:197(replaceable) groupdel.8.xml:123(replaceable)
 msgid "6"
 msgstr "6"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:166(para)
+#: userdel.8.xml:195(para)
 msgid "specified user doesn't exist"
 msgstr "указанный пользователь не существует"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:172(para)
+#: userdel.8.xml:201(para)
 msgid "user currently logged in"
 msgstr "пользователь сейчас работает в системе"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: userdel.8.xml:176(replaceable) useradd.8.xml:588(replaceable)
-#: groupmod.8.xml:180(replaceable) groupdel.8.xml:106(replaceable)
-#: groupadd.8.xml:243(replaceable)
+#: userdel.8.xml:205(replaceable) useradd.8.xml:714(replaceable)
+#: groupmod.8.xml:209(replaceable) groupdel.8.xml:135(replaceable)
+#: groupadd.8.xml:269(replaceable)
 msgid "10"
 msgstr "10"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:178(para) useradd.8.xml:590(para) groupmod.8.xml:182(para)
-#: groupdel.8.xml:108(para) groupadd.8.xml:245(para)
+#: userdel.8.xml:207(para) useradd.8.xml:716(para) groupmod.8.xml:211(para)
+#: groupdel.8.xml:137(para) groupadd.8.xml:271(para)
 msgid "can't update group file"
 msgstr "не удалось изменить файл групп"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: userdel.8.xml:182(replaceable) useradd.8.xml:594(replaceable)
+#: userdel.8.xml:211(replaceable) useradd.8.xml:720(replaceable)
 msgid "12"
 msgstr "12"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: userdel.8.xml:184(para)
+#: userdel.8.xml:213(para)
 msgid "can't remove home directory"
 msgstr "не удалось удалить домашний каталог"
 
 # type: Content of: <refentry><refsect1><para>
-#: userdel.8.xml:142(para)
+#: userdel.8.xml:171(para)
 msgid ""
 "The <command>userdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -1083,7 +1174,7 @@
 "значения: <placeholder-1/>"
 
 # type: Content of: <refentry><refsect1><para>
-#: userdel.8.xml:193(para)
+#: userdel.8.xml:222(para)
 msgid ""
 "<command>userdel</command> will not allow you to remove an account if the "
 "user is currently logged in. You must kill any running processes which "
@@ -1094,7 +1185,7 @@
 "запущенные процессы, принадлежащие учётной записи, которую нужно удалить."
 
 # type: Content of: <refentry><refsect1><para>
-#: userdel.8.xml:198(para)
+#: userdel.8.xml:227(para)
 msgid ""
 "You may not remove any NIS attributes on a NIS client. This must be "
 "performed on the NIS server."
@@ -1102,7 +1193,7 @@
 "Нельзя удалить NIS атрибуты клиента NIS. Это необходимо сделать на NIS "
 "сервере."
 
-#: userdel.8.xml:201(para)
+#: userdel.8.xml:230(para)
 msgid ""
 "If <emphasis>USERGROUPS_ENAB</emphasis> is defined to <emphasis remap=\"I"
 "\">yes</emphasis> in <filename>/etc/login.defs</filename>, <command>userdel</"
@@ -1121,7 +1212,7 @@
 "предупреждение без удаления, если такое случится. Параметр <option>-f</"
 "option> поможет удалить группу в любом случае."
 
-#: userdel.8.xml:214(para)
+#: userdel.8.xml:243(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1156,26 +1247,26 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: useradd.8.xml:19(refentrytitle) useradd.8.xml:24(refname)
-#: useradd.8.xml:29(command) useradd.8.xml:36(command)
-#: useradd.8.xml:40(command) login.defs.5.xml:389(term)
+#: useradd.8.xml:49(refentrytitle) useradd.8.xml:54(refname)
+#: useradd.8.xml:59(command) useradd.8.xml:66(command)
+#: useradd.8.xml:70(command) login.defs.5.xml:421(term)
 msgid "useradd"
 msgstr "useradd"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: useradd.8.xml:25(refpurpose)
+#: useradd.8.xml:55(refpurpose)
 msgid "create a new user or update default new user information"
 msgstr ""
 "регистрирует нового пользователя или изменяет информацию по умолчанию о "
 "новых пользователях"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: useradd.8.xml:37(arg) useradd.8.xml:41(arg)
+#: useradd.8.xml:67(arg) useradd.8.xml:71(arg)
 msgid "-D"
 msgstr "-D"
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:50(para)
+#: useradd.8.xml:80(para)
 #, fuzzy
 msgid ""
 "When invoked without the <option>-D</option> option, the <command>useradd</"
@@ -1192,12 +1283,19 @@
 "также может создать домашний каталог нового пользователя и скопировать файлы "
 "настроек."
 
+#: useradd.8.xml:89(para)
+msgid ""
+"By default, a group will also be created for the new user (see <option>-g</"
+"option>, <option>-N</option>, <option>-U</option>, and "
+"<option>USERGROUPS_ENAB</option>)."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:63(para)
+#: useradd.8.xml:98(para)
 msgid "The options which apply to the <command>useradd</command> command are:"
 msgstr "Параметры команды <command>useradd</command>:"
 
-#: useradd.8.xml:67(term) useradd.8.xml:379(term)
+#: useradd.8.xml:102(term) useradd.8.xml:475(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
@@ -1205,7 +1303,7 @@
 "<option>-b</option>, <option>--base-dir</"
 "option><replaceable>БАЗОВЫЙ_КАТАЛОГ</replaceable>"
 
-#: useradd.8.xml:72(para)
+#: useradd.8.xml:107(para)
 #, fuzzy
 msgid ""
 "The default base directory for the system if <option>-d</"
@@ -1220,8 +1318,15 @@
 "каталога. Если не используется параметр <option>-m</option>, то "
 "<replaceable>БАЗОВЫЙ_КАТАЛОГ</replaceable> должен существовать."
 
+#: useradd.8.xml:115(para)
+msgid ""
+"If this option is not specified, <command>useradd</command> will use the "
+"base directory specified by the <option>HOME</option> variable in <filename>/"
+"etc/default/useradd</filename>, or <filename>/home</filename> by default."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:88(para)
+#: useradd.8.xml:130(para)
 msgid ""
 "Any text string. It is generally a short description of the login, and is "
 "currently used as the field for the user's full name."
@@ -1229,7 +1334,7 @@
 "Любая текстовая строка. Обычно, здесь коротко описывается учётная запись, и "
 "в настоящее время используется как поле для имени и фамилии пользователя."
 
-#: useradd.8.xml:101(para)
+#: useradd.8.xml:143(para)
 msgid ""
 "The new user will be created using <replaceable>HOME_DIR</replaceable> as "
 "the value for the user's login directory. The default is to append the "
@@ -1246,33 +1351,81 @@
 "<replaceable>БАЗОВЫЙ_КАТАЛОГ</replaceable> необязательно должен существовать "
 "и не будет создан, если его нет."
 
-#: useradd.8.xml:113(term)
+#: useradd.8.xml:155(term)
 #, fuzzy
 #| msgid "<option>-d</option>, <option>--delete</option>"
 msgid "<option>-D</option>, <option>--defaults</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
 # type: Content of: <refentry><refsect1><refsect2><title>
-#: useradd.8.xml:117(para)
+#: useradd.8.xml:159(para)
 #, fuzzy
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr "Изменение значений по умолчанию"
 
+#: useradd.8.xml:174(para)
+msgid ""
+"If not specified, <command>useradd</command> will use the default expiry "
+"date specified by the <option>EXPIRE</option> variable in <filename>/etc/"
+"default/useradd</filename>, or an empty string (no expiry) by default."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:154(para)
+#: useradd.8.xml:188(para)
+#, fuzzy
+#| msgid ""
+#| "The number of days after a password expires until the account is "
+#| "permanently disabled. A value of 0 disables the account as soon as the "
+#| "password has expired, and a value of -1 disables the feature. The default "
+#| "value is -1."
 msgid ""
+"The number of days after a password expires until the account is permanently "
+"disabled. A value of 0 disables the account as soon as the password has "
+"expired, and a value of -1 disables the feature."
+msgstr ""
+"Число дней, которые должны пройти после устаревания пароля, чтобы учётная "
+"запись заблокировалась навсегда. Если указано значение 0, то учётная запись "
+"блокируется сразу после устаревания пароля, а при значении -1 данная "
+"возможность не используется. По умолчанию используется значение -1."
+
+#: useradd.8.xml:194(para)
+msgid ""
+"If not specified, <command>useradd</command> will use the default inactivity "
+"period specified by the <option>INACTIVE</option> variable in the <filename>/"
+"etc/default/useradd</filename>, or -1 by default."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: useradd.8.xml:208(para)
+#, fuzzy
+#| msgid ""
+#| "The group name or number of the user's new initial login group. The group "
+#| "name must exist. A group number must refer to an already existing group. "
+#| "The default group number is 1."
+msgid ""
 "The group name or number of the user's initial login group. The group name "
-"must exist. A group number must refer to an already existing group. The "
-"default group number is 1 or whatever is specified in <filename>/etc/default/"
-"useradd</filename>."
+"must exist. A group number must refer to an already existing group."
 msgstr ""
 "Имя или числовой идентификатор новой начальной группы пользователя. Группа с "
 "таким именем должна существовать. Идентификатор группы должен указывать на "
-"уже существующую группу. Идентификатор группы по умолчанию равен 1 или "
-"значению указанному в файле <filename>/etc/default/useradd</filename>."
+"уже существующую группу. По умолчанию идентификатор группы установлен в 1."
 
+#: useradd.8.xml:213(para)
+msgid ""
+"If not specified, the bahavior of <command>useradd</command> will depend on "
+"the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>. If this variable is set to <replaceable>yes</replaceable> (or "
+"<option>-U/--user-group</option> is specified on the command line), a group "
+"will be created for the user, with the same name as her loginname. If the "
+"variable is set to <replaceable>no</replaceable> (or <option>-N/--no-user-"
+"group</option> is specified on the command line), useradd will set the "
+"primary group of the new user to the value specified by the <option>GROUP</"
+"option> variable in <filename>/etc/default/useradd</filename>, or 100 by "
+"default."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:168(para)
+#: useradd.8.xml:236(para)
 msgid ""
 "A list of supplementary groups which the user is also a member of. Each "
 "group is separated from the next by a comma, with no intervening whitespace. "
@@ -1286,7 +1439,7 @@
 "<option>-g</option>. По умолчанию пользователь входит только в начальную "
 "группу."
 
-#: useradd.8.xml:185(term)
+#: useradd.8.xml:253(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
@@ -1298,14 +1451,14 @@
 "<option>-s</option>, <option>--shell</option><replaceable>ОБОЛОЧКА</"
 "replaceable>"
 
-#: useradd.8.xml:190(para)
+#: useradd.8.xml:258(para)
 msgid ""
 "The skeleton directory, which contains files and directories to be copied in "
 "the user's home directory, when the home directory is created by "
 "<command>useradd</command>."
 msgstr ""
 
-#: useradd.8.xml:195(para)
+#: useradd.8.xml:263(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
@@ -1313,14 +1466,14 @@
 "home</option>) option is specified."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:199(para)
+#: useradd.8.xml:267(para)
 msgid ""
-"If this option is not set, the skeleton directory is defined in <filename>/"
-"etc/default/useradd</filename> or, by default, <filename>/etc/skel</"
-"filename>."
+"If this option is not set, the skeleton directory is defined by the "
+"<option>SKEL</option> variable in <filename>/etc/default/useradd</filename> "
+"or, by default, <filename>/etc/skel</filename>."
 msgstr ""
 
-#: useradd.8.xml:207(term) groupadd.8.xml:86(term)
+#: useradd.8.xml:276(term) groupadd.8.xml:112(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
@@ -1328,10 +1481,21 @@
 "<option>-K</option>, <option>--key</option><replaceable>КЛЮЧ</"
 "replaceable>=<replaceable>ЗНАЧЕНИЕ</replaceable>"
 
-#: useradd.8.xml:212(para)
+#: useradd.8.xml:281(para)
+#, fuzzy
+#| msgid ""
+#| "Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, "
+#| "PASS_MAX_DAYS and others). <placeholder-1/> Example: <option>-K </"
+#| "option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</"
+#| "replaceable> can be used when creating system account to turn off "
+#| "password ageing, even though system account has no password at all. "
+#| "Multiple <option>-K</option> options can be specified, e.g.: <option>-K </"
+#| "option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
+#| "replaceable><option> -K </option><replaceable>UID_MAX</"
+#| "replaceable>=<replaceable>499</replaceable>"
 msgid ""
-"Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS "
-"and others). <placeholder-1/> Example: <option>-K </"
+"Overrides <filename>/etc/login.defs</filename> defaults (UID_MIN, UID_MAX, "
+"UMASK, PASS_MAX_DAYS and others). <placeholder-1/> Example: <option>-K </"
 "option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</"
 "replaceable> can be used when creating system account to turn off password "
 "ageing, even though system account has no password at all. Multiple <option>-"
@@ -1351,7 +1515,7 @@
 "replaceable><option> -K </option><replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable>"
 
-#: useradd.8.xml:226(para)
+#: useradd.8.xml:295(para)
 msgid ""
 "Note: <option>-K </option><replaceable>UID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
@@ -1361,64 +1525,86 @@
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable> пока не работает."
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: useradd.8.xml:234(option) groupmems.8.xml:24(arg)
-#: groupmems.8.xml:79(option)
-msgid "-l"
-msgstr "-l"
+#: useradd.8.xml:303(term)
+#, fuzzy
+#| msgid "<option>-l</option>, <option>--list</option>"
+msgid "<option>-l</option>, <option>--no-log-init</option>"
+msgstr "<option>-l</option>, <option>--list</option>"
 
-#: useradd.8.xml:236(para)
+#: useradd.8.xml:305(para)
 msgid "Do not add the user to the lastlog and faillog databases."
 msgstr ""
 
-#: useradd.8.xml:239(para)
+#: useradd.8.xml:308(para)
 msgid ""
 "By default, the user's entries in the lastlog and faillog databases are "
 "resetted to avoid reusing the entry from a previously deleted user."
 msgstr ""
 
-#: useradd.8.xml:247(term)
+#: useradd.8.xml:316(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:251(para)
+#: useradd.8.xml:320(para)
 msgid ""
 "Create the user's home directory if it does not exist. The files and "
 "directories contained in the skeleton directory (which can be defined with "
 "the <option>-k</option> option) will be copied to the home directory."
 msgstr ""
 
-#: useradd.8.xml:257(para)
+#: useradd.8.xml:326(para)
 msgid "By default, no home directories are created."
 msgstr ""
 
-#: useradd.8.xml:263(term)
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><option>
+#: useradd.8.xml:333(option)
 #, fuzzy
+#| msgid "-"
+msgid "-M"
+msgstr "-"
+
+#: useradd.8.xml:336(para)
+msgid ""
+"Do no create the user's home directory, even if the system wide setting from "
+"<filename>/etc/login.defs</filename> (<option>CREATE_HOME</option>) is set "
+"to <replaceable>yes</replaceable>."
+msgstr ""
+
+#: useradd.8.xml:345(term)
+#, fuzzy
 #| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-N</option>, <option>--no-user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: useradd.8.xml:267(para)
+#: useradd.8.xml:349(para)
 msgid ""
 "Do not create a group with the same name as the user, but add the user to "
 "the group specified by the <option>-g</option> option or by the GROUP "
 "variable in <filename>/etc/default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:273(para) useradd.8.xml:358(para)
+#: useradd.8.xml:355(para) useradd.8.xml:454(para)
 msgid ""
 "The default behavior (if the <option>-g</option>, <option>-N</option>, and "
 "<option>-U</option> options are not specified) is defined by the "
-"<option>USERGROUPS_ENAB</option> variable in <filename>login.defs</filename>."
+"<option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:286(para)
+#: useradd.8.xml:368(para)
 msgid "Allow the creation of a user account with a duplicate (non-unique) UID."
 msgstr "Позволяет создать учётную запись с уже имеющимся (не уникальным) UID."
 
-#: useradd.8.xml:295(para)
+#: useradd.8.xml:369(para)
+#, fuzzy
+#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
+"This option is only valid in combination with the <option>-o</option> option."
+msgstr "<option>-m</option>, <option>--create-home</option>"
+
+#: useradd.8.xml:381(para)
+msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
 "disable the account."
@@ -1427,37 +1613,52 @@
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>. По умолчанию учётная запись заблокирована."
 
-#: useradd.8.xml:303(term) newusers.8.xml:113(term) groupadd.8.xml:130(term)
+#: useradd.8.xml:389(term) newusers.8.xml:236(term) groupadd.8.xml:156(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-r</option>, <option>--system</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: useradd.8.xml:307(para) newusers.8.xml:117(para)
+#: useradd.8.xml:393(para) newusers.8.xml:240(para)
 msgid "Create a system account."
 msgstr ""
 
-#: useradd.8.xml:310(para) newusers.8.xml:120(para)
+#: useradd.8.xml:396(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are choosen in the "
 "<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
-"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<filename>/etc/login.defs</filename>, instead of <option>UID_MIN</option>-"
 "<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
 "the creation of groups)."
 msgstr ""
 
+#: useradd.8.xml:405(para)
+msgid ""
+"Note that <command>useradd</command> will not create a home directory for "
+"such an user, regardless of the default setting in <filename>/etc/login."
+"defs</filename> (<option>CREATE_HOME</option>). You have to specify the "
+"<option>-m</option> options if you want a home directory for a system "
+"account to be created."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:327(para)
+#: useradd.8.xml:421(para)
+#, fuzzy
+#| msgid ""
+#| "The name of the user's login shell. The default is to leave this field "
+#| "blank, which causes the system to select the default login shell."
 msgid ""
 "The name of the user's login shell. The default is to leave this field "
-"blank, which causes the system to select the default login shell."
+"blank, which causes the system to select the default login shell specified "
+"by the <option>SHELL</option> variable in <filename>/etc/default/useradd</"
+"filename>, or an empty string by default."
 msgstr ""
 "Имя регистрационной оболочки пользователя. Если задать пустое значение, то "
 "будет использована регистрационная оболочка по умолчанию."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:340(para)
+#: useradd.8.xml:436(para)
 msgid ""
 "The numerical value of the user's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. The "
@@ -1471,25 +1672,25 @@
 "ID большее 999 и большее любого другого значения пользователя. Значения от 0 "
 "до 999 обычно зарезервированы для системных учётных записей."
 
-#: useradd.8.xml:350(term)
+#: useradd.8.xml:446(term)
 #, fuzzy
 #| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-U</option>, <option>--user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: useradd.8.xml:354(para)
+#: useradd.8.xml:450(para)
 msgid ""
 "Create a group with the same name as the user, and add the user to this "
 "group."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><refsect2><title>
-#: useradd.8.xml:369(title)
+#: useradd.8.xml:465(title)
 msgid "Changing the default values"
 msgstr "Изменение значений по умолчанию"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: useradd.8.xml:370(para)
+#: useradd.8.xml:466(para)
 #, fuzzy
 msgid ""
 "When invoked with only the <option>-D</option> option, <command>useradd</"
@@ -1502,7 +1703,7 @@
 "изменяет их, если указаны дополнительные параметры в командной строке. "
 "Допустимые параметры:"
 
-#: useradd.8.xml:384(para)
+#: useradd.8.xml:480(para)
 #, fuzzy
 msgid ""
 "The path prefix for a new user's home directory. The user's name will be "
@@ -1515,13 +1716,25 @@
 "replaceable> для создания имени нового каталога, если не задан параметр "
 "<option>-d</option> при создании новой учётной записи."
 
+#: useradd.8.xml:487(para)
+msgid ""
+"This option sets the <option>HOME</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:399(para)
+#: useradd.8.xml:499(para)
 msgid "The date on which the user account is disabled."
 msgstr "Дата, когда учётная запись пользователя заблокирована."
 
+#: useradd.8.xml:500(para)
+msgid ""
+"This option sets the <option>EXPIRE</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:408(para)
+#: useradd.8.xml:512(para)
 msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
@@ -1529,36 +1742,59 @@
 "Число дней, которые должны пройти после устаревания пароля, перед тем как "
 "учётная запись будет заблокирована."
 
-# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:420(para)
+#: useradd.8.xml:516(para)
 msgid ""
-"The group name or ID for a new user's initial group. The named group must "
-"exist, and a numerical group ID must have an existing entry."
+"This option sets the <option>INACTIVE</option> variable in <filename>/etc/"
+"default/useradd</filename>."
 msgstr ""
-"Имя или числовой идентификатор новой начальной группы пользователя. Группа с "
-"таким именем должна существовать и для числового идентификатора должна быть "
-"запись."
 
-#: useradd.8.xml:433(para)
+#: useradd.8.xml:528(para)
+msgid ""
+"The group name or ID for a new user's initial group (when the <option>-N/--"
+"no-user-group</option> is used or when the <option>USERGROUPS_ENAB</option> "
+"variable is set to <replaceable>no</replaceable> in <filename>/etc/login."
+"defs</filename>. The named group must exist, and a numerical group ID must "
+"have an existing entry."
+msgstr ""
+
+#: useradd.8.xml:537(para)
+msgid ""
+"This option sets the <option>GROUP</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
+#: useradd.8.xml:549(para)
 msgid "The name of a new user's login shell."
 msgstr ""
 
+#: useradd.8.xml:552(para)
+msgid ""
+"This option sets the <option>SHELL</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><title>
-#: useradd.8.xml:444(title)
+#: useradd.8.xml:564(title)
 msgid "NOTES"
 msgstr "ЗАМЕЧАНИЯ"
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:445(para)
+#: useradd.8.xml:565(para)
+#, fuzzy
+#| msgid ""
+#| "The system administrator is responsible for placing the default user "
+#| "files in the <filename>/etc/skel/</filename> directory."
 msgid ""
 "The system administrator is responsible for placing the default user files "
-"in the <filename>/etc/skel/</filename> directory."
+"in the <filename>/etc/skel/</filename> directory (or any other skeleton "
+"directory specified in <filename>/etc/default/useradd</filename> or on the "
+"command line)."
 msgstr ""
 "Системный администратор сам решает, какие файлы нужно положить в каталог "
 "<filename>/etc/skel/</filename>."
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:452(para)
+#: useradd.8.xml:574(para)
 #, fuzzy
 msgid ""
 "You may not add a user to a NIS or LDAP group. This must be performed on the "
@@ -1568,7 +1804,7 @@
 "сервере."
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:457(para)
+#: useradd.8.xml:579(para)
 #, fuzzy
 msgid ""
 "Similarly, if the username already exists in an external user database such "
@@ -1580,33 +1816,62 @@
 "пользователя."
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:463(para)
+#: useradd.8.xml:585(para)
+#, fuzzy
+#| msgid ""
+#| "Usernames must begin with a lower case letter or an underscore, and only "
+#| "lower case letters, underscores, dashes, and dollar signs may follow. In "
+#| "regular expression terms: [a-z_][a-z0-9_-]*[$]"
 msgid ""
 "Usernames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
-"regular expression terms: [a-z_][a-z0-9_-]*[$]"
+"regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 "Имена пользователей должны начинаться со строчной буквы или символа "
 "подчёркивания, и должны состоять только из строчных букв, символов "
 "подчёркивания, тире и знака доллара. Это можно описать регулярным "
 "выражением: [a-z_][a-z0-9_-]*[$]"
 
+# type: Content of: <refentry><refsect1><para>
+#: useradd.8.xml:590(para)
+#, fuzzy
+#| msgid "Groupnames may only be up to 16 characters long."
+msgid "Usernames may only be up to 32 characters long."
+msgstr "Имена групп могут быть длиной не более 16 знаков."
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: groupadd.8.xml:2(term)
+#: useradd.8.xml:30(term) login.defs.5.xml:30(term)
 #, fuzzy
+msgid "<option>CREATE_HOME</option> (boolean)"
+msgstr "CHFN_AUTH (логический)"
+
+#: useradd.8.xml:32(para) login.defs.5.xml:32(para)
+msgid ""
+"Indicate if a home directory should be created by default for new users."
+msgstr ""
+
+#: useradd.8.xml:36(para) login.defs.5.xml:36(para)
+msgid ""
+"This setting does not apply to system users, and can be overriden on the "
+"command line."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: groupadd.8.xml:32(term)
+#, fuzzy
 msgid "<option>GID_MAX</option> (number)"
 msgstr "GID_MAX (число)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
-#: groupadd.8.xml:3(term)
+#: useradd.8.xml:33(term) newusers.8.xml:33(term) login.defs.5.xml:33(term)
+#: groupadd.8.xml:33(term)
 #, fuzzy
 msgid "<option>GID_MIN</option> (number)"
 msgstr "GID_MIN (число)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
-#: groupadd.8.xml:5(para)
+#: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para)
+#: groupadd.8.xml:35(para)
 #, fuzzy
 #| msgid ""
 #| "Range of group IDs to choose from for the <command>useradd</command> and "
@@ -1620,15 +1885,15 @@
 "command> и <command>groupadd</command>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) pwck.8.xml:2(term)
-#: newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_MAX_DAYS</option> (number)"
 msgstr "PASS_MAX_DAYS (число)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) pwck.8.xml:4(para)
-#: newusers.8.xml:4(para) login.defs.5.xml:4(para)
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "The maximum number of days a password may be used. If the password is older "
 "than this, a password change will be forced. If not specified, -1 will be "
@@ -1639,15 +1904,15 @@
 "предполагается значение -1 (то есть возможность ограничения не используется)."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) pwck.8.xml:2(term)
-#: newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_MIN_DAYS</option> (number)"
 msgstr "PASS_MIN_DAYS (число)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) pwck.8.xml:4(para)
-#: newusers.8.xml:4(para) login.defs.5.xml:4(para)
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "The minimum number of days allowed between password changes. Any password "
 "changes attempted sooner than this will be rejected. If not specified, -1 "
@@ -1658,15 +1923,15 @@
 "предполагается значение -1 (то есть возможность ограничения не используется)."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) pwck.8.xml:2(term)
-#: newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_WARN_AGE</option> (number)"
 msgstr "PASS_WARN_AGE (число)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) pwck.8.xml:4(para)
-#: newusers.8.xml:4(para) login.defs.5.xml:4(para)
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "The number of days warning given before a password expires. A zero means "
 "warning is given only upon the day of expiration, a negative value means no "
@@ -1678,21 +1943,21 @@
 "Если значение не задано, выдача предупреждения отключается."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: groupadd.8.xml:2(term)
+#: useradd.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: groupadd.8.xml:30(term)
 #, fuzzy
 msgid "<option>SYS_GID_MAX</option> (number)"
 msgstr "GID_MAX (число)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
-#: groupadd.8.xml:3(term)
+#: useradd.8.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
+#: groupadd.8.xml:31(term)
 #, fuzzy
 msgid "<option>SYS_GID_MIN</option> (number)"
 msgstr "GID_MIN (число)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
-#: groupadd.8.xml:5(para)
+#: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
+#: groupadd.8.xml:33(para)
 #, fuzzy
 #| msgid ""
 #| "Range of group IDs to choose from for the <command>useradd</command> and "
@@ -1706,18 +1971,18 @@
 "command> и <command>groupadd</command>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
 #, fuzzy
 msgid "<option>SYS_UID_MAX</option> (number)"
 msgstr "UID_MAX (число)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
+#: useradd.8.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
 #, fuzzy
 msgid "<option>SYS_UID_MIN</option> (number)"
 msgstr "UID_MIN (число)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
+#: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
 #, fuzzy
 #| msgid ""
 #| "Range of group IDs to choose from for the <command>useradd</command> and "
@@ -1730,18 +1995,18 @@
 "command> и <command>groupadd</command>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>UID_MAX</option> (number)"
 msgstr "UID_MAX (число)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
+#: useradd.8.xml:33(term) newusers.8.xml:33(term) login.defs.5.xml:33(term)
 #, fuzzy
 msgid "<option>UID_MIN</option> (number)"
 msgstr "UID_MIN (число)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
+#: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para)
 #, fuzzy
 #| msgid ""
 #| "Range of group IDs to choose from for the <command>useradd</command> and "
@@ -1754,102 +2019,124 @@
 "command> и <command>groupadd</command>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: login.1.xml:2(term)
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: login.1.xml:32(term)
 #, fuzzy
 msgid "<option>UMASK</option> (number)"
 msgstr "UMASK (число)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:4(para) newusers.8.xml:4(para) login.defs.5.xml:4(para)
-#: login.1.xml:4(para)
+#: useradd.8.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
+#: login.1.xml:34(para)
+#, fuzzy
+#| msgid ""
+#| "The permission mask is initialized to this value. If not specified, the "
+#| "permission mask will be initialized to 022."
 msgid ""
-"The permission mask is initialized to this value. If not specified, the "
-"permission mask will be initialized to 022."
+"The file mode creation mask is initialized to this value. If not specified, "
+"the mask will be initialized to 022."
 msgstr ""
 "Задаёт начальное значение маски доступа. Если не указано, то маска доступа "
 "устанавливается в 022."
 
+#: useradd.8.xml:38(para) newusers.8.xml:38(para) login.defs.5.xml:38(para)
+#: login.1.xml:38(para)
+msgid ""
+"<command>useradd</command> and <command>newusers</command> use this mask to "
+"set the mode of the home directory they create"
+msgstr ""
+
+#: useradd.8.xml:42(para) newusers.8.xml:42(para) login.defs.5.xml:42(para)
+#: login.1.xml:42(para)
+msgid ""
+"It is also used by <command>login</command> to define users' initial umask. "
+"Note that this mask can be overriden by the user's GECOS line (if "
+"<option>QUOTAS_ENAB</option> is set) or by the specification of a limit with "
+"the <emphasis>K</emphasis> identifier in "
+"<citerefentry><refentrytitle>limits</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: useradd.8.xml:520(filename)
+#: useradd.8.xml:646(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:522(para)
+#: useradd.8.xml:648(para)
 msgid "Default values for account creation."
 msgstr "содержит защищаемую информацию о пользователях"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: useradd.8.xml:526(filename)
+#: useradd.8.xml:652(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:528(para)
+#: useradd.8.xml:654(para)
 msgid "Directory containing default files."
 msgstr "каталог, содержащий пользовательские файлы по умолчанию"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: useradd.8.xml:564(replaceable) shadow.3.xml:6(manvolnum)
-#: pwck.8.xml:231(replaceable) passwd.1.xml:366(replaceable)
-#: grpck.8.xml:205(replaceable) groupmod.8.xml:156(replaceable)
-#: groupadd.8.xml:225(replaceable)
+#: useradd.8.xml:690(replaceable) shadow.3.xml:35(manvolnum)
+#: pwck.8.xml:264(replaceable) passwd.1.xml:408(replaceable)
+#: grpck.8.xml:237(replaceable) groupmod.8.xml:185(replaceable)
+#: groupadd.8.xml:251(replaceable)
 msgid "3"
 msgstr "3"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:566(para) passwd.1.xml:386(para) groupmod.8.xml:158(para)
-#: groupadd.8.xml:227(para)
+#: useradd.8.xml:692(para) passwd.1.xml:428(para) groupmod.8.xml:187(para)
+#: groupadd.8.xml:253(para)
 msgid "invalid argument to option"
 msgstr "недопустимое значение параметра"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: useradd.8.xml:570(replaceable) pwck.8.xml:237(replaceable)
-#: passwd.1.xml:372(replaceable) grpck.8.xml:211(replaceable)
-#: groupmod.8.xml:162(replaceable) groupadd.8.xml:231(replaceable)
+#: useradd.8.xml:696(replaceable) pwck.8.xml:270(replaceable)
+#: passwd.1.xml:414(replaceable) grpck.8.xml:243(replaceable)
+#: groupmod.8.xml:191(replaceable) groupadd.8.xml:257(replaceable)
 msgid "4"
 msgstr "4"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:572(para)
+#: useradd.8.xml:698(para)
 msgid "UID already in use (and no <option>-o</option>)"
 msgstr "такой UID уже существует (и не задан параметр <option>-o</option>)"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:578(para) groupmod.8.xml:164(para) groupmod.8.xml:170(para)
-#: groupdel.8.xml:96(para)
+#: useradd.8.xml:704(para) groupmod.8.xml:193(para) groupmod.8.xml:199(para)
+#: groupdel.8.xml:125(para)
 msgid "specified group doesn't exist"
 msgstr "указанная группа не существует"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: useradd.8.xml:582(replaceable) groupmod.8.xml:174(replaceable)
-#: groupadd.8.xml:237(replaceable)
+#: useradd.8.xml:708(replaceable) groupmod.8.xml:203(replaceable)
+#: groupadd.8.xml:263(replaceable)
 msgid "9"
 msgstr "9"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:584(para)
+#: useradd.8.xml:710(para)
 msgid "username already in use"
 msgstr "имя пользователя уже существует"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:596(para)
+#: useradd.8.xml:722(para)
 msgid "can't create home directory"
 msgstr "не удалось создать домашний каталог"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: useradd.8.xml:600(replaceable)
+#: useradd.8.xml:726(replaceable)
 msgid "13"
 msgstr "13"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: useradd.8.xml:602(para)
+#: useradd.8.xml:728(para)
 msgid "can't create mail spool"
 msgstr "не удалось создать почтовый ящик"
 
 # type: Content of: <refentry><refsect1><para>
-#: useradd.8.xml:542(para)
+#: useradd.8.xml:668(para)
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -1857,7 +2144,7 @@
 "Команда <command>useradd</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
-#: useradd.8.xml:611(para)
+#: useradd.8.xml:737(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1896,41 +2183,41 @@
 "manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refname>
-#: suauth.5.xml:5(refentrytitle) suauth.5.xml:10(refname)
+#: suauth.5.xml:34(refentrytitle) suauth.5.xml:39(refname)
 msgid "suauth"
 msgstr "suauth"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><manvolnum>
-#: suauth.5.xml:6(manvolnum) shadow.5.xml:6(manvolnum)
-#: pwck.8.xml:243(replaceable) porttime.5.xml:6(manvolnum)
-#: passwd.5.xml:6(manvolnum) passwd.1.xml:378(replaceable)
-#: login.defs.5.xml:67(manvolnum) login.access.5.xml:6(manvolnum)
-#: limits.5.xml:6(manvolnum) gshadow.5.xml:6(manvolnum)
-#: grpck.8.xml:217(replaceable) faillog.5.xml:6(manvolnum)
+#: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
+#: pwck.8.xml:276(replaceable) porttime.5.xml:35(manvolnum)
+#: passwd.5.xml:35(manvolnum) passwd.1.xml:420(replaceable)
+#: login.defs.5.xml:98(manvolnum) login.access.5.xml:36(manvolnum)
+#: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
+#: grpck.8.xml:249(replaceable) faillog.5.xml:35(manvolnum)
 msgid "5"
 msgstr "5"
 
 # type: Content of: <refentry><refmeta><refmiscinfo>
-#: suauth.5.xml:7(refmiscinfo) shadow.5.xml:7(refmiscinfo)
-#: porttime.5.xml:7(refmiscinfo) passwd.5.xml:7(refmiscinfo)
-#: login.defs.5.xml:68(refmiscinfo) login.access.5.xml:7(refmiscinfo)
-#: limits.5.xml:7(refmiscinfo) gshadow.5.xml:7(refmiscinfo)
-#: faillog.5.xml:7(refmiscinfo)
+#: suauth.5.xml:36(refmiscinfo) shadow.5.xml:36(refmiscinfo)
+#: porttime.5.xml:36(refmiscinfo) passwd.5.xml:36(refmiscinfo)
+#: login.defs.5.xml:99(refmiscinfo) login.access.5.xml:37(refmiscinfo)
+#: limits.5.xml:37(refmiscinfo) gshadow.5.xml:35(refmiscinfo)
+#: faillog.5.xml:36(refmiscinfo)
 msgid "File Formats and Conversions"
 msgstr "Форматы файлов"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: suauth.5.xml:11(refpurpose)
+#: suauth.5.xml:40(refpurpose)
 msgid "detailed su control file"
 msgstr "файл управления командой su"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: suauth.5.xml:16(command) suauth.5.xml:142(filename)
+#: suauth.5.xml:45(command) suauth.5.xml:171(filename)
 msgid "/etc/suauth"
 msgstr "/etc/suauth"
 
 # type: Content of: <refentry><refsect1><para>
-#: suauth.5.xml:22(para)
+#: suauth.5.xml:51(para)
 msgid ""
 "The file <filename>/etc/suauth</filename> is referenced whenever the su "
 "command is called. It can change the behaviour of the su command, based upon:"
@@ -1940,7 +2227,7 @@
 
 # type: Content of: <refentry><refsect1><literallayout>
 #. .RS
-#: suauth.5.xml:29(literallayout)
+#: suauth.5.xml:58(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -1953,7 +2240,7 @@
 
 # type: Content of: <refentry><refsect1><para>
 #. .fi
-#: suauth.5.xml:33(para)
+#: suauth.5.xml:62(para)
 msgid ""
 "2) the user executing the su command (or any groups he might be a member of)"
 msgstr ""
@@ -1961,7 +2248,7 @@
 "может быть)"
 
 # type: Content of: <refentry><refsect1><para>
-#: suauth.5.xml:38(para)
+#: suauth.5.xml:67(para)
 msgid ""
 "The file is formatted like this, with lines starting with a # being treated "
 "as comment lines and ignored;"
@@ -1970,7 +2257,7 @@
 "игнорируются;"
 
 # type: Content of: <refentry><refsect1><literallayout>
-#: suauth.5.xml:43(literallayout)
+#: suauth.5.xml:72(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -1981,7 +2268,7 @@
 "      желаемый-id:желающий-id:ДЕЙСТВИЕ\n"
 "    "
 
-#: suauth.5.xml:47(para)
+#: suauth.5.xml:76(para)
 msgid ""
 "Where to-id is either the word <emphasis>ALL</emphasis>, a list of usernames "
 "delimited by \",\" or the words <emphasis>ALL EXCEPT</emphasis> followed by "
@@ -1992,7 +2279,7 @@
 "EXCEPT</emphasis> , после которой идёт список имён пользователей "
 "перечисленных через \",\""
 
-#: suauth.5.xml:53(para)
+#: suauth.5.xml:82(para)
 msgid ""
 "from-id is formatted the same as to-id except the extra word "
 "<emphasis>GROUP</emphasis> is recognised. <emphasis>ALL EXCEPT GROUP</"
@@ -2011,38 +2298,38 @@
 "manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para>
-#: suauth.5.xml:64(para)
+#: suauth.5.xml:93(para)
 msgid "Action can be one only of the following currently supported options."
 msgstr "В поле ДЕЙСТВИЕ может быть только одно из следующих значений:"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><emphasis>
-#: suauth.5.xml:70(emphasis)
+#: suauth.5.xml:99(emphasis)
 msgid "DENY"
 msgstr "DENY"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: suauth.5.xml:73(para)
+#: suauth.5.xml:102(para)
 msgid "The attempt to su is stopped before a password is even asked for."
 msgstr "Команда su останавливает выполнение, даже не спрашивая пароль."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><emphasis>
-#: suauth.5.xml:80(emphasis)
+#: suauth.5.xml:109(emphasis)
 msgid "NOPASS"
 msgstr "NOPASS"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: suauth.5.xml:83(para)
+#: suauth.5.xml:112(para)
 msgid ""
 "The attempt to su is automatically successful; no password is asked for."
 msgstr "Команда su выполняется без запроса пароля."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><emphasis>
-#: suauth.5.xml:91(emphasis)
+#: suauth.5.xml:120(emphasis)
 msgid "OWNPASS"
 msgstr "OWNPASS"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: suauth.5.xml:94(para)
+#: suauth.5.xml:123(para)
 msgid ""
 "For the su command to be successful, the user must enter his or her own "
 "password. They are told this."
@@ -2051,7 +2338,7 @@
 "собственный пароль."
 
 # type: Content of: <refentry><refsect1><para>
-#: suauth.5.xml:102(para)
+#: suauth.5.xml:131(para)
 msgid ""
 "Note there are three separate fields delimited by a colon. No whitespace "
 "must surround this colon. Also note that the file is examined sequentially "
@@ -2066,12 +2353,12 @@
 "администратору осуществлять любой контроль, какой он пожелает."
 
 # type: Content of: <refentry><refsect1><title>
-#: suauth.5.xml:112(title)
+#: suauth.5.xml:141(title)
 msgid "EXAMPLE"
 msgstr "ПРИМЕР"
 
 # type: Content of: <refentry><refsect1><literallayout>
-#: suauth.5.xml:113(literallayout)
+#: suauth.5.xml:142(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -2121,12 +2408,12 @@
 "    "
 
 # type: Content of: <refentry><refsect1><title>
-#: suauth.5.xml:149(title) pwconv.8.xml:105(title) login.defs.5.xml:428(title)
+#: suauth.5.xml:178(title) pwconv.8.xml:135(title) login.defs.5.xml:455(title)
 msgid "BUGS"
 msgstr "ОШИБКИ РЕАЛИЗАЦИИ"
 
 # type: Content of: <refentry><refsect1><para>
-#: suauth.5.xml:150(para)
+#: suauth.5.xml:179(para)
 msgid ""
 "There could be plenty lurking. The file parser is particularly unforgiving "
 "about syntax errors, expecting no spurious whitespace (apart from beginning "
@@ -2137,11 +2424,11 @@
 "в начале и конце строк) и специальных слов, разделяющих различные вещи."
 
 # type: Content of: <refentry><refsect1><title>
-#: suauth.5.xml:159(title) shadow.3.xml:154(title)
+#: suauth.5.xml:188(title) shadow.3.xml:183(title)
 msgid "DIAGNOSTICS"
 msgstr "ДИАГНОСТИКА"
 
-#: suauth.5.xml:160(para)
+#: suauth.5.xml:189(para)
 msgid ""
 "An error parsing the file is reported using "
 "<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</"
@@ -2151,7 +2438,7 @@
 "<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry> с уровнем ERR средства AUTH."
 
-#: suauth.5.xml:169(para)
+#: suauth.5.xml:198(para)
 msgid ""
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -2160,27 +2447,33 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: su.1.xml:25(refentrytitle) su.1.xml:30(refname) su.1.xml:35(command)
-#: login.defs.5.xml:363(term)
+#: su.1.xml:54(refentrytitle) su.1.xml:59(refname) su.1.xml:64(command)
+#: login.defs.5.xml:395(term)
 msgid "su"
 msgstr "su"
 
 # type: Content of: <refentry><refmeta><refmiscinfo>
-#: su.1.xml:27(refmiscinfo) sg.1.xml:11(refmiscinfo)
-#: passwd.1.xml:17(refmiscinfo) newgrp.1.xml:11(refmiscinfo)
-#: login.1.xml:43(refmiscinfo) groups.1.xml:7(refmiscinfo)
-#: gpasswd.1.xml:15(refmiscinfo) expiry.1.xml:13(refmiscinfo)
-#: chsh.1.xml:13(refmiscinfo) chfn.1.xml:14(refmiscinfo)
-#: chage.1.xml:7(refmiscinfo)
+#: su.1.xml:56(refmiscinfo) sg.1.xml:40(refmiscinfo)
+#: passwd.1.xml:46(refmiscinfo) newgrp.1.xml:40(refmiscinfo)
+#: login.1.xml:72(refmiscinfo) groups.1.xml:36(refmiscinfo)
+#: gpasswd.1.xml:44(refmiscinfo) expiry.1.xml:43(refmiscinfo)
+#: chsh.1.xml:42(refmiscinfo) chfn.1.xml:43(refmiscinfo)
+#: chage.1.xml:36(refmiscinfo)
 msgid "User Commands"
 msgstr "Пользовательские команды"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: su.1.xml:31(refpurpose)
+#: su.1.xml:60(refpurpose)
 msgid "change user ID or become superuser"
 msgstr "изменяет ID пользователя или делает его суперпользователем"
 
-#: su.1.xml:49(para)
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><arg><replaceable>
+#: su.1.xml:70(replaceable) login.1.xml:85(replaceable)
+#: login.1.xml:93(replaceable)
+msgid "username"
+msgstr "имя_пользователя"
+
+#: su.1.xml:78(para)
 msgid ""
 "The <command>su</command> command is used to become another user during a "
 "login session. Invoked without a <option>username</option>, <command>su</"
@@ -2195,7 +2488,7 @@
 "option> можно использовать для воссоздания рабочей среды, такой же как если "
 "бы настоящий пользователь выполнял вход в систему."
 
-#: su.1.xml:58(para)
+#: su.1.xml:87(para)
 msgid ""
 "Additional arguments may be provided after the username, in which case they "
 "are supplied to the user's login shell. In particular, an argument of "
@@ -2210,7 +2503,7 @@
 "etc/passwd</filename>, которая является регистрационной для указываемого "
 "пользователя."
 
-#: su.1.xml:67(para)
+#: su.1.xml:96(para)
 msgid ""
 "You can use the <option>--</option> argument to separate <command>su</"
 "command> options from the arguments supplied to the shell."
@@ -2219,7 +2512,7 @@
 "<command>su</command> от параметров передаваемых оболочке."
 
 # type: Content of: <refentry><refsect1><para>
-#: su.1.xml:72(para)
+#: su.1.xml:101(para)
 msgid ""
 "The user will be prompted for a password, if appropriate. Invalid passwords "
 "will produce an error message. All attempts, both valid and invalid, are "
@@ -2229,7 +2522,7 @@
 "возникает сообщение об ошибке. Все попытки, удачные и неудачные, "
 "протоколируются системой с целью обнаружения злоупотреблений."
 
-#: su.1.xml:77(para)
+#: su.1.xml:106(para)
 msgid ""
 "The current environment is passed to the new shell. The value of <envar>"
 "$PATH</envar> is reset to <filename>/bin:/usr/bin</filename> for normal "
@@ -2246,7 +2539,7 @@
 "<filename>/etc/login.defs</filename>."
 
 # type: Content of: <refentry><refsect1><para>
-#: su.1.xml:86(para) login.1.xml:135(para)
+#: su.1.xml:115(para) login.1.xml:166(para)
 msgid ""
 "A subsystem login is indicated by the presence of a \"*\" as the first "
 "character of the login shell. The given home directory will be used as the "
@@ -2257,11 +2550,11 @@
 "как корень новой файловой системы, в которой регистрируется пользователь."
 
 # type: Content of: <refentry><refsect1><para>
-#: su.1.xml:95(para)
+#: su.1.xml:124(para)
 msgid "The options which apply to the <command>su</command> command are:"
 msgstr "Параметры команды <command>su</command>:"
 
-#: su.1.xml:99(term)
+#: su.1.xml:128(term)
 msgid ""
 "<option>-c</option>, <option>--command</option><replaceable>COMMAND</"
 "replaceable>"
@@ -2270,7 +2563,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: su.1.xml:104(para)
+#: su.1.xml:133(para)
 msgid ""
 "Specify a command that will be invoked by the shell using its <option>-c</"
 "option>."
@@ -2278,12 +2571,12 @@
 "Указать команду, которая будет запущена оболочкой в виде параметра для "
 "<option>-c</option>."
 
-#: su.1.xml:111(term)
+#: su.1.xml:140(term)
 msgid "<option>-</option>, <option>-l</option>, <option>--login</option>"
 msgstr "<option>-</option>, <option>-l</option>, <option>--login</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: su.1.xml:115(para)
+#: su.1.xml:144(para)
 msgid ""
 "Provide an environment similar to what the user would expect had the user "
 "logged in directly."
@@ -2291,7 +2584,7 @@
 "Предоставляет среду, как если бы пользователь непосредственно "
 "регистрировался в системе."
 
-#: su.1.xml:119(para)
+#: su.1.xml:148(para)
 msgid ""
 "When <option>-</option> is used, it must be specified as the last "
 "<command>su</command> option. The other forms (<option>-l</option> and "
@@ -2302,16 +2595,16 @@
 "<option>--login</option>) не имеют этого ограничения."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: su.1.xml:133(para)
+#: su.1.xml:162(para)
 msgid "The shell that will be invoked."
 msgstr "Оболочка, которая будет запущена."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: su.1.xml:138(para)
+#: su.1.xml:167(para)
 msgid "The shell specified with --shell."
 msgstr "Оболочка указанная в параметре --shell."
 
-#: su.1.xml:141(para)
+#: su.1.xml:170(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
@@ -2320,7 +2613,7 @@
 "задаётся переменной среды <envar>$SHELL</envar>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: su.1.xml:148(para)
+#: su.1.xml:177(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
@@ -2329,7 +2622,7 @@
 "заданного пользователя."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: su.1.xml:154(para)
+#: su.1.xml:183(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
@@ -2338,14 +2631,14 @@
 "помощью методов, указанных выше."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: su.1.xml:134(para)
+#: su.1.xml:163(para)
 msgid ""
 "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr ""
 "Запущенная оболочка выбирается из (в порядке убывания приоритета): "
 "<placeholder-1/>"
 
-#: su.1.xml:161(para)
+#: su.1.xml:190(para)
 msgid ""
 "If the target user has a restricted shell (i.e. the shell field of this "
 "user's entry in <filename>/etc/passwd</filename> is not listed in <filename>/"
@@ -2360,7 +2653,7 @@
 "учётную запись, если <command>su</command> не была запущена "
 "суперпользователем."
 
-#: su.1.xml:172(term)
+#: su.1.xml:201(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -2369,12 +2662,12 @@
 "option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: su.1.xml:177(para)
+#: su.1.xml:206(para)
 msgid "Preserve the current environment."
 msgstr "Сохранить имеющуюся рабочую среду."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: su.1.xml:178(para)
+#: su.1.xml:207(para)
 msgid ""
 "If the target user has a restricted shell, this option has no effect (unless "
 "<command>su</command> is called by root)."
@@ -2383,7 +2676,7 @@
 "сработает (если <command>su</command> не запускается суперпользователем)."
 
 # type: Content of: <refentry><refsect1><para>
-#: su.1.xml:189(para)
+#: su.1.xml:218(para)
 msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -2393,29 +2686,29 @@
 "машине."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>CONSOLE</option> (string)"
 msgstr "CHFN_RESTRICT (строка)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, either full pathname of a file containing device names or a \":"
 "\" delimited list of device names. Root logins will be allowed only upon "
 "these devices."
 msgstr ""
 
-#: su.1.xml:9(para) login.defs.5.xml:9(para) login.1.xml:9(para)
+#: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
 msgid "If not defined, root will be allowed on any device."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>CONSOLE_GROUPS</option> (string)"
 msgstr "CHFN_RESTRICT (строка)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "List of groups to add to the user's supplementary group set when logging in "
 "on the console (as determined by the CONSOLE setting). Default is none. "
@@ -2424,18 +2717,18 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>DEFAULT_HOME</option> (boolean)"
 msgstr "CHFN_AUTH (логический)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Indicate if login is allowed if we can't cd to the home directory. Default "
 "in no."
 msgstr ""
 
-#: su.1.xml:8(para) login.defs.5.xml:8(para) login.1.xml:8(para)
+#: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
 msgid ""
 "If set to <replaceable>yes</replaceable>, the user will login in the root "
 "(<filename>/</filename>) directory if it is not possible to cd to her home "
@@ -2444,43 +2737,43 @@
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #. XXX: When compiled with PAM support, only sulogin uses ENV_HZ
-#: su.1.xml:3(term) login.defs.5.xml:3(term) login.1.xml:3(term)
+#: su.1.xml:33(term) login.defs.5.xml:33(term) login.1.xml:33(term)
 #, fuzzy
 msgid "<option>ENV_HZ</option> (string)"
 msgstr "MAIL_DIR (строка)"
 
-#: su.1.xml:5(para) login.defs.5.xml:5(para) login.1.xml:5(para)
+#: su.1.xml:35(para) login.defs.5.xml:35(para) login.1.xml:35(para)
 msgid ""
 "If set, it will be used to define the HZ environment variable when a user "
 "login. The value must be preceded by <replaceable>HZ=</replaceable>. A "
 "common value on Linux is <replaceable>HZ=100</replaceable>."
 msgstr ""
 
-#: su.1.xml:11(para) login.defs.5.xml:11(para) login.1.xml:11(para)
+#: su.1.xml:41(para) login.defs.5.xml:41(para) login.1.xml:41(para)
 msgid ""
 "The <envar>HZ</envar> environment variable is only set when the user (the "
 "superuser) logs in with <command>sulogin</command>."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENVIRON_FILE</option> (string)"
 msgstr "MAIL_DIR (строка)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If this file exists and is readable, login environment will be read from it. "
 "Every line should be in the form name=value."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_PATH</option> (string)"
 msgstr "CHFN_RESTRICT (строка)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, it will be used to define the PATH environment variable when a "
 "regular user login. The value can be preceded by <replaceable>PATH=</"
@@ -2490,12 +2783,12 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_SUPATH</option> (string)"
 msgstr "CHFN_RESTRICT (строка)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, it will be used to define the PATH environment variable when the "
 "superuser login. The value can be preceded by <replaceable>PATH=</"
@@ -2505,12 +2798,12 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_TZ</option> (string)"
 msgstr "CHFN_RESTRICT (строка)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, it will be used to define the TZ environment variable when a user "
 "login. The value can be the name of a timezone preceded by <replaceable>TZ=</"
@@ -2520,77 +2813,77 @@
 msgstr ""
 
 #. TODO: it can in fact be used to set any other variable
-#: su.1.xml:13(para) login.defs.5.xml:13(para) login.1.xml:13(para)
+#: su.1.xml:43(para) login.defs.5.xml:43(para) login.1.xml:43(para)
 msgid ""
 "If a full path is specified but the file does not exist or cannot be read, "
 "the default is to use <replaceable>TZ=CST6CDT</replaceable>."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
-#: chsh.1.xml:2(term) chfn.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
+#: chsh.1.xml:32(term) chfn.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOGIN_STRING</option> (string)"
 msgstr "CHFN_RESTRICT (строка)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
-#: chsh.1.xml:4(para) chfn.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
+#: chsh.1.xml:34(para) chfn.1.xml:34(para)
 msgid ""
 "The string used for prompting a password. The default is to use \"Password: "
 "\", or a translation of that string. If you set this variable, the prompt "
 "will no be translated."
 msgstr ""
 
-#: su.1.xml:9(para) login.defs.5.xml:9(para) login.1.xml:9(para)
-#: chsh.1.xml:9(para) chfn.1.xml:9(para)
+#: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
+#: chsh.1.xml:39(para) chfn.1.xml:39(para)
 msgid ""
 "If the string contains <replaceable>%s</replaceable>, this will be replaced "
 "by the user's name."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>MAIL_CHECK_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (логический)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable checking and display of mailbox status upon login."
 msgstr ""
 
-#: su.1.xml:7(para) login.defs.5.xml:7(para) login.1.xml:7(para)
+#: su.1.xml:37(para) login.defs.5.xml:37(para) login.1.xml:37(para)
 msgid ""
 "You should disable it if the shell startup files already check for mail "
 "(\"mailx -e\" or equivalent)."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>QUOTAS_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (логический)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable setting of ulimit, umask, and niceness from passwd gecos field."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: su.1.xml:2(term) login.defs.5.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SULOG_FILE</option> (string)"
 msgstr "CHFN_RESTRICT (строка)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "If defined, all su activity is logged to this file."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: su.1.xml:2(term) login.defs.5.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SU_NAME</option> (string)"
 msgstr "MAIL_DIR (строка)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "If defined, the command name to display when running \"su -\". For example, "
 "if this is defined as \"su\" then a \"ps\" will display the command is \"-su"
@@ -2599,12 +2892,12 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: su.1.xml:3(term) login.defs.5.xml:3(term)
+#: su.1.xml:33(term) login.defs.5.xml:33(term)
 #, fuzzy
 msgid "<option>SU_WHEEL_ONLY</option> (boolean)"
 msgstr "CHFN_AUTH (логический)"
 
-#: su.1.xml:5(para) login.defs.5.xml:5(para)
+#: su.1.xml:35(para) login.defs.5.xml:35(para)
 msgid ""
 "If <replaceable>yes</replaceable>, the user must be listed as a member of "
 "the first gid 0 group in <filename>/etc/group</filename> (called "
@@ -2614,18 +2907,18 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: su.1.xml:2(term) login.defs.5.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SYSLOG_SU_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (логический)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "Enable \"syslog\" logging of <command>su</command> activity - in addition to "
 "sulog file logging."
 msgstr ""
 
-#: su.1.xml:243(para)
+#: su.1.xml:272(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -2642,30 +2935,30 @@
 "manvolnum></citerefentry>"
 
 # type: Content of: <refentry><refsect1><para><command>
-#: sg.1.xml:9(refentrytitle) sg.1.xml:14(refname) sg.1.xml:20(command)
+#: sg.1.xml:38(refentrytitle) sg.1.xml:43(refname) sg.1.xml:49(command)
 msgid "sg"
 msgstr "sg"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: sg.1.xml:15(refpurpose)
+#: sg.1.xml:44(refpurpose)
 msgid "execute command as different group ID"
 msgstr "выполняет команду с правами другой группы"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><option>
-#: sg.1.xml:21(arg) newgrp.1.xml:20(arg)
+#: sg.1.xml:50(arg) newgrp.1.xml:49(arg)
 msgid "-"
 msgstr "-"
 
 # type: Content of: <refentry><refsect1><para><option>
-#: sg.1.xml:23(arg) expiry.1.xml:23(arg)
+#: sg.1.xml:52(arg) expiry.1.xml:53(arg)
 msgid "-c"
 msgstr "-c"
 
-#: sg.1.xml:22(arg)
+#: sg.1.xml:51(arg)
 msgid "group <placeholder-1/> command"
 msgstr "группа <placeholder-1/> команда"
 
-#: sg.1.xml:31(para)
+#: sg.1.xml:60(para)
 msgid ""
 "The <command>sg</command> command works similar to <command>newgrp</command> "
 "but accepts a command. The command will be executed with the <filename>/bin/"
@@ -2689,16 +2982,16 @@
 "command> вы возвращаетесь в предыдущую группу."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: sg.1.xml:2(term) newgrp.1.xml:2(term) login.defs.5.xml:2(term)
+#: sg.1.xml:32(term) newgrp.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SYSLOG_SG_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (логический)"
 
-#: sg.1.xml:4(para) newgrp.1.xml:4(para) login.defs.5.xml:4(para)
+#: sg.1.xml:34(para) newgrp.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Enable \"syslog\" logging of <command>sg</command> activity."
 msgstr ""
 
-#: sg.1.xml:90(para)
+#: sg.1.xml:119(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -2736,297 +3029,421 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.5.xml:5(refentrytitle) shadow.5.xml:10(refname)
-#: shadow.3.xml:5(refentrytitle) shadow.3.xml:10(refname)
-#: pwck.8.xml:31(replaceable) pwck.8.xml:45(replaceable)
-#: grpck.8.xml:24(replaceable) grpck.8.xml:33(replaceable)
+#: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
+#: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
+#: pwck.8.xml:60(replaceable) pwck.8.xml:74(replaceable)
+#: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
 msgid "shadow"
 msgstr "shadow"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.5.xml:11(refpurpose)
+#: shadow.5.xml:40(refpurpose)
 msgid "encrypted password file"
 msgstr "файл с защищаемой информацией о пользователях"
 
 # type: Content of: <refentry><refsect1><para>
-#: shadow.5.xml:16(para)
+#: shadow.5.xml:45(para)
+#, fuzzy
+#| msgid ""
+#| "<emphasis remap=\"I\">shadow</emphasis> contains the encrypted password "
+#| "information for user's accounts and optional the password aging "
+#| "information. Included is:"
 msgid ""
-"<emphasis remap=\"I\">shadow</emphasis> contains the encrypted password "
-"information for user's accounts and optional the password aging information. "
-"Included is:"
+"<filename>shadow</filename> is a file which contains the password "
+"information for the system's accounts and optional aging information."
 msgstr ""
 "<emphasis remap=\"I\">shadow</emphasis> содержит шифрованные пароли учётных "
 "записей пользователей и необязательную информацию об устаревании пароля. "
 "Включает в себя:"
 
+# type: Content of: <refentry><refsect1><para>
+#: shadow.5.xml:51(para) gshadow.5.xml:82(para)
+msgid ""
+"This file must not be readable by regular users if password security is to "
+"be maintained."
+msgstr ""
+"Этот файл должен быть недоступен обычному пользователю, если нужно "
+"обеспечить безопасность паролей."
+
+#: shadow.5.xml:56(para)
+msgid ""
+"Each line of this file contains 9 fields, separated by colons (<quote>:</"
+"quote>), in the following order:"
+msgstr ""
+
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.5.xml:23(para) passwd.5.xml:24(para)
+#: shadow.5.xml:63(emphasis) passwd.5.xml:53(para)
 msgid "login name"
 msgstr "имя пользователя для входа в систему"
 
+#: shadow.5.xml:65(para)
+msgid "It must be a valid account name, which exist on the system."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.5.xml:26(para) gshadow.5.xml:26(para)
+#: shadow.5.xml:71(emphasis) gshadow.5.xml:54(para)
 msgid "encrypted password"
 msgstr "шифрованный пароль"
 
-# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.5.xml:29(para)
-msgid "days since Jan 1, 1970 that password was last changed"
+#: shadow.5.xml:73(para)
+msgid ""
+"Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+"manvolnum></citerefentry> for details on how this string is interpreted."
 msgstr ""
-"число дней с момента последнего изменения пароля, начиная с 1 января 1970 "
-"года"
+"Подробней о пароле смотрите на странице руководства "
+"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
+"citerefentry>."
 
+#: shadow.5.xml:78(para)
+#, fuzzy
+#| msgid ""
+#| "If the password field contains some string that is not valid result of "
+#| "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+#| "manvolnum></citerefentry>, for instance ! or *, the user will not be able "
+#| "to use a unix password to log in, subject to "
+#| "<citerefentry><refentrytitle>pam</refentrytitle><manvolnum>7</manvolnum></"
+#| "citerefentry>."
+msgid ""
+"If the password field contains some string that is not a valid result of "
+"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
+"citerefentry>, for instance ! or *, the user will not be able to use a unix "
+"password to log in (but the user may log in the system by other means)."
+msgstr ""
+"Если поле пароля содержит строку, которая не удовлетворяет требованиям "
+"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
+"citerefentry>, например содержит ! или *, то пользователь не сможет "
+"использовать этот unix пароль для регистрации с учётом настроек "
+"<citerefentry><refentrytitle>pam</refentrytitle><manvolnum>7</manvolnum></"
+"citerefentry>."
+
+#: shadow.5.xml:85(para)
+msgid ""
+"This field may be empty, in which case no passwords are required to "
+"authenticate as the specified login name. However, some applications which "
+"read the <filename>/etc/shadow</filename> file may decide not to permit any "
+"access at all if the password field is empty."
+msgstr ""
+
+#: shadow.5.xml:92(para)
+msgid ""
+"A password field which starts with a exclamation mark means that the "
+"password is locked. The remaining characters on the line represent the "
+"password field before the password was locked."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.5.xml:32(para)
-msgid "days before password may be changed"
+#: shadow.5.xml:102(emphasis)
+#, fuzzy
+#| msgid "days before password may be changed"
+msgid "date of last password change"
 msgstr "число дней, перед тем как пароль может быть изменён"
 
-# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.5.xml:35(para)
-msgid "days after which password must be changed"
-msgstr "число дней, после которых пароль должен быть изменён"
+#: shadow.5.xml:105(para)
+msgid ""
+"The date of the last password change, expressed as the number of days since "
+"Jan 1, 1970."
+msgstr ""
 
-# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.5.xml:38(para)
-msgid "days before password is to expire that user is warned"
+#: shadow.5.xml:109(para)
+msgid ""
+"The value 0 has a special meaning, which is that the user should change her "
+"pasword the next time she will log in the system."
 msgstr ""
-"число дней, за сколько пользователя начнут предупреждать, что пароль "
-"устаревает"
 
-# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.5.xml:41(para)
-msgid "days after password expires that account is disabled"
-msgstr "число дней, после устаревания пароля для блокировки учётной записи"
+#: shadow.5.xml:114(para)
+msgid "An empty field means that password aging features are disabled."
+msgstr ""
 
-# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.5.xml:44(para)
-msgid "days since Jan 1, 1970 that account is disabled"
+# type: Content of: <refentry><refsect1><refsect2><title>
+#: shadow.5.xml:121(emphasis)
+#, fuzzy
+#| msgid "Password Changes"
+msgid "minimum password age"
+msgstr "Изменение пароля"
+
+#: shadow.5.xml:123(para)
+msgid ""
+"The minimum password age is the number of days the user will have to wait "
+"before she will be allowed to change her password again."
 msgstr ""
-"дней, отсчитывая с 1 января 1970 года, когда учётная запись была "
-"заблокирована"
 
-# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.5.xml:47(para)
-msgid "a reserved field"
-msgstr "зарезервированное поле"
+#: shadow.5.xml:128(para)
+msgid "An empty field and value 0 mean that there are no minimum password age."
+msgstr ""
 
-# type: Content of: <refentry><refsect1><para>
-#: shadow.5.xml:51(para)
+# type: Content of: <refentry><refsect1><refsect2><title>
+#: shadow.5.xml:135(emphasis)
 #, fuzzy
+#| msgid "Password Changes"
+msgid "maximum password age"
+msgstr "Изменение пароля"
+
+#: shadow.5.xml:137(para)
 msgid ""
-"The password field must be filled. The encrypted password consists of 13 to "
-"24 characters from the 64 character alphabet a thru z, A thru Z, 0 thru 9, "
-"\\. and /. Optionally it can start with a \"$\" character. This means the "
-"encrypted password was generated using another (not DES) algorithm. For "
-"example if it starts with \"$1$\" it means the MD5-based algorithm was used."
+"The maximum password age is the number of days after which the user will "
+"have to change her password."
 msgstr ""
-"Поле пароля должно быть заполнено. Шифрованный пароль имеет длину от 13 до "
-"24 символов и состоит из 64 символов алфавита от a до z, от A до Z, от 0 до "
-"9, \\. и /. Пароль может начинаться с символа \"$\". Это означает, что "
-"шифрованный пароль был сгенерирован с использованием другого (не DES) "
-"алгоритма. Например, если он начинается с \"$1$\", то это означает, что "
-"использовался алгоритм на основе MD5."
 
-#: shadow.5.xml:60(para)
+#: shadow.5.xml:141(para)
 msgid ""
-"Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry> for details on how this string is interpreted."
+"After this number of days is elapsed, the password may still be valid. The "
+"user should be asked to change her password the next time she will log in."
 msgstr ""
-"Подробней о пароле смотрите на странице руководства "
-"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
-"citerefentry>."
 
-#: shadow.5.xml:68(para)
+#: shadow.5.xml:146(para)
 msgid ""
-"If the password field contains some string that is not valid result of "
-"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
-"citerefentry>, for instance ! or *, the user will not be able to use a unix "
-"password to log in, subject to <citerefentry><refentrytitle>pam</"
-"refentrytitle><manvolnum>7</manvolnum></citerefentry>."
+"An empty field means that there are no maximum password age, no password "
+"warning period, and no password inactivity period (see below)."
 msgstr ""
-"Если поле пароля содержит строку, которая не удовлетворяет требованиям "
-"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
-"citerefentry>, например содержит ! или *, то пользователь не сможет "
-"использовать этот unix пароль для регистрации с учётом настроек "
-"<citerefentry><refentrytitle>pam</refentrytitle><manvolnum>7</manvolnum></"
-"citerefentry>."
 
-# type: Content of: <refentry><refsect1><para>
-#: shadow.5.xml:77(para)
+#: shadow.5.xml:151(para)
 msgid ""
-"The date of the last password change is given as the number of days since "
-"Jan 1, 1970. The password may not be changed again until the proper number "
-"of days have passed, and must be changed after the maximum number of days. "
-"If the minimum number of days required is greater than the maximum number of "
-"day allowed, this password may not be changed by the user."
+"If the maximum password age is lower than the minimum password age, the user "
+"cannot change her password."
 msgstr ""
-"Дата последнего изменения пароля задаётся в днях, прошедших с 1 января 1970 "
-"года. Пароль не может быть изменён пока не пройдёт положенное число дней, и "
-"должен быть изменён после максимального числа дней. Если обязательное "
-"минимальное число дней больше чем максимальное число дней, то такой пароль "
-"не может быть изменён пользователем."
 
-# type: Content of: <refentry><refsect1><para>
-#: shadow.5.xml:86(para)
+# type: Content of: <refentry><refsect1><refsect2><title>
+#: shadow.5.xml:159(emphasis)
+#, fuzzy
+#| msgid "Password Changes"
+msgid "password warning period"
+msgstr "Изменение пароля"
+
+# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: shadow.5.xml:162(para)
+#, fuzzy
+#| msgid ""
+#| "The number of days after a password has expired before the account will "
+#| "be disabled."
 msgid ""
-"An account is considered to be inactive and is disabled if the password is "
-"not changed within the specified number of days after the password expires. "
-"An account will also be disabled on the specified day regardless of other "
-"password expiration information."
+"The number of days before a password is going to expire (see the maximum "
+"password age above) during which the user should be warned."
 msgstr ""
-"Учётная запись считается неактивной и будет заблокирована, если пароль не "
-"был изменён за заданное число дней после устаревания пароля. Учётная запись "
-"также будет заблокирована в заданный день, независимо от другой информации "
-"об устаревании пароля."
+"Число дней, которые должны пройти после устаревания пароля, перед тем как "
+"учётная запись будет заблокирована."
 
-# type: Content of: <refentry><refsect1><para>
-#: shadow.5.xml:93(para)
+#: shadow.5.xml:167(para)
 msgid ""
-"This information supersedes any password or password age information present "
-"in <filename>/etc/passwd</filename>."
+"An empty field and value 0 mean that there are no password warning period."
 msgstr ""
-"Информация из этого файла заменяет любой пароль или информацию об "
-"устаревании, содержащуюся в файле <filename>/etc/passwd</filename>."
 
-# type: Content of: <refentry><refsect1><para>
-#: shadow.5.xml:98(para) gshadow.5.xml:54(para)
+#: shadow.5.xml:175(emphasis)
+msgid "password inactivity period"
+msgstr ""
+
+#: shadow.5.xml:178(para)
 msgid ""
-"This file must not be readable by regular users if password security is to "
-"be maintained."
+"The number of days after a password has expired (see the maximum password "
+"age above) during which the password should still be accepted (and the user "
+"should update her password during the next login)."
 msgstr ""
-"Этот файл должен быть недоступен обычному пользователю, если нужно "
-"обеспечить безопасность паролей."
 
-#: shadow.5.xml:124(para)
+#: shadow.5.xml:184(para)
 msgid ""
+"After expiration of the password and this expiration period is elapsed, no "
+"login is possible using the current user's password. The user should contact "
+"her administrator."
+msgstr ""
+
+#: shadow.5.xml:189(para)
+msgid ""
+"An empty field means that there are no enforcement of an inactivity period."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: shadow.5.xml:197(emphasis)
+#, fuzzy
+#| msgid "User account information."
+msgid "account expiration date"
+msgstr "содержит информацию о пользователях"
+
+#: shadow.5.xml:200(para)
+msgid ""
+"The date of expiration of the account, expressed as the number of days since "
+"Jan 1, 1970."
+msgstr ""
+
+#: shadow.5.xml:204(para)
+msgid ""
+"Note that an account expiration differs from a password expiration. In case "
+"of an acount expiration, the user shall not be allowed to login. In case of "
+"a password expiration, the user is not allowed to login using her password."
+msgstr ""
+
+#: shadow.5.xml:210(para)
+msgid "An empty field means that the account will never expire."
+msgstr ""
+
+#: shadow.5.xml:213(para)
+msgid ""
+"The value 0 should not be used as it is interpreted as either an account "
+"with no expiration, or as an expiration on Jan 1, 1970."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: shadow.5.xml:221(emphasis)
+#, fuzzy
+#| msgid "a reserved field"
+msgid "reserved field"
+msgstr "зарезервированное поле"
+
+# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: shadow.5.xml:223(para)
+#, fuzzy
+#| msgid "sp_flag - reserved for future use"
+msgid "This field is reserved for future use."
+msgstr "sp_flag - зарезервировано"
+
+#: shadow.5.xml:249(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>"
+msgid ""
 "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>pwconv</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>login</"
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>pwconv</"
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>"
 
 # type: Content of: <refentry><refmeta><refmiscinfo>
-#: shadow.3.xml:7(refmiscinfo)
+#: shadow.3.xml:36(refmiscinfo)
 msgid "Library Calls"
 msgstr "Библиотечные функции"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: shadow.3.xml:11(refname)
+#: shadow.3.xml:40(refname)
 msgid "getspnam"
 msgstr "getspnam"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.3.xml:12(refpurpose)
+#: shadow.3.xml:41(refpurpose)
 msgid "encrypted password file routines"
 msgstr "процедуры для работы с файлом шифрованных паролей"
 
 # type: Content of: <refentry><refsect1><title>
-#: shadow.3.xml:16(title)
+#: shadow.3.xml:45(title)
 msgid "SYNTAX"
 msgstr "СИНТАКСИС"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:18(emphasis)
+#: shadow.3.xml:47(emphasis)
 msgid "#include &lt;shadow.h&gt;"
 msgstr "#include &lt;shadow.h&gt;"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:22(emphasis)
+#: shadow.3.xml:51(emphasis)
 msgid "struct spwd *getspent();"
 msgstr "struct spwd *getspent();"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:26(emphasis)
+#: shadow.3.xml:55(emphasis)
 msgid "struct spwd *getspnam(char"
 msgstr "struct spwd *getspnam(char"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: shadow.3.xml:27(emphasis)
+#: shadow.3.xml:56(emphasis)
 msgid "*name"
 msgstr "*name"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: shadow.3.xml:27(emphasis) shadow.3.xml:40(emphasis)
-#: shadow.3.xml:45(emphasis) shadow.3.xml:51(emphasis)
+#: shadow.3.xml:56(emphasis) shadow.3.xml:69(emphasis)
+#: shadow.3.xml:74(emphasis) shadow.3.xml:80(emphasis)
 msgid ");"
 msgstr ");"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:31(emphasis)
+#: shadow.3.xml:60(emphasis)
 msgid "void setspent();"
 msgstr "void setspent();"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:35(emphasis)
+#: shadow.3.xml:64(emphasis)
 msgid "void endspent();"
 msgstr "void endspent();"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:39(emphasis)
+#: shadow.3.xml:68(emphasis)
 msgid "struct spwd *fgetspent(FILE"
 msgstr "struct spwd *fgetspent(FILE"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><emphasis>
-#: shadow.3.xml:40(emphasis) shadow.3.xml:51(emphasis)
+#: shadow.3.xml:69(emphasis) shadow.3.xml:80(emphasis)
 msgid "*fp"
 msgstr "*fp"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:44(emphasis)
+#: shadow.3.xml:73(emphasis)
 msgid "struct spwd *sgetspent(char"
 msgstr "struct spwd *sgetspent(char"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:45(emphasis)
+#: shadow.3.xml:74(emphasis)
 msgid "*cp"
 msgstr "*cp"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:49(emphasis)
+#: shadow.3.xml:78(emphasis)
 msgid "int putspent(struct spwd"
 msgstr "int putspent(struct spwd"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:50(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "*p,"
 msgstr "*p,"
 
 # type: Content of: <refentry><refsect1><title>
-#: shadow.3.xml:50(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "FILE"
 msgstr "ФАЙЛ"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:55(emphasis)
+#: shadow.3.xml:84(emphasis)
 msgid "int lckpwdf();"
 msgstr "int lckpwdf();"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: shadow.3.xml:59(emphasis)
+#: shadow.3.xml:88(emphasis)
 msgid "int ulckpwdf();"
 msgstr "int ulckpwdf();"
 
-#: shadow.3.xml:65(para)
+#: shadow.3.xml:94(para)
 msgid ""
 "<emphasis remap=\"I\">shadow</emphasis> manipulates the contents of the "
 "shadow password file, <filename>/etc/shadow</filename>. The structure in the "
@@ -3037,7 +3454,7 @@
 "\"I\">#include</emphasis>:"
 
 # type: Content of: <refentry><refsect1><programlisting>
-#: shadow.3.xml:70(programlisting)
+#: shadow.3.xml:99(programlisting)
 #, no-wrap
 msgid ""
 "struct spwd {\n"
@@ -3066,44 +3483,44 @@
 "}"
 
 # type: Content of: <refentry><refsect1><para>
-#: shadow.3.xml:82(para)
+#: shadow.3.xml:111(para)
 msgid "The meanings of each field are:"
 msgstr "Значение каждого поля:"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.3.xml:85(para)
+#: shadow.3.xml:114(para)
 msgid "sp_namp - pointer to null-terminated user name"
 msgstr ""
 "sp_namp - указатель на строку с именем пользователя, завершающуюся нулевым "
 "символом"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.3.xml:88(para)
+#: shadow.3.xml:117(para)
 msgid "sp_pwdp - pointer to null-terminated password"
 msgstr ""
 "sp_pwdp - указатель на строку с паролем, завершающуюся нулевым символом"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.3.xml:91(para)
+#: shadow.3.xml:120(para)
 msgid "sp_lstchg - days since Jan 1, 1970 password was last changed"
 msgstr ""
 "sp_lstchg - количество дней, когда был изменён пароль последний раз, начиная "
 "с 1 января 1970 года"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.3.xml:94(para)
+#: shadow.3.xml:123(para)
 msgid "sp_min - days before which password may not be changed"
 msgstr "sp_min - количество дней, когда можно не менять пароль"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.3.xml:97(para)
+#: shadow.3.xml:126(para)
 msgid "sp_max - days after which password must be changed"
 msgstr ""
 "sp_max - количество дней, которое должно пройти, чтобы нужно было поменять "
 "пароль"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.3.xml:100(para)
+#: shadow.3.xml:129(para)
 msgid ""
 "sp_warn - days before password is to expire that user is warned of pending "
 "password expiration"
@@ -3112,7 +3529,7 @@
 "устаревании пароля перед тем как пароль устареет"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.3.xml:105(para)
+#: shadow.3.xml:134(para)
 msgid ""
 "sp_inact - days after password expires that account is considered inactive "
 "and disabled"
@@ -3121,18 +3538,18 @@
 "когда начинать считать, что учётная запись неактивна и заблокирована"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.3.xml:110(para)
+#: shadow.3.xml:139(para)
 msgid "sp_expire - days since Jan 1, 1970 when account will be disabled"
 msgstr ""
 "sp_expire - дней, после которых учётная запись будет заблокирована, начиная "
 "с 1 января 1970 года"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: shadow.3.xml:113(para)
+#: shadow.3.xml:142(para)
 msgid "sp_flag - reserved for future use"
 msgstr "sp_flag - зарезервировано"
 
-#: shadow.3.xml:121(para)
+#: shadow.3.xml:150(para)
 msgid ""
 "<emphasis>getspent</emphasis>, <emphasis>getspname</emphasis>, "
 "<emphasis>fgetspent</emphasis>, and <emphasis>sgetspent</emphasis> each "
@@ -3155,7 +3572,7 @@
 "начиная с текущей позиции в файле запись по имени <emphasis>name</emphasis>."
 
 # type: Content of: <refentry><refsect1><para>
-#: shadow.3.xml:134(para)
+#: shadow.3.xml:163(para)
 msgid ""
 "<emphasis>setspent</emphasis> and <emphasis>endspent</emphasis> may be used "
 "to begin and end, respectively, access to the shadow password file."
@@ -3164,7 +3581,7 @@
 "использовать для перемещения в начало и конец файла теневых паролей "
 "соответственно."
 
-#: shadow.3.xml:140(para)
+#: shadow.3.xml:169(para)
 msgid ""
 "The <emphasis>lckpwdf</emphasis> and <emphasis>ulckpwdf</emphasis> routines "
 "should be used to insure exclusive access to the <filename>/etc/shadow</"
@@ -3186,7 +3603,7 @@
 "успешно возвращается 0."
 
 # type: Content of: <refentry><refsect1><para>
-#: shadow.3.xml:155(para)
+#: shadow.3.xml:184(para)
 msgid ""
 "Routines return NULL if no more entries are available or if an error occurs "
 "during processing. Routines which have <emphasis>int</emphasis> as the "
@@ -3197,7 +3614,7 @@
 "при успешном выполнении и -1 в случае неудачи."
 
 # type: Content of: <refentry><refsect1><para>
-#: shadow.3.xml:165(para)
+#: shadow.3.xml:194(para)
 msgid ""
 "These routines may only be used by the superuser as access to the shadow "
 "password file is restricted."
@@ -3205,7 +3622,7 @@
 "Данные функции могут использоваться только суперпользователем, так как "
 "доступ к файлу теневых паролей ограничен."
 
-#: shadow.3.xml:185(para)
+#: shadow.3.xml:214(para)
 msgid ""
 "<citerefentry><refentrytitle>getpwent</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -3216,34 +3633,34 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><command>
-#: pwconv.8.xml:12(refentrytitle) pwconv.8.xml:17(refname)
-#: pwconv.8.xml:26(command) login.defs.5.xml:356(term)
+#: pwconv.8.xml:42(refentrytitle) pwconv.8.xml:47(refname)
+#: pwconv.8.xml:56(command) login.defs.5.xml:388(term)
 msgid "pwconv"
 msgstr "pwconv"
 
 # type: Content of: <refentry><refsect1><para><command>
-#: pwconv.8.xml:18(refname) pwconv.8.xml:29(command)
+#: pwconv.8.xml:48(refname) pwconv.8.xml:59(command)
 msgid "pwunconv"
 msgstr "pwunconv"
 
 # type: Content of: <refentry><refsect1><para><command>
-#: pwconv.8.xml:19(refname) pwconv.8.xml:32(command)
-#: login.defs.5.xml:270(term)
+#: pwconv.8.xml:49(refname) pwconv.8.xml:62(command)
+#: login.defs.5.xml:302(term)
 msgid "grpconv"
 msgstr "grpconv"
 
 # type: Content of: <refentry><refsect1><para><command>
-#: pwconv.8.xml:20(refname) pwconv.8.xml:35(command)
-#: login.defs.5.xml:276(term)
+#: pwconv.8.xml:50(refname) pwconv.8.xml:65(command)
+#: login.defs.5.xml:308(term)
 msgid "grpunconv"
 msgstr "grpunconv"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: pwconv.8.xml:21(refpurpose)
+#: pwconv.8.xml:51(refpurpose)
 msgid "convert to and from shadow passwords and groups"
 msgstr "преобразует пароли пользователей и групп в/из защищённую форму"
 
-#: pwconv.8.xml:41(para)
+#: pwconv.8.xml:71(para)
 msgid ""
 "The <command>pwconv</command> command creates <emphasis remap=\"I\">shadow</"
 "emphasis> from <emphasis remap=\"I\">passwd</emphasis> and an optionally "
@@ -3253,7 +3670,7 @@
 "emphasis> из файла <emphasis remap=\"I\">passwd</emphasis> и необязательно "
 "существующего файла <emphasis remap=\"I\">shadow</emphasis>."
 
-#: pwconv.8.xml:47(para)
+#: pwconv.8.xml:77(para)
 msgid ""
 "The <command>pwunconv</command> command creates <emphasis remap=\"I"
 "\">passwd</emphasis> from <emphasis remap=\"I\">passwd</emphasis> and "
@@ -3265,7 +3682,7 @@
 "<emphasis remap=\"I\">shadow</emphasis>, а затем удаляет файл <emphasis "
 "remap=\"I\">shadow</emphasis>."
 
-#: pwconv.8.xml:54(para)
+#: pwconv.8.xml:84(para)
 msgid ""
 "The <command>grpconv</command> command creates <emphasis remap=\"I"
 "\">gshadow</emphasis> from <emphasis remap=\"I\">group</emphasis> and an "
@@ -3275,7 +3692,7 @@
 "\">gshadow</emphasis> из файла <emphasis remap=\"I\">group</emphasis> и "
 "необязательно существующего файла <emphasis remap=\"I\">gshadow</emphasis>."
 
-#: pwconv.8.xml:60(para)
+#: pwconv.8.xml:90(para)
 msgid ""
 "The <command>grpunconv</command> command creates <emphasis remap=\"I"
 "\">group</emphasis> from <emphasis remap=\"I\">group</emphasis> and "
@@ -3287,7 +3704,7 @@
 "<emphasis remap=\"I\">gshadow</emphasis>, а затем удаляет файл <emphasis "
 "remap=\"I\">gshadow</emphasis>."
 
-#: pwconv.8.xml:67(para)
+#: pwconv.8.xml:97(para)
 msgid ""
 "These four programs all operate on the normal and shadow password and group "
 "files: <filename>/etc/passwd</filename>, <filename>/etc/group</filename>, "
@@ -3299,7 +3716,7 @@
 "filename>."
 
 # type: Content of: <refentry><refsect1><para>
-#: pwconv.8.xml:74(para)
+#: pwconv.8.xml:104(para)
 msgid ""
 "Each program acquires the necessary locks before conversion. "
 "<command>pwconv</command> and <command>grpconv</command> are similar. First, "
@@ -3320,7 +3737,7 @@
 "так и для обновления теневого файла, если главный файл редактировался "
 "вручную."
 
-#: pwconv.8.xml:85(para)
+#: pwconv.8.xml:115(para)
 msgid ""
 "<command>pwconv</command> will use the values of <emphasis remap=\"I"
 "\">PASS_MIN_DAYS</emphasis>, <emphasis remap=\"I\">PASS_MAX_DAYS</emphasis>, "
@@ -3334,7 +3751,7 @@
 "<filename>/etc/shadow</filename>."
 
 # type: Content of: <refentry><refsect1><para>
-#: pwconv.8.xml:94(para)
+#: pwconv.8.xml:124(para)
 msgid ""
 "Likewise <command>pwunconv</command> and <command>grpunconv</command> are "
 "similar. Passwords in the main file are updated from the shadowed file. "
@@ -3351,7 +3768,7 @@
 "<command>pwunconv</command>. Конвертируется только возможное."
 
 # type: Content of: <refentry><refsect1><para>
-#: pwconv.8.xml:106(para)
+#: pwconv.8.xml:136(para)
 msgid ""
 "Errors in the password or group files (such as invalid or duplicate entries) "
 "may cause these programs to loop forever or fail in other strange ways. "
@@ -3363,20 +3780,20 @@
 "Перед конвертацией запустите <command>pwck</command> и <command>grpck</"
 "command>, чтобы исправить возможные ошибки."
 
-#: pwconv.8.xml:117(para)
+#: pwconv.8.xml:147(para)
 msgid ""
 "The following configuration variable in <filename>/etc/login.defs</filename> "
 "changes the behavior of <command>grpconv</command> and <command>grpunconv</"
 "command>:"
 msgstr ""
 
-#: pwconv.8.xml:125(para)
+#: pwconv.8.xml:155(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of <command>pwconv</command>:"
 msgstr ""
 
-#: pwconv.8.xml:151(para)
+#: pwconv.8.xml:181(para)
 msgid ""
 "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -3391,43 +3808,43 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: pwck.8.xml:11(refentrytitle) pwck.8.xml:16(refname) pwck.8.xml:22(command)
-#: pwck.8.xml:37(command) login.defs.5.xml:348(term)
+#: pwck.8.xml:40(refentrytitle) pwck.8.xml:45(refname) pwck.8.xml:51(command)
+#: pwck.8.xml:66(command) login.defs.5.xml:380(term)
 msgid "pwck"
 msgstr "pwck"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: pwck.8.xml:17(refpurpose)
+#: pwck.8.xml:46(refpurpose)
 msgid "verify integrity of password files"
 msgstr "проверяет целостность файлов паролей"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: pwck.8.xml:23(arg) pwck.8.xml:38(arg) pwck.8.xml:111(option)
+#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:140(option)
 msgid "-q"
 msgstr "-q"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: pwck.8.xml:24(arg) pwck.8.xml:132(option) grpck.8.xml:29(arg)
-#: grpck.8.xml:101(option)
+#: pwck.8.xml:53(arg) pwck.8.xml:161(option) grpck.8.xml:58(arg)
+#: grpck.8.xml:130(option)
 msgid "-s"
 msgstr "-s"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: pwck.8.xml:27(replaceable) pwck.8.xml:42(replaceable)
-#: passwd.5.xml:5(refentrytitle) passwd.5.xml:10(refname)
-#: passwd.1.xml:15(refentrytitle) passwd.1.xml:20(refname)
-#: passwd.1.xml:26(command) login.defs.5.xml:337(term)
+#: pwck.8.xml:56(replaceable) pwck.8.xml:71(replaceable)
+#: passwd.5.xml:34(refentrytitle) passwd.5.xml:39(refname)
+#: passwd.1.xml:44(refentrytitle) passwd.1.xml:49(refname)
+#: passwd.1.xml:55(command) login.defs.5.xml:369(term)
 msgid "passwd"
 msgstr "passwd"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: pwck.8.xml:39(arg) pwck.8.xml:122(option) login.1.xml:186(option)
-#: grpck.8.xml:20(arg) grpck.8.xml:91(option) gpasswd.1.xml:120(option)
+#: pwck.8.xml:68(arg) pwck.8.xml:151(option) login.1.xml:222(option)
+#: grpck.8.xml:49(arg) grpck.8.xml:120(option)
 msgid "-r"
 msgstr "-r"
 
 # type: Content of: <refentry><refsect1><para>
-#: pwck.8.xml:53(para)
+#: pwck.8.xml:82(para)
 msgid ""
 "The <command>pwck</command> command verifies the integrity of the system "
 "authentication information. All entries in the <filename>/etc/passwd</"
@@ -3444,42 +3861,42 @@
 "которых невозможно."
 
 # type: Content of: <refentry><refsect1><para>
-#: pwck.8.xml:62(para) grpck.8.xml:51(para)
+#: pwck.8.xml:91(para) grpck.8.xml:80(para)
 msgid "Checks are made to verify that each entry has:"
 msgstr "Выполняются следующие проверки:"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:65(para) grpck.8.xml:55(para)
+#: pwck.8.xml:94(para) grpck.8.xml:84(para)
 msgid "the correct number of fields"
 msgstr "правильное количество полей"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:68(para)
+#: pwck.8.xml:97(para)
 msgid "a unique user name"
 msgstr "уникальность имени пользователя"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:71(para)
+#: pwck.8.xml:100(para)
 msgid "a valid user and group identifier"
 msgstr "допустимость идентификатора пользователя и группы"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:74(para)
+#: pwck.8.xml:103(para)
 msgid "a valid primary group"
 msgstr "допустимость первичной группы"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:77(para)
+#: pwck.8.xml:106(para)
 msgid "a valid home directory"
 msgstr "допустимость домашнего каталога"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: pwck.8.xml:80(para)
+#: pwck.8.xml:109(para)
 msgid "a valid login shell"
 msgstr "допустимость регистрационной оболочки"
 
 # type: Content of: <refentry><refsect1><para>
-#: pwck.8.xml:84(para)
+#: pwck.8.xml:113(para)
 msgid ""
 "The checks for correct number of fields and unique user name are fatal. If "
 "the entry has the wrong number of fields, the user will be prompted to "
@@ -3498,7 +3915,7 @@
 "пользователю предлагается запустить команду <command>usermod</command>, "
 "чтобы исправить ошибку."
 
-#: pwck.8.xml:95(para)
+#: pwck.8.xml:124(para)
 msgid ""
 "The commands which operate on the <filename>/etc/passwd</filename> file are "
 "not able to alter corrupted or duplicated entries. <command>pwck</command> "
@@ -3509,12 +3926,12 @@
 "нужно использовать <command>pwck</command> для удаления испорченной записи."
 
 # type: Content of: <refentry><refsect1><para>
-#: pwck.8.xml:105(para)
+#: pwck.8.xml:134(para)
 msgid "The options which apply to the <command>pwck</command> command are:"
 msgstr "Параметры команды <command>pwck</command>:"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: pwck.8.xml:114(para)
+#: pwck.8.xml:143(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
@@ -3522,11 +3939,11 @@
 "Сообщать только об ошибках. Предупреждения, которые не требуют от "
 "пользователя никаких действий, показаны не будут."
 
-#: pwck.8.xml:125(para)
+#: pwck.8.xml:154(para)
 msgid "Execute the <command>pwck</command> command in read-only mode."
 msgstr "Выполнять команду <command>pwck</command> в режиме \"только чтение\"."
 
-#: pwck.8.xml:135(para)
+#: pwck.8.xml:164(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
@@ -3534,7 +3951,7 @@
 "Отсортировать все записи в файлах <filename>/etc/passwd</filename> и "
 "<filename>/etc/shadow</filename> по числовому идентификатору пользователя."
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:172(para)
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename>. The user may select "
@@ -3546,44 +3963,65 @@
 "указать другие файлы с помощью параметров <emphasis remap=\"I\">passwd</"
 "emphasis> и <emphasis remap=\"I\">shadow</emphasis>"
 
-#: pwck.8.xml:192(para)
+#: pwck.8.xml:221(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>group</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"citerefentry>, <citerefentry><refentrytitle>grpck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>usermod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>usermod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: pwck.8.xml:227(para)
+#: pwck.8.xml:260(para)
 msgid "one or more bad password entries"
 msgstr "есть одна или более записей с недопустимыми паролями"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: pwck.8.xml:233(para)
+#: pwck.8.xml:266(para)
 msgid "can't open password files"
 msgstr "не удалось открыть файл паролей"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: pwck.8.xml:239(para)
+#: pwck.8.xml:272(para)
 msgid "can't lock password files"
 msgstr "не удалось заблокировать файл паролей"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: pwck.8.xml:245(para)
+#: pwck.8.xml:278(para)
 msgid "can't update password files"
 msgstr "не удалось изменить файл паролей"
 
+# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: pwck.8.xml:284(para)
+#, fuzzy
+#| msgid "can't open password files"
+msgid "can't sort password files"
+msgstr "не удалось открыть файл паролей"
+
 # type: Content of: <refentry><refsect1><para>
-#: pwck.8.xml:209(para)
+#: pwck.8.xml:242(para)
 msgid ""
 "The <command>pwck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -3592,17 +4030,17 @@
 "значения: <placeholder-1/>"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: porttime.5.xml:5(refentrytitle) porttime.5.xml:10(refname)
+#: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
 msgid "porttime"
 msgstr "porttime"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: porttime.5.xml:11(refpurpose)
+#: porttime.5.xml:40(refpurpose)
 msgid "port access time file"
 msgstr "файл с временами доступа к портам"
 
 # type: Content of: <refentry><refsect1><para>
-#: porttime.5.xml:16(para)
+#: porttime.5.xml:45(para)
 msgid ""
 "<emphasis remap=\"I\">porttime</emphasis> contains a list of tty devices, "
 "user names, and permitted login times."
@@ -3611,7 +4049,7 @@
 "tty, имена пользователей и разрешённое время входа."
 
 # type: Content of: <refentry><refsect1><para>
-#: porttime.5.xml:21(para)
+#: porttime.5.xml:50(para)
 msgid ""
 "Each entry consists of three colon separated fields. The first field is a "
 "comma separated list of tty devices, or an asterisk to indicate that all tty "
@@ -3628,7 +4066,7 @@
 "под правило этой записи. В третьем поле содержится список (через запятую) "
 "допустимого времени работы."
 
-#: porttime.5.xml:30(para)
+#: porttime.5.xml:59(para)
 msgid ""
 "Each access time entry consists of zero or more days of the week, "
 "abbreviated <emphasis>Su</emphasis>, <emphasis>Mo</emphasis>, <emphasis>Tu</"
@@ -3648,11 +4086,11 @@
 "предполагается <emphasis>Al</emphasis> в качестве значения по умолчанию."
 
 # type: Content of: <refentry><refsect1><title>
-#: porttime.5.xml:44(title)
+#: porttime.5.xml:73(title)
 msgid "EXAMPLES"
 msgstr "ПРИМЕРЫ"
 
-#: porttime.5.xml:45(para)
+#: porttime.5.xml:74(para)
 msgid ""
 "The following entry allows access to user <emphasis remap=\"B\">jfh</"
 "emphasis> on every port during weekdays from 9am to 5pm."
@@ -3661,11 +4099,11 @@
 "emphasis> с любого порта по будням с 9:00 до 17:00."
 
 # type: Content of: <refentry><refsect1><para>
-#: porttime.5.xml:51(para)
+#: porttime.5.xml:80(para)
 msgid "*:jfh:Wk0900-1700"
 msgstr "*:jfh:Wk0900-1700"
 
-#: porttime.5.xml:53(para)
+#: porttime.5.xml:82(para)
 msgid ""
 "The following entries allow access only to the users <emphasis>root</"
 "emphasis> and <emphasis>oper</emphasis> on <filename>/dev/console</filename> "
@@ -3681,7 +4119,7 @@
 "в любое время."
 
 # type: Content of: <refentry><refsect1><programlisting>
-#: porttime.5.xml:62(programlisting)
+#: porttime.5.xml:91(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3694,7 +4132,7 @@
 "      console:*:\n"
 "    "
 
-#: porttime.5.xml:67(para)
+#: porttime.5.xml:96(para)
 msgid ""
 "The following entry allows access for the user <emphasis>games</emphasis> on "
 "any port during non-working hours."
@@ -3703,23 +4141,23 @@
 "любого порта в нерабочие часы."
 
 # type: Content of: <refentry><refsect1><para>
-#: porttime.5.xml:72(para)
+#: porttime.5.xml:101(para)
 msgid "*:games:Wk1700-0900,SaSu0000-2400"
 msgstr "*:games:Wk1700-0900,SaSu0000-2400"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: porttime.5.xml:79(filename) logoutd.8.xml:38(filename)
+#: porttime.5.xml:108(filename) logoutd.8.xml:67(filename)
 msgid "/etc/porttime"
 msgstr "/etc/porttime"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: porttime.5.xml:81(para) logoutd.8.xml:40(para)
+#: porttime.5.xml:110(para) logoutd.8.xml:69(para)
 msgid "File containing port access."
 msgstr ""
 "содержит разрешённое время работы определённых пользователей с определённых "
 "портов"
 
-#: porttime.5.xml:89(para) login.access.5.xml:79(para)
+#: porttime.5.xml:118(para) login.access.5.xml:109(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -3728,12 +4166,12 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: passwd.5.xml:11(refpurpose)
+#: passwd.5.xml:40(refpurpose)
 msgid "the password file"
 msgstr "файл паролей"
 
 # type: Content of: <refentry><refsect1><para>
-#: passwd.5.xml:16(para)
+#: passwd.5.xml:45(para)
 msgid ""
 "<filename>/etc/passwd</filename> contains one line for each user account, "
 "with seven fields delimited by colons (<quote>:</quote>). These fields are:"
@@ -3743,36 +4181,36 @@
 "двоеточиями (<quote>:</quote>). Поля:"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: passwd.5.xml:27(para)
+#: passwd.5.xml:56(para)
 msgid "optional encrypted password"
 msgstr "необязательный зашифрованный пароль"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: passwd.5.xml:30(para)
+#: passwd.5.xml:59(para)
 msgid "numerical user ID"
 msgstr "числовой идентификатор пользователя"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: passwd.5.xml:33(para)
+#: passwd.5.xml:62(para)
 msgid "numerical group ID"
 msgstr "числовой идентификатор группы"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: passwd.5.xml:36(para)
+#: passwd.5.xml:65(para)
 msgid "user name or comment field"
 msgstr "ФИО пользователя или поле комментария"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: passwd.5.xml:39(para)
+#: passwd.5.xml:68(para)
 msgid "user home directory"
 msgstr "домашний каталог пользователя"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: passwd.5.xml:42(para)
+#: passwd.5.xml:71(para)
 msgid "optional user command interpreter"
 msgstr "необязательный интерпретатор командной строки пользователя"
 
-#: passwd.5.xml:46(para)
+#: passwd.5.xml:75(para)
 msgid ""
 "The encrypted password field may be blank, in which case no password is "
 "required to authenticate as the specified login name. However, some "
@@ -3803,7 +4241,7 @@
 "определено в <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry>."
 
-#: passwd.5.xml:65(para)
+#: passwd.5.xml:94(para)
 msgid ""
 "The comment field is used by various system utilities, such as "
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
@@ -3813,7 +4251,7 @@
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: passwd.5.xml:71(para)
+#: passwd.5.xml:100(para)
 msgid ""
 "The home directory field provides the name of the initial working directory. "
 "The <command>login</command> program uses this information to set the value "
@@ -3823,7 +4261,7 @@
 "<command>login</command> использует эту информацию для установки значения "
 "переменной среды <envar>$HOME</envar>."
 
-#: passwd.5.xml:77(para)
+#: passwd.5.xml:106(para)
 msgid ""
 "The command interpreter field provides the name of the user's command "
 "language interpreter, or the name of the initial program to execute. The "
@@ -3838,57 +4276,86 @@
 "используется значение по умолчанию <filename>/bin/sh</filename>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.5.xml:98(para)
+#: passwd.5.xml:127(para)
 msgid "optional encrypted password file"
 msgstr "необязательный файл с шифрованными паролями"
 
-#: passwd.5.xml:106(para)
+#: passwd.5.xml:135(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
+#| "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>login</"
+"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>getent</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
-"refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"citerefentry>, <citerefentry><refentrytitle>pwck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>pwconv</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>pwunconv</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>login</"
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
+"citerefentry>, <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwconv</refentrytitle><manvolnum>8</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>pwunconv</"
+"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
+"<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: passwd.1.xml:21(refpurpose)
+#: passwd.1.xml:50(refpurpose)
 msgid "change user password"
 msgstr "изменяет пароль пользователя"
 
 # type: Content of: <refentry><refsect1><para>
-#: passwd.1.xml:38(para)
+#: passwd.1.xml:67(para)
+#, fuzzy
+#| msgid ""
+#| "The <command>passwd</command> command changes passwords for user "
+#| "accounts. A normal user may only change the password for his/her own "
+#| "account, while the superuser may change the password for any account. "
+#| "<command>passwd</command> also changes account information, such as the "
+#| "full name of the user, the user's login shell, or his/her password expiry "
+#| "date and interval."
 msgid ""
 "The <command>passwd</command> command changes passwords for user accounts. A "
 "normal user may only change the password for his/her own account, while the "
 "superuser may change the password for any account. <command>passwd</command> "
-"also changes account information, such as the full name of the user, the "
-"user's login shell, or his/her password expiry date and interval."
+"also changes the account or associated password validity period."
 msgstr ""
 "Программа <command>passwd</command> изменяет пароли пользовательских учётных "
 "записей. Обычный пользователь может изменить пароль только своей учётной "
@@ -3898,12 +4365,12 @@
 "или дату устаревания пароля и интервал."
 
 # type: Content of: <refentry><refsect1><refsect2><title>
-#: passwd.1.xml:48(title)
+#: passwd.1.xml:76(title)
 msgid "Password Changes"
 msgstr "Изменение пароля"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: passwd.1.xml:49(para)
+#: passwd.1.xml:77(para)
 msgid ""
 "The user is first prompted for his/her old password, if one is present. This "
 "password is then encrypted and compared against the stored password. The "
@@ -3916,7 +4383,7 @@
 "пропускается, для того чтобы можно было изменить забытый пароль."
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: passwd.1.xml:57(para)
+#: passwd.1.xml:85(para)
 msgid ""
 "After the password has been entered, password aging information is checked "
 "to see if the user is permitted to change the password at this time. If not, "
@@ -3928,7 +4395,7 @@
 "завершает работу."
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: passwd.1.xml:64(para)
+#: passwd.1.xml:92(para)
 msgid ""
 "The user is then prompted twice for a replacement password. The second entry "
 "is compared against the first and both are required to match in order for "
@@ -3939,7 +4406,7 @@
 "совпасть."
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: passwd.1.xml:70(para)
+#: passwd.1.xml:98(para)
 msgid ""
 "Then, the password is tested for complexity. As a general guideline, "
 "passwords should consist of 6 to 8 characters including one or more "
@@ -3950,22 +4417,22 @@
 "символов каждого типа:"
 
 # type: Content of: <refentry><refsect1><refsect2><itemizedlist><listitem><para>
-#: passwd.1.xml:78(para)
+#: passwd.1.xml:106(para)
 msgid "lower case alphabetics"
 msgstr "строчные буквы"
 
 # type: Content of: <refentry><refsect1><refsect2><itemizedlist><listitem><para>
-#: passwd.1.xml:81(para)
+#: passwd.1.xml:109(para)
 msgid "digits 0 thru 9"
 msgstr "цифры от 0 до 9"
 
 # type: Content of: <refentry><refsect1><refsect2><itemizedlist><listitem><para>
-#: passwd.1.xml:84(para)
+#: passwd.1.xml:112(para)
 msgid "punctuation marks"
 msgstr "знаки пунктуации"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: passwd.1.xml:88(para)
+#: passwd.1.xml:116(para)
 msgid ""
 "Care must be taken not to include the system default erase or kill "
 "characters. <command>passwd</command> will reject any password which is not "
@@ -3976,12 +4443,12 @@
 "сложности."
 
 # type: Content of: <refentry><refsect1><refsect2><title>
-#: passwd.1.xml:97(title)
+#: passwd.1.xml:125(title)
 msgid "Hints for user passwords"
 msgstr "Выбор пароля"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: passwd.1.xml:98(para)
+#: passwd.1.xml:126(para)
 msgid ""
 "The security of a password depends upon the strength of the encryption "
 "algorithm and the size of the key space. The <emphasis>UNIX</emphasis> "
@@ -3995,7 +4462,7 @@
 "зависит от степени произвольности выбранного пароля."
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: passwd.1.xml:106(para)
+#: passwd.1.xml:134(para)
 msgid ""
 "Compromises in password security normally result from careless password "
 "selection or handling. For this reason, you should not select a password "
@@ -4010,22 +4477,22 @@
 "лицензии, днём рождения и домашним адресом. Обо всём этом легко догадаться, "
 "что приведёт к нарушению безопасности системы."
 
-#: passwd.1.xml:115(para)
+#: passwd.1.xml:143(para)
 msgid ""
 "You can find advices on how to choose a strong password on http://en."
 "wikipedia.org/wiki/Password_strength"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: passwd.1.xml:124(para)
+#: passwd.1.xml:152(para)
 msgid "The options which apply to the <command>passwd</command> command are:"
 msgstr "Параметры команды <command>passwd</command>:"
 
-#: passwd.1.xml:129(term) faillog.8.xml:42(term)
+#: passwd.1.xml:157(term) faillog.8.xml:71(term)
 msgid "<option>-a</option>, <option>--all</option>"
 msgstr "<option>-a</option>, <option>--all</option>"
 
-#: passwd.1.xml:133(para)
+#: passwd.1.xml:161(para)
 msgid ""
 "This option can be used only with <option>-S</option> and causes show status "
 "for all users."
@@ -4033,12 +4500,12 @@
 "Этот параметр можно использовать только вместе с <option>-S</option> для "
 "вывода статуса всех пользователей."
 
-#: passwd.1.xml:140(term)
+#: passwd.1.xml:168(term)
 msgid "<option>-d</option>, <option>--delete</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:144(para)
+#: passwd.1.xml:172(para)
 msgid ""
 "Delete a user's password (make it empty). This is a quick way to disable a "
 "password for an account. It will set the named account passwordless."
@@ -4047,12 +4514,12 @@
 "заблокировать пароль учётной записи. Это делает указанную учётную запись "
 "беспарольной."
 
-#: passwd.1.xml:152(term)
+#: passwd.1.xml:180(term)
 msgid "<option>-e</option>, <option>--expire</option>"
 msgstr "<option>-e</option>, <option>--expire</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:156(para)
+#: passwd.1.xml:184(para)
 msgid ""
 "Immediately expire an account's password. This in effect can force a user to "
 "change his/her password at the user's next login."
@@ -4060,7 +4527,7 @@
 "Немедленно сделать пароль устаревшим. В результате это заставит пользователя "
 "изменить пароль при следующем входе в систему."
 
-#: passwd.1.xml:169(term)
+#: passwd.1.xml:197(term)
 msgid ""
 "<option>-i</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -4069,7 +4536,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:173(para)
+#: passwd.1.xml:201(para)
 msgid ""
 "This option is used to disable an account after the password has been "
 "expired for a number of days. After a user account has had an expired "
@@ -4081,12 +4548,12 @@
 "и прошло более указанных <replaceable>ДНЕЙ</replaceable>, то пользователь "
 "больше не сможет использовать данную учётную запись."
 
-#: passwd.1.xml:182(term)
+#: passwd.1.xml:210(term)
 msgid "<option>-k</option>, <option>--keep-tokens</option>"
 msgstr "<option>-k</option>, <option>--keep-tokens</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:186(para)
+#: passwd.1.xml:214(para)
 msgid ""
 "Indicate password change should be performed only for expired authentication "
 "tokens (passwords). The user wishes to keep their non-expired tokens as "
@@ -4096,24 +4563,36 @@
 "аутентификации (паролей). Пользователи хотят оставить свои непросроченные "
 "ключи нетронутыми."
 
-#: passwd.1.xml:194(term)
+#: passwd.1.xml:222(term)
 msgid "<option>-l</option>, <option>--lock</option>"
 msgstr "<option>-l</option>, <option>--lock</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:198(para)
+#: passwd.1.xml:226(para)
 #, fuzzy
 msgid ""
-"Lock the named account. This option disables an account by changing the "
-"password to a value which matches no possible encrypted value, and by "
-"setting the account expiry field to 1."
+"Lock the password of the named account. This option disables a password by "
+"changing it to a value which matches no possible encrypted value (it adds a "
+"´!´ at the beginning of the password)."
 msgstr ""
 "Заблокировать указанную учётную запись. Этот параметр блокирует учётную "
 "запись изменяя значение пароля на вариант, который не может быть шифрованным "
 "паролем."
 
-#: passwd.1.xml:206(term) chage.1.xml:109(term)
+#: passwd.1.xml:232(para)
 msgid ""
+"Note that this does not disable the account. The user may still be able to "
+"login using another authentication token (e.g. an SSH key). To disable the "
+"account, administrators should use <command>usermod --expiredate 1</command> "
+"(this set the account's expire date to Jan 2, 1970)."
+msgstr ""
+
+#: passwd.1.xml:239(para)
+msgid "Users with a locked password are not allowed to change their password."
+msgstr ""
+
+#: passwd.1.xml:246(term) chage.1.xml:138(term)
+msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
 msgstr ""
@@ -4121,7 +4600,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:210(para) chage.1.xml:113(para)
+#: passwd.1.xml:250(para) chage.1.xml:142(para)
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
@@ -4131,7 +4610,7 @@
 "пароля. Нулевое значение этого поля указывает на то, что пользователь может "
 "менять свой пароль когда захочет."
 
-#: passwd.1.xml:228(term)
+#: passwd.1.xml:268(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
@@ -4139,23 +4618,33 @@
 "<option>-r</option>, <option>--repository</option><replaceable>РЕПОЗИТОРИЙ</"
 "replaceable>"
 
-#: passwd.1.xml:232(para)
+#: passwd.1.xml:272(para)
 msgid "change password in <replaceable>REPOSITORY</replaceable> repository"
 msgstr "Изменить пароль в <replaceable>РЕПОЗИТОРИИ</replaceable>."
 
-#: passwd.1.xml:238(term)
+#: passwd.1.xml:278(term)
 msgid "<option>-S</option>, <option>--status</option>"
 msgstr "<option>-S</option>, <option>--status</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:242(para)
+#: passwd.1.xml:282(para)
+#, fuzzy
+#| msgid ""
+#| "Display account status information. The status information consists of 7 "
+#| "fields. The first field is the user's login name. The second field "
+#| "indicates if the user account is locked (L), has no password (NP), or has "
+#| "a usable password (P). The third field gives the date of the last "
+#| "password change. The next four fields are the minimum age, maximum age, "
+#| "warning period, and inactivity period for the password. These ages are "
+#| "expressed in days."
 msgid ""
 "Display account status information. The status information consists of 7 "
 "fields. The first field is the user's login name. The second field indicates "
-"if the user account is locked (L), has no password (NP), or has a usable "
-"password (P). The third field gives the date of the last password change. "
-"The next four fields are the minimum age, maximum age, warning period, and "
-"inactivity period for the password. These ages are expressed in days."
+"if the user account has a locked password (L), has no password (NP), or has "
+"a usable password (P). The third field gives the date of the last password "
+"change. The next four fields are the minimum age, maximum age, warning "
+"period, and inactivity period for the password. These ages are expressed in "
+"days."
 msgstr ""
 "Показать состояние учётной записи. Информация о состоянии содержит 7 полей. "
 "Первое поле содержит имя учётной записи. Второе поле указывает, "
@@ -4165,23 +4654,24 @@
 "выдачи предупреждения и период неактивности пароля. Эти сроки измеряются в "
 "днях."
 
-#: passwd.1.xml:255(term)
+#: passwd.1.xml:296(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
 msgstr "<option>-u</option>, <option>--unlock</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:259(para)
+#: passwd.1.xml:300(para)
 #, fuzzy
 msgid ""
-"Unlock the named account. This option re-enables an account by changing the "
-"password back to its previous value (to value before using <option>-l</"
-"option> option), and by resetting the account expiry field."
+"Unlock the password of the named account. This option re-enables a password "
+"by changing the password back to its previous value (to the value before "
+"using the <option>-l</option> option), and by resetting the account expiry "
+"field."
 msgstr ""
 "Разблокировать указанную учётную запись. Этот параметр активирует учётную "
 "запись изменяя пароль на прежнее значение (которое было перед использованием "
 "параметра <option>-l</option>)."
 
-#: passwd.1.xml:268(term)
+#: passwd.1.xml:310(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -4190,7 +4680,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:272(para)
+#: passwd.1.xml:314(para)
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
@@ -4202,7 +4692,7 @@
 "дней перед тем как пароль устареет, в течении которых пользователю будут "
 "напоминать, что пароль скоро устареет."
 
-#: passwd.1.xml:281(term)
+#: passwd.1.xml:323(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -4211,7 +4701,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:285(para)
+#: passwd.1.xml:327(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
@@ -4220,7 +4710,7 @@
 "рабочим. После <replaceable>МАКС_ДНЕЙ</replaceable> пароль нужно изменить."
 
 # type: Content of: <refentry><refsect1><para>
-#: passwd.1.xml:297(para)
+#: passwd.1.xml:339(para)
 msgid ""
 "Not all options may be supported. Password complexity checking may vary from "
 "site to site. The user is urged to select a password as complex as he or she "
@@ -4232,68 +4722,68 @@
 "сложности, чтобы ему нормально работалось. Пользователи не могут изменять "
 "свои пароли в системе, если включён NIS и они не вошли на сервер NIS."
 
-#: passwd.1.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: gpasswd.1.xml:2(term) chpasswd.8.xml:2(term) chgpasswd.8.xml:2(term)
+#: passwd.1.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: gpasswd.1.xml:30(term) chpasswd.8.xml:30(term) chgpasswd.8.xml:30(term)
 msgid "<option>ENCRYPT_METHOD</option> (string)"
 msgstr ""
 
-#: passwd.1.xml:4(para) newusers.8.xml:4(para) login.defs.5.xml:4(para)
-#: gpasswd.1.xml:4(para) chpasswd.8.xml:4(para) chgpasswd.8.xml:4(para)
+#: passwd.1.xml:32(para) newusers.8.xml:32(para) login.defs.5.xml:32(para)
+#: gpasswd.1.xml:32(para) chpasswd.8.xml:32(para) chgpasswd.8.xml:32(para)
 msgid ""
 "This defines the system default encryption algorithm for encrypting "
 "passwords (if no algorithm are specified on the command line)."
 msgstr ""
 
-#: passwd.1.xml:12(para) newusers.8.xml:12(para) login.defs.5.xml:12(para)
-#: gpasswd.1.xml:12(para) chpasswd.8.xml:12(para) chgpasswd.8.xml:12(para)
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
 msgid "<replaceable>DES</replaceable> (default)"
 msgstr ""
 
-#: passwd.1.xml:15(replaceable) newusers.8.xml:15(replaceable)
-#: login.defs.5.xml:15(replaceable) gpasswd.1.xml:15(replaceable)
-#: chpasswd.8.xml:15(replaceable) chgpasswd.8.xml:15(replaceable)
+#: passwd.1.xml:43(replaceable) newusers.8.xml:43(replaceable)
+#: login.defs.5.xml:43(replaceable) gpasswd.1.xml:43(replaceable)
+#: chpasswd.8.xml:43(replaceable) chgpasswd.8.xml:43(replaceable)
 msgid "MD5"
 msgstr ""
 
-#: passwd.1.xml:18(replaceable) newusers.8.xml:18(replaceable)
-#: login.defs.5.xml:18(replaceable) gpasswd.1.xml:18(replaceable)
-#: chpasswd.8.xml:18(replaceable) chgpasswd.8.xml:18(replaceable)
+#: passwd.1.xml:46(replaceable) newusers.8.xml:46(replaceable)
+#: login.defs.5.xml:46(replaceable) gpasswd.1.xml:46(replaceable)
+#: chpasswd.8.xml:46(replaceable) chgpasswd.8.xml:46(replaceable)
 msgid "SHA256"
 msgstr ""
 
-#: passwd.1.xml:21(replaceable) newusers.8.xml:21(replaceable)
-#: login.defs.5.xml:21(replaceable) gpasswd.1.xml:21(replaceable)
-#: chpasswd.8.xml:21(replaceable) chgpasswd.8.xml:21(replaceable)
+#: passwd.1.xml:49(replaceable) newusers.8.xml:49(replaceable)
+#: login.defs.5.xml:49(replaceable) gpasswd.1.xml:49(replaceable)
+#: chpasswd.8.xml:49(replaceable) chgpasswd.8.xml:49(replaceable)
 msgid "SHA512"
 msgstr ""
 
-#: passwd.1.xml:8(para) newusers.8.xml:8(para) login.defs.5.xml:8(para)
-#: gpasswd.1.xml:8(para) chpasswd.8.xml:8(para) chgpasswd.8.xml:8(para)
+#: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
+#: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
 msgid "It can take one of these values: <placeholder-1/>"
 msgstr ""
 
-#: passwd.1.xml:25(para) newusers.8.xml:25(para) login.defs.5.xml:25(para)
-#: gpasswd.1.xml:25(para) chpasswd.8.xml:25(para) chgpasswd.8.xml:25(para)
+#: passwd.1.xml:53(para) newusers.8.xml:53(para) login.defs.5.xml:53(para)
+#: gpasswd.1.xml:53(para) chpasswd.8.xml:53(para) chgpasswd.8.xml:53(para)
 msgid ""
 "Note: this parameter overrides the <option>MD5_CRYPT_ENAB</option> variable."
 msgstr ""
 
-#: passwd.1.xml:29(para) passwd.1.xml:23(para) newusers.8.xml:29(para)
-#: newusers.8.xml:23(para) login.defs.5.xml:29(para) login.defs.5.xml:23(para)
-#: gpasswd.1.xml:29(para) gpasswd.1.xml:23(para) chpasswd.8.xml:29(para)
-#: chpasswd.8.xml:23(para) chgpasswd.8.xml:29(para) chgpasswd.8.xml:23(para)
+#: passwd.1.xml:57(para) passwd.1.xml:53(para) newusers.8.xml:57(para)
+#: newusers.8.xml:53(para) login.defs.5.xml:57(para) login.defs.5.xml:53(para)
+#: gpasswd.1.xml:57(para) gpasswd.1.xml:53(para) chpasswd.8.xml:57(para)
+#: chpasswd.8.xml:53(para) chgpasswd.8.xml:57(para) chgpasswd.8.xml:53(para)
 msgid ""
 "Note: if you use PAM, it is recommended to set this variable consistently "
 "with the PAM modules configuration."
 msgstr ""
 
-#: passwd.1.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: gpasswd.1.xml:2(term) chpasswd.8.xml:2(term) chgpasswd.8.xml:2(term)
+#: passwd.1.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: gpasswd.1.xml:32(term) chpasswd.8.xml:32(term) chgpasswd.8.xml:32(term)
 msgid "<option>MD5_CRYPT_ENAB</option> (boolean)"
 msgstr ""
 
-#: passwd.1.xml:4(para) newusers.8.xml:4(para) login.defs.5.xml:4(para)
-#: gpasswd.1.xml:4(para) chpasswd.8.xml:4(para) chgpasswd.8.xml:4(para)
+#: passwd.1.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
+#: gpasswd.1.xml:34(para) chpasswd.8.xml:34(para) chgpasswd.8.xml:34(para)
 msgid ""
 "Indicate if passwords must be encrypted using the MD5-based algorithm. If "
 "set to <replaceable>yes</replaceable>, new passwords will be encrypted using "
@@ -4304,62 +4794,62 @@
 "<replaceable>no</replaceable>."
 msgstr ""
 
-#: passwd.1.xml:14(para) newusers.8.xml:14(para) login.defs.5.xml:14(para)
-#: gpasswd.1.xml:14(para) chpasswd.8.xml:14(para) chgpasswd.8.xml:14(para)
+#: passwd.1.xml:44(para) newusers.8.xml:44(para) login.defs.5.xml:44(para)
+#: gpasswd.1.xml:44(para) chpasswd.8.xml:44(para) chgpasswd.8.xml:44(para)
 msgid ""
 "This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
 "or by any command line option used to configure the encryption algorithm."
 msgstr ""
 
-#: passwd.1.xml:19(para) newusers.8.xml:19(para) login.defs.5.xml:19(para)
-#: gpasswd.1.xml:19(para) chpasswd.8.xml:19(para) chgpasswd.8.xml:19(para)
+#: passwd.1.xml:49(para) newusers.8.xml:49(para) login.defs.5.xml:49(para)
+#: gpasswd.1.xml:49(para) chpasswd.8.xml:49(para) chgpasswd.8.xml:49(para)
 msgid ""
 "This variable is deprecated. You should use <option>ENCRYPT_METHOD</option>."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>OBSCURE_CHECKS_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (логический)"
 
-#: passwd.1.xml:4(para) login.defs.5.xml:4(para)
+#: passwd.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Enable additional checks upon password changes."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_ALWAYS_WARN</option> (boolean)"
 msgstr "CHFN_AUTH (логический)"
 
-#: passwd.1.xml:4(para) login.defs.5.xml:4(para)
+#: passwd.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Warn about weak passwords (but still allow them) if you are root."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_CHANGE_TRIES</option> (number)"
 msgstr "PASS_WARN_AGE (число)"
 
-#: passwd.1.xml:4(para) login.defs.5.xml:4(para)
+#: passwd.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Maximum number of attempts to change password if rejected (too easy)."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_MAX_LEN</option> (number)"
 msgstr "PASS_MAX_DAYS (число)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: passwd.1.xml:3(term) login.defs.5.xml:3(term)
+#: passwd.1.xml:33(term) login.defs.5.xml:33(term)
 #, fuzzy
 msgid "<option>PASS_MIN_LEN</option> (number)"
 msgstr "PASS_MIN_DAYS (число)"
 
-#: passwd.1.xml:5(para) login.defs.5.xml:5(para)
+#: passwd.1.xml:35(para) login.defs.5.xml:35(para)
 msgid ""
 "Number of significant characters in the password for crypt(). "
 "<option>PASS_MAX_LEN</option> is 8 by default. Don't change unless your crypt"
@@ -4367,18 +4857,18 @@
 "<replaceable>yes</replaceable>."
 msgstr ""
 
-#: passwd.1.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: gpasswd.1.xml:2(term) chpasswd.8.xml:2(term) chgpasswd.8.xml:2(term)
+#: passwd.1.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: gpasswd.1.xml:30(term) chpasswd.8.xml:30(term) chgpasswd.8.xml:30(term)
 msgid "<option>SHA_CRYPT_MIN_ROUNDS</option> (number)"
 msgstr ""
 
-#: passwd.1.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
-#: gpasswd.1.xml:3(term) chpasswd.8.xml:3(term) chgpasswd.8.xml:3(term)
+#: passwd.1.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
+#: gpasswd.1.xml:31(term) chpasswd.8.xml:31(term) chgpasswd.8.xml:31(term)
 msgid "<option>SHA_CRYPT_MAX_ROUNDS</option> (number)"
 msgstr ""
 
-#: passwd.1.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
-#: gpasswd.1.xml:5(para) chpasswd.8.xml:5(para) chgpasswd.8.xml:5(para)
+#: passwd.1.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
+#: gpasswd.1.xml:33(para) chpasswd.8.xml:33(para) chgpasswd.8.xml:33(para)
 msgid ""
 "When <option>ENCRYPT_METHOD</option> is set to <replaceable>SHA256</"
 "replaceable> or <replaceable>SHA512</replaceable>, this defines the number "
@@ -4386,68 +4876,68 @@
 "of rounds is not specified on the command line)."
 msgstr ""
 
-#: passwd.1.xml:12(para) newusers.8.xml:12(para) login.defs.5.xml:12(para)
-#: gpasswd.1.xml:12(para) chpasswd.8.xml:12(para) chgpasswd.8.xml:12(para)
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
 msgid ""
 "With a lot of rounds, it is more difficult to brute forcing the password. "
 "But note also that more CPU resources will be needed to authenticate users."
 msgstr ""
 
-#: passwd.1.xml:17(para) newusers.8.xml:17(para) login.defs.5.xml:17(para)
-#: gpasswd.1.xml:17(para) chpasswd.8.xml:17(para) chgpasswd.8.xml:17(para)
+#: passwd.1.xml:45(para) newusers.8.xml:45(para) login.defs.5.xml:45(para)
+#: gpasswd.1.xml:45(para) chpasswd.8.xml:45(para) chgpasswd.8.xml:45(para)
 msgid ""
 "If not specified, the libc will choose the default number of rounds (5000)."
 msgstr ""
 
-#: passwd.1.xml:21(para) newusers.8.xml:21(para) login.defs.5.xml:21(para)
-#: gpasswd.1.xml:21(para) chpasswd.8.xml:21(para) chgpasswd.8.xml:21(para)
+#: passwd.1.xml:49(para) newusers.8.xml:49(para) login.defs.5.xml:49(para)
+#: gpasswd.1.xml:49(para) chpasswd.8.xml:49(para) chgpasswd.8.xml:49(para)
 msgid "The values must be inside the 1000-999999999 range."
 msgstr ""
 
-#: passwd.1.xml:24(para) newusers.8.xml:24(para) login.defs.5.xml:24(para)
-#: gpasswd.1.xml:24(para) chpasswd.8.xml:24(para) chgpasswd.8.xml:24(para)
+#: passwd.1.xml:52(para) newusers.8.xml:52(para) login.defs.5.xml:52(para)
+#: gpasswd.1.xml:52(para) chpasswd.8.xml:52(para) chgpasswd.8.xml:52(para)
 msgid ""
 "If only one of the <option>SHA_CRYPT_MIN_ROUNDS</option> or "
 "<option>SHA_CRYPT_MAX_ROUNDS</option> values is set, then this value will be "
 "used."
 msgstr ""
 
-#: passwd.1.xml:29(para) newusers.8.xml:29(para) login.defs.5.xml:29(para)
-#: gpasswd.1.xml:29(para) chpasswd.8.xml:29(para) chgpasswd.8.xml:29(para)
+#: passwd.1.xml:57(para) newusers.8.xml:57(para) login.defs.5.xml:57(para)
+#: gpasswd.1.xml:57(para) chpasswd.8.xml:57(para) chgpasswd.8.xml:57(para)
 msgid ""
 "If <option>SHA_CRYPT_MIN_ROUNDS</option> &gt; <option>SHA_CRYPT_MAX_ROUNDS</"
 "option>, the highest value will be used."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:356(para) chage.1.xml:212(para)
+#: passwd.1.xml:398(para) chage.1.xml:241(para)
 msgid "permission denied"
 msgstr "доступ запрещён"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:362(para)
+#: passwd.1.xml:404(para)
 msgid "invalid combination of options"
 msgstr "недопустимая комбинация параметров"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:368(para)
+#: passwd.1.xml:410(para)
 msgid "unexpected failure, nothing done"
 msgstr "неожиданная ошибка при работе, ничего не сделано"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:374(para)
+#: passwd.1.xml:416(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr ""
 "неожиданная ошибка при работе, отсутствует файл <filename>passwd</filename>"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: passwd.1.xml:380(para)
+#: passwd.1.xml:422(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr ""
 "файл <filename>passwd</filename> занят другой программой, попробуйте ещё раз"
 
 # type: Content of: <refentry><refsect1><para>
-#: passwd.1.xml:344(para)
+#: passwd.1.xml:386(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -4455,33 +4945,43 @@
 "Программа <command>passwd</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
-#: passwd.1.xml:395(para)
+#: passwd.1.xml:437(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
+"citerefentry>. <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
+"citerefentry>, <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><command>
-#: nologin.8.xml:5(refentrytitle) nologin.8.xml:10(refname)
-#: nologin.8.xml:16(command)
+#: nologin.8.xml:34(refentrytitle) nologin.8.xml:39(refname)
+#: nologin.8.xml:45(command)
 msgid "nologin"
 msgstr "nologin"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: nologin.8.xml:11(refpurpose)
+#: nologin.8.xml:40(refpurpose)
 msgid "politely refuse a login"
 msgstr "вежливо отказывает во входе в систему"
 
 # type: Content of: <refentry><refsect1><para>
-#: nologin.8.xml:22(para)
+#: nologin.8.xml:51(para)
 msgid ""
 "The <command>nologin</command> command displays a message that an account is "
 "not available and exits non-zero. It is intended as a replacement shell "
@@ -4492,7 +4992,7 @@
 "для замены оболочки командной строки в поле оболочки у заблокированных "
 "учётных записей."
 
-#: nologin.8.xml:27(para)
+#: nologin.8.xml:56(para)
 msgid ""
 "To disable all logins, investigate <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
@@ -4501,7 +5001,7 @@
 "<citerefentry><refentrytitle>nologin</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>."
 
-#: nologin.8.xml:36(para)
+#: nologin.8.xml:65(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
@@ -4512,41 +5012,53 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><title>
-#: nologin.8.xml:47(title)
-msgid "HYSTORY"
+#: nologin.8.xml:76(title)
+#, fuzzy
+#| msgid "HYSTORY"
+msgid "HISTORY"
 msgstr "ИСТОРИЯ"
 
 # type: Content of: <refentry><refsect1><para>
-#: nologin.8.xml:48(para)
-msgid "The <command>nologin</command> command appeared in BSD 4.4."
+#: nologin.8.xml:77(para)
+#, fuzzy
+#| msgid "The <command>nologin</command> command appeared in BSD 4.4."
+msgid "The <command>nologin</command> command appearred in BSD 4.4."
 msgstr "Программа <command>nologin</command> впервые появилась в BSD 4.4."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: newusers.8.xml:21(refentrytitle) newusers.8.xml:26(refname)
-#: newusers.8.xml:32(command) login.defs.5.xml:321(term)
+#: newusers.8.xml:50(refentrytitle) newusers.8.xml:55(refname)
+#: newusers.8.xml:61(command) login.defs.5.xml:353(term)
 msgid "newusers"
 msgstr "newusers"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: newusers.8.xml:27(refpurpose)
+#: newusers.8.xml:56(refpurpose)
 msgid "update and create new users in batch"
 msgstr ""
 "обновляет и создаёт новые учётные записи пользователей в пакетном режиме"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: newusers.8.xml:34(replaceable)
+#: newusers.8.xml:63(replaceable)
 msgid "new_users"
 msgstr "new_users"
 
 # type: Content of: <refentry><refsect1><para>
-#: newusers.8.xml:41(para)
+#: newusers.8.xml:70(para)
+#, fuzzy
+#| msgid ""
+#| "The <command>newusers</command> command reads a file of user name and "
+#| "clear-text password pairs and uses this information to update a group of "
+#| "existing users or to create new users. Each line is in the same format as "
+#| "the standard password file (see <citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the following "
+#| "exceptions:"
 msgid ""
 "The <command>newusers</command> command reads a file of user name and clear-"
 "text password pairs and uses this information to update a group of existing "
 "users or to create new users. Each line is in the same format as the "
 "standard password file (see <citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the following "
-"exceptions:"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the exceptions "
+"explained below:"
 msgstr ""
 "Программа <command>newusers</command> читает файл с парами имя пользователя/"
 "нешифрованный пароль и использует эту информацию для обновления группы "
@@ -4554,13 +5066,35 @@
 "стандартного файла паролей (смотрите <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>) за исключением:"
 
+#: newusers.8.xml:78(para)
+msgid "pw_name:pw_passwd:pw_uid:pw_gid:pw_gecos:pw_dir:pw_shell"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
+#: newusers.8.xml:83(emphasis)
+#, fuzzy
+#| msgid "group_name"
+msgid "pw_name"
+msgstr "имя_группы"
+
+#: newusers.8.xml:86(para)
+msgid "This is the name of the user."
+msgstr ""
+
+#: newusers.8.xml:89(para)
+msgid ""
+"It can be the name of a new user or the name of an existing user (or an user "
+"created before by <command>newusers</command>). In case of an existing user, "
+"the user's information will be changed, otherwise a new user will be created."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: newusers.8.xml:53(emphasis)
+#: newusers.8.xml:100(emphasis)
 msgid "pw_passwd"
 msgstr "pw_passwd"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: newusers.8.xml:56(para)
+#: newusers.8.xml:103(para)
 msgid ""
 "This field will be encrypted and used as the new value of the encrypted "
 "password."
@@ -4569,39 +5103,117 @@
 "пароля."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
-#: newusers.8.xml:64(emphasis)
+#: newusers.8.xml:111(emphasis)
+#, fuzzy
+#| msgid "pw_gid"
+msgid "pw_uid"
+msgstr "pw_gid"
+
+#: newusers.8.xml:114(para)
+msgid "This field is used to define the UID of the user."
+msgstr ""
+
+#: newusers.8.xml:117(para)
+msgid ""
+"If the field is empty, an new (unused) UID will be defined automatically by "
+"<command>newusers</command>."
+msgstr ""
+
+#: newusers.8.xml:121(para)
+msgid "If this field contains a number, this number will be used as the UID."
+msgstr ""
+
+#: newusers.8.xml:125(para)
+msgid ""
+"If this field contains the name of an existing user (or the name of an user "
+"created before by <command>newusers</command>), the UID of the specified "
+"user will be used."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
+#: newusers.8.xml:135(emphasis)
 msgid "pw_gid"
 msgstr "pw_gid"
 
-#: newusers.8.xml:67(para)
+#: newusers.8.xml:138(para)
+msgid "This field is used to define the primary group ID for the user."
+msgstr ""
+
+#: newusers.8.xml:141(para)
 msgid ""
-"This field must contain the name (or number) of a group. The user will be "
-"added as a member to this group. When a non-existent group name or number is "
-"specified, a new group will be created. In the case of a non-existent group "
-"number, both the name and the number of the new group will be this number."
+"If this field contains the name of an existing group (or a group created "
+"before by <command>newusers</command>), the GID of this group will be used "
+"as the primary group ID for the user."
 msgstr ""
-"Это поле должно содержать имя (или номер). Пользователь будет добавлен в эту "
-"группу. Если указан числовой идентификатор или имя несуществующей группы, то "
-"будет создана новая группа с данным именем и номером."
 
+#: newusers.8.xml:147(para)
+msgid ""
+"If this field is a number, this number will be used as the primary group ID "
+"of the user. If no groups exist with this GID, a new group will be created "
+"with this GID, and the name of the user."
+msgstr ""
+
+#: newusers.8.xml:153(para)
+msgid ""
+"If this field is empty, a new group will be created with the name of the "
+"user and a GID will be automatically defined by <command>newusers</command> "
+"to be used as the primary group ID for the user and as the GID for the new "
+"group."
+msgstr ""
+
+#: newusers.8.xml:159(para)
+msgid ""
+"If this field contains the name of a group which does not exist (and was not "
+"created earlier wbefore by <command>newusers</command>), a new group will be "
+"created with the specified name and a GID will be automatically defined by "
+"<command>newusers</command> to be used as the primary group ID for the user "
+"and Gs the ID for the new group."
+msgstr ""
+
+#: newusers.8.xml:171(emphasis)
+msgid "pw_gecos"
+msgstr ""
+
+#: newusers.8.xml:174(para)
+msgid "This field is copied in the GECOS field of the user."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><emphasis>
-#: newusers.8.xml:78(emphasis)
+#: newusers.8.xml:181(emphasis)
 msgid "pw_dir"
 msgstr "pw_dir"
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: newusers.8.xml:81(para)
+#: newusers.8.xml:184(para)
+msgid "This field is used to define the home directory of the user."
+msgstr ""
+
+#: newusers.8.xml:187(para)
 msgid ""
-"This field will be checked for existence as a directory, and a new directory "
-"with this name will be created if it does not already exist. The ownership "
-"of the directory will be set to be that of the user being created or updated."
+"If this field does not specify an existing directory, the specified "
+"directory is created, with ownership set to the user being created or "
+"updated and its primary group."
 msgstr ""
-"Будет проверено существование каталога с именем значения данного поля и если "
-"такого каталога нет, то он будет создан. Владельцем каталога будет назначен "
-"обновляемый или создаваемый пользователь."
 
+#: newusers.8.xml:196(emphasis)
+msgid "pw_shell"
+msgstr ""
+
+#: newusers.8.xml:199(para)
+msgid ""
+"This field defines the shell of the user. No checks are performed on this "
+"field."
+msgstr ""
+
+#: newusers.8.xml:207(para)
+msgid ""
+"<command>newusers</command> first tries to create or change all the "
+"specified users, and then write these changes to the user or group "
+"databases. If an error occurs (except in the final writes to the databases), "
+"no changes are committed to the databases."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><para>
-#: newusers.8.xml:91(para)
+#: newusers.8.xml:214(para)
 msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are updated at a single time."
@@ -4610,74 +5222,84 @@
 "один раз заводится несколько учётных записей."
 
 # type: Content of: <refentry><refsect1><para>
-#: newusers.8.xml:99(para)
+#: newusers.8.xml:222(para)
 #, fuzzy
 #| msgid ""
 #| "The options which apply to the <command>usermod</command> command are:"
 msgid "The options which apply to the <command>newusers</command> command are:"
 msgstr "Параметры команды <command>usermod</command>:"
 
-#: newusers.8.xml:103(term) chpasswd.8.xml:66(term) chgpasswd.8.xml:66(term)
+#: newusers.8.xml:226(term) chpasswd.8.xml:95(term) chgpasswd.8.xml:95(term)
 #, fuzzy
 msgid "<option>-c</option>, <option>--crypt-method</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: newusers.8.xml:105(para) chpasswd.8.xml:68(para) chgpasswd.8.xml:68(para)
+#: newusers.8.xml:228(para) chpasswd.8.xml:97(para) chgpasswd.8.xml:97(para)
 msgid "Use the specified method to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:106(para) chpasswd.8.xml:69(para) chgpasswd.8.xml:69(para)
+#: newusers.8.xml:229(para) chpasswd.8.xml:101(para) chgpasswd.8.xml:101(para)
 msgid ""
 "The available methods are DES, MD5, NONE, and SHA256 or SHA512 if your libc "
 "support these methods."
 msgstr ""
 
-#: newusers.8.xml:132(term) chpasswd.8.xml:97(term) chgpasswd.8.xml:97(term)
+#: newusers.8.xml:243(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: newusers.8.xml:255(term) chpasswd.8.xml:129(term) chgpasswd.8.xml:129(term)
 #, fuzzy
 msgid "<option>-s</option>, <option>--sha-rounds</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: newusers.8.xml:134(para) chpasswd.8.xml:99(para) chgpasswd.8.xml:99(para)
+#: newusers.8.xml:257(para) chpasswd.8.xml:131(para) chgpasswd.8.xml:131(para)
 msgid "Use the specified number of rounds to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:137(para) chpasswd.8.xml:102(para) chgpasswd.8.xml:102(para)
+#: newusers.8.xml:260(para) chpasswd.8.xml:134(para) chgpasswd.8.xml:134(para)
 msgid ""
 "The value 0 means that the system will choose the default number of rounds "
 "for the crypt method (5000)."
 msgstr ""
 
-#: newusers.8.xml:141(para) chpasswd.8.xml:106(para) chgpasswd.8.xml:106(para)
+#: newusers.8.xml:264(para) chpasswd.8.xml:138(para) chgpasswd.8.xml:138(para)
 msgid ""
 "A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
 msgstr ""
 
-#: newusers.8.xml:145(para) chpasswd.8.xml:110(para) chgpasswd.8.xml:110(para)
+#: newusers.8.xml:268(para) chpasswd.8.xml:142(para) chgpasswd.8.xml:142(para)
 msgid "You can only use this option with the SHA256 or SHA512 crypt method."
 msgstr ""
 
-#: newusers.8.xml:149(para) chpasswd.8.xml:114(para) chgpasswd.8.xml:114(para)
+#: newusers.8.xml:272(para) chpasswd.8.xml:146(para) chgpasswd.8.xml:146(para)
 msgid ""
 "By default, the number of rounds is defined by the SHA_CRYPT_MIN_ROUNDS and "
 "SHA_CRYPT_MAX_ROUNDS variables in <filename>/etc/login.defs</filename>."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: newusers.8.xml:161(para)
+#: newusers.8.xml:284(para)
 msgid ""
 "The input file must be protected since it contains unencrypted passwords."
 msgstr ""
 "Файл с входными данными должен быть защищён, так как в нём содержатся не "
 "шифрованные пароли."
 
-#: newusers.8.xml:165(para) chpasswd.8.xml:130(para)
+#: newusers.8.xml:288(para) chpasswd.8.xml:162(para)
 msgid ""
 "PAM is not used to update the passwords. Only <filename>/etc/passwd</"
 "filename> and <filename>/etc/shadow</filename> are updated, and the various "
 "checks or options provided by PAM modules are not used."
 msgstr ""
 
-#: newusers.8.xml:234(para)
+#: newusers.8.xml:357(para)
 msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -4692,25 +5314,25 @@
 "manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: newgrp.1.xml:9(refentrytitle) newgrp.1.xml:14(refname)
-#: newgrp.1.xml:20(command) login.defs.5.xml:313(term)
+#: newgrp.1.xml:38(refentrytitle) newgrp.1.xml:43(refname)
+#: newgrp.1.xml:49(command)
 msgid "newgrp"
 msgstr "newgrp"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: newgrp.1.xml:15(refpurpose)
+#: newgrp.1.xml:44(refpurpose)
 msgid "log in to a new group"
 msgstr "выполняет регистрацию пользователя в новой группе"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: newgrp.1.xml:21(replaceable) grpck.8.xml:22(replaceable)
-#: grpck.8.xml:31(replaceable) groupdel.8.xml:22(replaceable)
-#: groupadd.8.xml:30(replaceable) gpasswd.1.xml:34(replaceable)
+#: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
+#: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
+#: groupadd.8.xml:56(replaceable) gpasswd.1.xml:63(replaceable)
 msgid "group"
 msgstr "группа"
 
 # type: Content of: <refentry><refsect1><para>
-#: newgrp.1.xml:27(para)
+#: newgrp.1.xml:56(para)
 msgid ""
 "The <command>newgrp</command> command is used to change the current group ID "
 "during a login session. If the optional <option>-</option> flag is given, "
@@ -4724,7 +5346,7 @@
 "пользователь заново вошёл в систему, иначе имеющаяся среда, включая текущий "
 "рабочий каталог, изменены не будут."
 
-#: newgrp.1.xml:35(para)
+#: newgrp.1.xml:64(para)
 msgid ""
 "<command>newgrp</command> changes the current real group ID to the named "
 "group, or to the default group listed in <filename>/etc/passwd</filename> if "
@@ -4750,7 +5372,7 @@
 "пароль, то пользователю будет отказано в доступе."
 
 # type: Content of: <refentry><refsect1><para>
-#: newgrp.1.xml:49(para)
+#: newgrp.1.xml:78(para)
 msgid ""
 "If there is an entry for this group in <filename>/etc/gshadow</filename>, "
 "then the list of members and the password of this group will be taken from "
@@ -4761,7 +5383,7 @@
 "то список членов и пароль этой группы будут взяты из этого файла, иначе "
 "используется запись из файла <filename>/etc/group</filename>."
 
-#: newgrp.1.xml:101(para)
+#: newgrp.1.xml:130(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -4787,17 +5409,17 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
 # type: Content of: <refentry><refsect1><para><command>
-#: logoutd.8.xml:5(refentrytitle) logoutd.8.xml:10(refname)
-#: logoutd.8.xml:16(command)
+#: logoutd.8.xml:34(refentrytitle) logoutd.8.xml:39(refname)
+#: logoutd.8.xml:45(command)
 msgid "logoutd"
 msgstr "logoutd"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: logoutd.8.xml:11(refpurpose)
+#: logoutd.8.xml:40(refpurpose)
 msgid "Enforce login time restrictions"
 msgstr "контролирует временные интервалы работы в системе"
 
-#: logoutd.8.xml:22(para)
+#: logoutd.8.xml:51(para)
 msgid ""
 "<command>logoutd</command> enforces the login time and port restrictions "
 "specified in <filename>/etc/porttime</filename>. <command>logoutd</command> "
@@ -4817,27 +5439,27 @@
 "файле <filename>/etc/porttime</filename>, будет завершена."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: logoutd.8.xml:44(filename) login.1.xml:283(filename)
+#: logoutd.8.xml:73(filename) login.1.xml:319(filename)
 msgid "/var/run/utmp"
 msgstr "/var/run/utmp"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: logoutd.8.xml:46(para) login.1.xml:285(para)
+#: logoutd.8.xml:75(para) login.1.xml:321(para)
 msgid "List of current login sessions."
 msgstr "содержит список работающих сеансов в системе"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:66(refentrytitle) login.defs.5.xml:71(refname)
+#: login.defs.5.xml:97(refentrytitle) login.defs.5.xml:102(refname)
 msgid "login.defs"
 msgstr "login.defs"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:72(refpurpose)
+#: login.defs.5.xml:103(refpurpose)
 msgid "shadow password suite configuration"
 msgstr "содержит конфигурацию подсистемы теневых паролей"
 
 # type: Content of: <refentry><refsect1><para>
-#: login.defs.5.xml:77(para)
+#: login.defs.5.xml:108(para)
 msgid ""
 "The <filename>/etc/login.defs</filename> file defines the site-specific "
 "configuration for the shadow password suite. This file is required. Absence "
@@ -4850,7 +5472,7 @@
 "приведёт к выполнению нежелаемых операций."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.defs.5.xml:84(para)
+#: login.defs.5.xml:115(para)
 msgid ""
 "This file is a readable text file, each line of the file describing one "
 "configuration parameter. The lines consist of a configuration name and "
@@ -4865,7 +5487,7 @@
 "быть первым непробельным символом в строке."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.defs.5.xml:92(para)
+#: login.defs.5.xml:123(para)
 #, fuzzy
 msgid ""
 "Parameter values may be of four types: strings, booleans, numbers, and long "
@@ -4889,18 +5511,18 @@
 "архитектуры компьютера."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.defs.5.xml:107(para)
+#: login.defs.5.xml:138(para)
 msgid "The following configuration items are provided:"
 msgstr "Возможны следующие параметры конфигурации:"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) chfn.1.xml:2(term)
+#: login.defs.5.xml:32(term) chfn.1.xml:32(term)
 #, fuzzy
 msgid "<option>CHFN_AUTH</option> (boolean)"
 msgstr "CHFN_AUTH (логический)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:4(para) chfn.1.xml:4(para)
+#: login.defs.5.xml:34(para) chfn.1.xml:34(para)
 #, fuzzy
 msgid ""
 "If <replaceable>yes</replaceable>, the <command>chfn</command> program will "
@@ -4913,12 +5535,12 @@
 "суперпользователем."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) chfn.1.xml:2(term)
+#: login.defs.5.xml:32(term) chfn.1.xml:32(term)
 #, fuzzy
 msgid "<option>CHFN_RESTRICT</option> (string)"
 msgstr "CHFN_RESTRICT (строка)"
 
-#: login.defs.5.xml:4(para) chfn.1.xml:4(para)
+#: login.defs.5.xml:34(para) chfn.1.xml:34(para)
 #, fuzzy
 msgid ""
 "This parameter specifies which values in the <emphasis remap=\"I\">gecos</"
@@ -4946,13 +5568,13 @@
 "достигается снятием SUID бита с файла <filename>chfn</filename>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) chsh.1.xml:2(term)
+#: login.defs.5.xml:32(term) chsh.1.xml:32(term)
 #, fuzzy
 msgid "<option>CHSH_AUTH</option> (boolean)"
 msgstr "CHFN_AUTH (логический)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:4(para) chsh.1.xml:4(para)
+#: login.defs.5.xml:34(para) chsh.1.xml:34(para)
 #, fuzzy
 msgid ""
 "If <replaceable>yes</replaceable>, the <command>chsh</command> program will "
@@ -4965,12 +5587,12 @@
 "суперпользователем."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ERASECHAR</option> (number)"
 msgstr "UMASK (число)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 #, fuzzy
 msgid ""
 "Terminal ERASE character (<replaceable>010</replaceable> = backspace, "
@@ -4979,66 +5601,66 @@
 "Имя группы будет изменено с <emphasis remap=\"I\">ГРУППА</emphasis> на "
 "<emphasis remap=\"I\">НОВАЯ_ГРУППА</emphasis>."
 
-#: login.defs.5.xml:8(para) login.defs.5.xml:7(para) login.1.xml:8(para)
-#: login.1.xml:7(para)
+#: login.defs.5.xml:38(para) login.defs.5.xml:37(para) login.1.xml:38(para)
+#: login.1.xml:37(para)
 msgid ""
 "The value can be prefixed \"0\" for an octal value, or \"0x\" for an "
 "hexadecimal value."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FAIL_DELAY</option> (number)"
 msgstr "PASS_MIN_DAYS (число)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Delay in seconds before being allowed another attempt after a login failure."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FAILLOG_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (логический)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Enable logging and display of <filename>/var/log/faillog</filename> login "
 "failure info."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FAKE_SHELL</option> (string)"
 msgstr "MAIL_DIR (строка)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, <command>login</command> will execute this shell instead of the "
 "users' shell specified in <filename>/etc/passwd</filename>."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FTMP_FILE</option> (string)"
 msgstr "MAIL_DIR (строка)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, login failures will be logged in this file in a utmp format."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>HUSHLOGIN_FILE</option> (string)"
 msgstr "CHFN_RESTRICT (строка)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, this file can inhibit all the usual chatter during the login "
 "sequence. If a full pathname is specified, then hushed mode will be enabled "
@@ -5048,72 +5670,72 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ISSUE_FILE</option> (string)"
 msgstr "MAIL_DIR (строка)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "If defined, this file will be displayed before each login prompt."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>KILLCHAR</option> (number)"
 msgstr "GID_MAX (число)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Terminal KILL character (<replaceable>025</replaceable> = CTRL/U)."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LASTLOG_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (логический)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable logging and display of /var/log/lastlog login time info."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOG_OK_LOGINS</option> (boolean)"
 msgstr "CHFN_AUTH (логический)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable logging of successful logins."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOG_UNKFAIL_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (логический)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable display of unknown usernames when login failures are recorded."
 msgstr ""
 
-#: login.defs.5.xml:8(para) login.1.xml:8(para)
+#: login.defs.5.xml:38(para) login.1.xml:38(para)
 msgid ""
 "Note: logging unknown usernames may be a security issue if an user enter her "
 "password instead of her login name."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOGIN_RETRIES</option> (number)"
 msgstr "GID_MIN (число)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Maximum number of login retries in case of bad password."
 msgstr ""
 
-#: login.defs.5.xml:7(para) login.1.xml:7(para)
+#: login.defs.5.xml:37(para) login.1.xml:37(para)
 msgid ""
 "This will most likely be overriden by PAM, since the default pam_unix module "
 "has it's own built in of 3 retries. However, this is a safe fallback in case "
@@ -5121,34 +5743,34 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOGIN_TIMEOUT</option> (number)"
 msgstr "GID_MAX (число)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Max time in seconds for login."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>MOTD_FILE</option> (string)"
 msgstr "MAIL_DIR (строка)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, \":\" delimited list of \"message of the day\" files to be "
 "displayed upon login."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>NOLOGINS_FILE</option> (string)"
 msgstr "CHFN_RESTRICT (строка)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, name of file whose presence will inhibit non-root logins. The "
 "contents of this file should be a message indicating why logins are "
@@ -5156,7 +5778,7 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: login.defs.5.xml:149(para)
+#: login.defs.5.xml:181(para)
 #, fuzzy
 msgid ""
 "<option>PASS_MAX_DAYS</option>, <option>PASS_MIN_DAYS</option> and "
@@ -5168,47 +5790,47 @@
 "уже существующие учётные записи."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>PORTTIME_CHECKS_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (логический)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable checking of time restrictions specified in /etc/porttime."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>TTYGROUP</option> (string)"
 msgstr "MAIL_DIR (строка)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:3(term) login.1.xml:3(term)
+#: login.defs.5.xml:33(term) login.1.xml:33(term)
 #, fuzzy
 msgid "<option>TTYPERM</option> (string)"
 msgstr "USERDEL_CMD (строка)"
 
-#: login.defs.5.xml:5(para) login.1.xml:5(para)
+#: login.defs.5.xml:35(para) login.1.xml:35(para)
 msgid ""
 "The terminal permissions: the login tty will be owned by the "
 "<option>TTYGROUP</option> group, and the permissions will be set to "
 "<option>TTYPERM</option>."
 msgstr ""
 
-#: login.defs.5.xml:10(para) login.1.xml:10(para)
+#: login.defs.5.xml:40(para) login.1.xml:40(para)
 msgid ""
 "By default, the ownership of the terminal is set to the user's primary group "
 "and the permissions are set to <replaceable>0600</replaceable>."
 msgstr ""
 
-#: login.defs.5.xml:15(para) login.1.xml:15(para)
+#: login.defs.5.xml:45(para) login.1.xml:45(para)
 msgid ""
 "<option>TTYGROUP</option> can be either the name of a group or a numeric "
 "group identifier."
 msgstr ""
 
-#: login.defs.5.xml:19(para) login.1.xml:19(para)
+#: login.defs.5.xml:49(para) login.1.xml:49(para)
 msgid ""
 "If you have a <command>write</command> program which is \"setgid\" to a "
 "special group which owns the terminals, define TTYGROUP to the group number "
@@ -5217,35 +5839,35 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>TTYTYPE_FILE</option> (string)"
 msgstr "MAIL_DIR (строка)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, file which maps tty line to TERM environment parameter. Each "
 "line of the file is in a format something like \"vt100 tty01\"."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ULIMIT</option> (number)"
 msgstr "UID_MIN (число)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Default <command>ulimit</command> value."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
-#: login.defs.5.xml:177(title)
+#: login.defs.5.xml:209(title)
 #, fuzzy
 msgid "CROSS REFERENCES"
 msgstr "ПЕРЕКРЁСТНАЯ ССЫЛКА"
 
 # type: Content of: <refentry><refsect1><para>
-#: login.defs.5.xml:178(para)
+#: login.defs.5.xml:210(para)
 #, fuzzy
 msgid ""
 "The following cross references show which programs in the shadow password "
@@ -5255,67 +5877,67 @@
 "параметры."
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:186(term) chfn.1.xml:12(refentrytitle)
-#: chfn.1.xml:17(refname) chfn.1.xml:23(command)
+#: login.defs.5.xml:218(term) chfn.1.xml:41(refentrytitle)
+#: chfn.1.xml:46(refname) chfn.1.xml:52(command)
 msgid "chfn"
 msgstr "chfn"
 
-#: login.defs.5.xml:188(para)
+#: login.defs.5.xml:220(para)
 msgid ""
 "<phrase condition=\"no_pam\">CHFN_AUTH</phrase> CHFN_RESTRICT <phrase "
 "condition=\"no_pam\">LOGIN_STRING</phrase>"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><command>
-#: login.defs.5.xml:196(term) chgpasswd.8.xml:13(refentrytitle)
-#: chgpasswd.8.xml:18(refname) chgpasswd.8.xml:24(command)
+#: login.defs.5.xml:228(term) chgpasswd.8.xml:42(refentrytitle)
+#: chgpasswd.8.xml:47(refname) chgpasswd.8.xml:53(command)
 msgid "chgpasswd"
 msgstr "chgpasswd"
 
-#: login.defs.5.xml:198(para) login.defs.5.xml:228(para)
+#: login.defs.5.xml:230(para) login.defs.5.xml:260(para)
 msgid ""
 "ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB <phrase condition="
 "\"sha_crypt\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><command>
-#: login.defs.5.xml:206(term) chpasswd.8.xml:12(refentrytitle)
-#: chpasswd.8.xml:17(refname) chpasswd.8.xml:23(command)
+#: login.defs.5.xml:238(term) chpasswd.8.xml:41(refentrytitle)
+#: chpasswd.8.xml:46(refname) chpasswd.8.xml:52(command)
 msgid "chpasswd"
 msgstr "chpasswd"
 
-#: login.defs.5.xml:208(para)
+#: login.defs.5.xml:240(para)
 msgid ""
 "ENCRYPT_METHOD MD5_CRYPT_ENAB <phrase condition=\"sha_crypt"
 "\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:216(term) chsh.1.xml:11(refentrytitle)
-#: chsh.1.xml:16(refname) chsh.1.xml:22(command)
+#: login.defs.5.xml:248(term) chsh.1.xml:40(refentrytitle)
+#: chsh.1.xml:45(refname) chsh.1.xml:51(command)
 msgid "chsh"
 msgstr "chsh"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:218(para)
+#: login.defs.5.xml:250(para)
 #, fuzzy
 msgid "CHSH_AUTH LOGIN_STRING"
 msgstr "CHFN_AUTH CHFN_RESTRICT"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:226(term) gpasswd.1.xml:13(refentrytitle)
-#: gpasswd.1.xml:18(refname) gpasswd.1.xml:29(command)
+#: login.defs.5.xml:258(term) gpasswd.1.xml:42(refentrytitle)
+#: gpasswd.1.xml:47(refname) gpasswd.1.xml:58(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:236(term) groupadd.8.xml:11(refentrytitle)
-#: groupadd.8.xml:16(refname) groupadd.8.xml:22(command)
+#: login.defs.5.xml:268(term) groupadd.8.xml:42(refentrytitle)
+#: groupadd.8.xml:47(refname) groupadd.8.xml:53(command)
 msgid "groupadd"
 msgstr "groupadd"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:238(para)
+#: login.defs.5.xml:270(para)
 #, fuzzy
 msgid "GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP SYS_GID_MAX SYS_GID_MIN"
 msgstr ""
@@ -5323,44 +5945,43 @@
 "UMASK"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:245(term) groupdel.8.xml:9(refentrytitle)
-#: groupdel.8.xml:14(refname) groupdel.8.xml:20(command)
+#: login.defs.5.xml:277(term) groupdel.8.xml:38(refentrytitle)
+#: groupdel.8.xml:43(refname) groupdel.8.xml:49(command)
 msgid "groupdel"
 msgstr "groupdel"
 
-#: login.defs.5.xml:247(para) login.defs.5.xml:253(para)
-#: login.defs.5.xml:259(para) login.defs.5.xml:266(para)
-#: login.defs.5.xml:272(para) login.defs.5.xml:278(para)
-#: login.defs.5.xml:421(para)
+#: login.defs.5.xml:279(para) login.defs.5.xml:285(para)
+#: login.defs.5.xml:291(para) login.defs.5.xml:298(para)
+#: login.defs.5.xml:304(para) login.defs.5.xml:310(para)
 msgid "MAX_MEMBERS_PER_GROUP"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><command>
-#: login.defs.5.xml:251(term) groupmems.8.xml:9(refentrytitle)
-#: groupmems.8.xml:14(refname) groupmems.8.xml:20(command)
+#: login.defs.5.xml:283(term) groupmems.8.xml:38(refentrytitle)
+#: groupmems.8.xml:43(refname) groupmems.8.xml:49(command)
 msgid "groupmems"
 msgstr "groupmems"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:257(term) groupmod.8.xml:9(refentrytitle)
-#: groupmod.8.xml:14(refname) groupmod.8.xml:20(command)
+#: login.defs.5.xml:289(term) groupmod.8.xml:38(refentrytitle)
+#: groupmod.8.xml:43(refname) groupmod.8.xml:49(command)
 msgid "groupmod"
 msgstr "groupmod"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:264(term) grpck.8.xml:9(refentrytitle)
-#: grpck.8.xml:14(refname) grpck.8.xml:20(command) grpck.8.xml:29(command)
+#: login.defs.5.xml:296(term) grpck.8.xml:38(refentrytitle)
+#: grpck.8.xml:43(refname) grpck.8.xml:49(command) grpck.8.xml:58(command)
 msgid "grpck"
 msgstr "grpck"
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:284(term) login.1.xml:41(refentrytitle)
-#: login.1.xml:46(refname) login.1.xml:52(command) login.1.xml:59(command)
-#: login.1.xml:65(command)
+#: login.defs.5.xml:316(term) login.1.xml:70(refentrytitle)
+#: login.1.xml:75(refname) login.1.xml:81(command) login.1.xml:89(command)
+#: login.1.xml:96(command)
 msgid "login"
 msgstr "login"
 
-#: login.defs.5.xml:286(para)
+#: login.defs.5.xml:318(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENV_PATH ENV_SUPATH ENV_TZ ENVIRON_FILE</"
@@ -5375,12 +5996,19 @@
 "phrase> USERGROUPS_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:315(para)
+# type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
+#: login.defs.5.xml:345(term)
+#, fuzzy
+#| msgid "newgrp"
+msgid "newgrp / sg"
+msgstr "newgrp"
+
+#: login.defs.5.xml:347(para)
 msgid "SYSLOG_SG_ENAB"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:323(para)
+#: login.defs.5.xml:355(para)
 #, fuzzy
 msgid ""
 "ENCRYPT_METHOD GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB "
@@ -5391,7 +6019,7 @@
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:339(para)
+#: login.defs.5.xml:371(para)
 msgid ""
 "ENCRYPT_METHOD MD5_CRYPT_ENAB OBSCURE_CHECKS_ENAB PASS_ALWAYS_WARN "
 "PASS_CHANGE_TRIES PASS_MAX_LEN PASS_MIN_LEN <phrase condition=\"sha_crypt"
@@ -5399,11 +6027,11 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:350(para) login.defs.5.xml:358(para)
+#: login.defs.5.xml:382(para) login.defs.5.xml:390(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 
-#: login.defs.5.xml:365(para)
+#: login.defs.5.xml:397(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENVIRON_FILE</phrase> ENV_PATH "
@@ -5414,44 +6042,55 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: login.defs.5.xml:380(term)
+#: login.defs.5.xml:412(term)
 #, fuzzy
 msgid "sulogin"
 msgstr "login"
 
-#: login.defs.5.xml:382(para)
+#: login.defs.5.xml:414(para)
 msgid "ENV_HZ <phrase condition=\"no_pam\">ENV_TZ</phrase>"
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.defs.5.xml:391(para)
+#: login.defs.5.xml:423(para)
 #, fuzzy
 msgid ""
-"GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS PASS_MIN_DAYS "
-"PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN UID_MAX "
-"UID_MIN UMASK"
+"CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS "
+"PASS_MIN_DAYS PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN "
+"UID_MAX UID_MIN UMASK"
 msgstr ""
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:404(para)
+#: login.defs.5.xml:436(para)
 msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:413(para)
+#: login.defs.5.xml:445(para)
 msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP"
 msgstr ""
 
-#: login.defs.5.xml:429(para)
+#: login.defs.5.xml:456(para)
+#, fuzzy
+#| msgid ""
+#| "Much of the functionality that used to be provided by the shadow password "
+#| "suite is now handled by PAM. Thus, <filename>/etc/login.defs</filename> "
+#| "is no longer used by programs such as: "
+#| "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>. Please refer to the corresponding PAM configuration files "
+#| "instead."
 msgid ""
 "Much of the functionality that used to be provided by the shadow password "
 "suite is now handled by PAM. Thus, <filename>/etc/login.defs</filename> is "
-"no longer used by programs such as: <citerefentry><refentrytitle>login</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>. Please refer to the corresponding PAM "
-"configuration files instead."
+"no longer used by <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, or less used by "
+"<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, and <citerefentry><refentrytitle>su</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>. Please refer to the "
+"corresponding PAM configuration files instead."
 msgstr ""
 "Большинство функций подсистемы теневых паролей теперь реализовано через PAM. "
 "Поэтому, файл <filename>/etc/login.defs</filename> больше не используется "
@@ -5462,7 +6101,7 @@
 "citerefentry>. Настройку данных программ следует выполнять в файлах "
 "конфигурации PAM."
 
-#: login.defs.5.xml:446(para)
+#: login.defs.5.xml:472(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5485,17 +6124,17 @@
 "manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: login.access.5.xml:5(refentrytitle) login.access.5.xml:10(refname)
+#: login.access.5.xml:35(refentrytitle) login.access.5.xml:40(refname)
 msgid "login.access"
 msgstr "login.access"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: login.access.5.xml:11(refpurpose)
+#: login.access.5.xml:41(refpurpose)
 msgid "login access control table"
 msgstr "файл контроля доступа в систему"
 
 # type: Content of: <refentry><refsect1><para>
-#: login.access.5.xml:16(para)
+#: login.access.5.xml:46(para)
 msgid ""
 "The <emphasis remap=\"I\">login.access</emphasis> file specifies (user, "
 "host) combinations and/or (user, tty) combinations for which a login will be "
@@ -5506,7 +6145,7 @@
 "будет разрешён или запрещён вход в систему."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.access.5.xml:22(para)
+#: login.access.5.xml:52(para)
 msgid ""
 "When someone logs in, the <emphasis remap=\"I\">login.access</emphasis> is "
 "scanned for the first entry that matches the (user, host) combination, or, "
@@ -5522,7 +6161,7 @@
 "записи вход в систему или нет."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.access.5.xml:30(para)
+#: login.access.5.xml:60(para)
 msgid ""
 "Each line of the login access control table has three fields separated by a "
 "\":\" character:"
@@ -5530,7 +6169,7 @@
 "Каждая строка таблицы контроля доступа в систему состоит из трёх полей "
 "разделённых символом \":\" и выглядит так:"
 
-#: login.access.5.xml:35(para)
+#: login.access.5.xml:65(para)
 msgid ""
 "<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I\">users</"
 "emphasis>:<emphasis remap=\"I\">origins</emphasis>"
@@ -5538,7 +6177,7 @@
 "<emphasis remap=\"I\">права_доступа</emphasis>:<emphasis remap=\"I"
 "\">пользователи</emphasis>:<emphasis remap=\"I\">источники</emphasis>"
 
-#: login.access.5.xml:39(para)
+#: login.access.5.xml:69(para)
 msgid ""
 "The first field should be a \"<emphasis>+</emphasis>\" (access granted) or "
 "\"<emphasis>-</emphasis>\" (access denied) character. The second field "
@@ -5564,7 +6203,7 @@
 "пользователей."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.access.5.xml:53(para)
+#: login.access.5.xml:83(para)
 msgid ""
 "The <emphasis>EXCEPT</emphasis> operator makes it possible to write very "
 "compact rules."
@@ -5572,7 +6211,7 @@
 "Оператор <emphasis>EXCEPT</emphasis> помогает в написании компактных правил."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.access.5.xml:58(para)
+#: login.access.5.xml:88(para)
 msgid ""
 "The group file is searched only when a name does not match that of the "
 "logged-in user. Only groups are matched in which users are explicitly "
@@ -5584,44 +6223,41 @@
 "значение первичной группы пользователя."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: login.1.xml:47(refpurpose)
+#: login.1.xml:76(refpurpose)
 msgid "begin session on the system"
 msgstr "начинает сеанс в системе"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: login.1.xml:53(arg) login.1.xml:60(arg) login.1.xml:66(arg)
-#: login.1.xml:178(option) groupmems.8.xml:24(arg) groupmems.8.xml:65(option)
+#: login.1.xml:82(arg) login.1.xml:90(arg) login.1.xml:97(arg)
+#: login.1.xml:214(option) groupmems.8.xml:54(arg)
 msgid "-p"
 msgstr "-p"
 
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><arg><replaceable>
-#: login.1.xml:55(replaceable) login.1.xml:62(replaceable)
-msgid "username"
-msgstr "имя_пользователя"
-
 # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: login.1.xml:56(replaceable)
-msgid "ENV=VAR"
-msgstr "ПЕРЕМЕННАЯ_СРЕДЫ=ЗНАЧЕНИЕ"
-
-# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: login.1.xml:61(replaceable) login.1.xml:67(replaceable)
+#: login.1.xml:83(replaceable) login.1.xml:91(replaceable)
+#: login.1.xml:98(replaceable)
 msgid "host"
 msgstr "хост"
 
-#: login.1.xml:61(arg) chfn.1.xml:27(arg)
+#: login.1.xml:83(arg) login.1.xml:91(arg) chfn.1.xml:56(arg)
 msgid "-h <placeholder-1/>"
 msgstr "-h <placeholder-1/>"
 
-#: login.1.xml:62(arg) chfn.1.xml:24(arg)
-msgid "-f <placeholder-1/>"
-msgstr "-f <placeholder-1/>"
+# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
+#: login.1.xml:86(replaceable)
+msgid "ENV=VAR"
+msgstr "ПЕРЕМЕННАЯ_СРЕДЫ=ЗНАЧЕНИЕ"
 
-#: login.1.xml:67(arg) chfn.1.xml:25(arg)
+# type: Content of: <refentry><refsect1><para><option>
+#: login.1.xml:92(arg) login.1.xml:192(option) expiry.1.xml:54(arg)
+msgid "-f"
+msgstr "-f"
+
+#: login.1.xml:98(arg) chfn.1.xml:54(arg)
 msgid "-r <placeholder-1/>"
 msgstr "-r <placeholder-1/>"
 
-#: login.1.xml:73(para)
+#: login.1.xml:104(para)
 #, fuzzy
 #| msgid ""
 #| "The <command>login</command> program is used to establish a new session "
@@ -5657,7 +6293,7 @@
 "приводит к сообщению об ошибке."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.1.xml:87(para)
+#: login.1.xml:118(para)
 msgid ""
 "The user is then prompted for a password, where appropriate. Echoing is "
 "disabled to prevent revealing the password. Only a small number of password "
@@ -5670,7 +6306,7 @@
 "<command>login</command> закончит работу и прервёт подключение."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.1.xml:94(para)
+#: login.1.xml:125(para)
 msgid ""
 "If password aging has been enabled for your account, you may be prompted for "
 "a new password before proceeding. You will be forced to provide your old "
@@ -5684,7 +6320,7 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: login.1.xml:103(para)
+#: login.1.xml:134(para)
 msgid ""
 "After a successful login, you will be informed of any system messages and "
 "the presence of mail. You may turn off the printing of the system message "
@@ -5702,7 +6338,7 @@
 "\"<emphasis>У вас есть почта.</emphasis>\" или \"<emphasis>У вас нет почты.</"
 "emphasis>\", в зависимости от наполненности почтового ящика."
 
-#: login.1.xml:114(para)
+#: login.1.xml:145(para)
 msgid ""
 "Your user and group ID will be set according to their values in the "
 "<filename>/etc/passwd</filename> file. The value for <envar>$HOME</envar>, "
@@ -5718,7 +6354,7 @@
 "записи пользователя. Также могут быть установлены значения ulimit, umask и "
 "nice из поля GECOS."
 
-#: login.1.xml:123(para)
+#: login.1.xml:154(para)
 msgid ""
 "On some installations, the environmental variable <envar>$TERM</envar> will "
 "be initialized to the terminal type on your tty line, as specified in "
@@ -5729,7 +6365,7 @@
 "filename>."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.1.xml:129(para)
+#: login.1.xml:160(para)
 msgid ""
 "An initialization script for your command interpreter may also be executed. "
 "Please see the appropriate manual section for more information on this "
@@ -5739,7 +6375,7 @@
 "интерпретатора команд. Подробней об этой функции смотрите соответствующую "
 "страницу руководства."
 
-#: login.1.xml:141(para) login.1.xml:212(para)
+#: login.1.xml:172(para) login.1.xml:248(para)
 msgid ""
 "The <command>login</command> program is NOT responsible for removing users "
 "from the utmp file. It is the responsibility of "
@@ -5760,37 +6396,36 @@
 "command>, то пользователь продолжает находиться в системе даже после "
 "завершения работы в \"порождённом сеансе\"."
 
-# type: Content of: <refentry><refsect1><para><option>
-#: login.1.xml:161(option) groupadd.8.xml:27(arg) expiry.1.xml:24(arg)
-msgid "-f"
-msgstr "-f"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.1.xml:164(para)
+#: login.1.xml:195(para)
 msgid "Do not perform authentication, user is preauthenticated."
 msgstr "Не выполнять аутентификацию, пользователь уже прошёл проверку."
 
+#: login.1.xml:198(para)
+msgid "Note: In that case, <replaceable>username</replaceable> is mandatory."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: login.1.xml:170(option)
+#: login.1.xml:206(option)
 msgid "-h"
 msgstr "-h"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.1.xml:173(para)
+#: login.1.xml:209(para)
 msgid "Name of the remote host for this login."
 msgstr "Имя удалённого хоста, на который нужно войти."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.1.xml:181(para)
+#: login.1.xml:217(para)
 msgid "Preserve environment."
 msgstr "Сохранить среду."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.1.xml:189(para)
+#: login.1.xml:225(para)
 msgid "Perform autologin protocol for rlogin."
 msgstr "Выполнить протокол autologin для rlogin."
 
-#: login.1.xml:194(para)
+#: login.1.xml:230(para)
 msgid ""
 "The <option>-r</option>, <option>-h</option> and <option>-f</option> options "
 "are only used when <command>login</command> is invoked by root."
@@ -5800,7 +6435,7 @@
 "суперпользователем."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.1.xml:203(para)
+#: login.1.xml:239(para)
 msgid ""
 "This version of <command>login</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -5810,13 +6445,13 @@
 "машине."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.1.xml:208(para)
+#: login.1.xml:244(para)
 msgid ""
 "The location of files is subject to differences in system configuration."
 msgstr "Расположение файлов может отличаться на разных системах."
 
 # type: Content of: <refentry><refsect1><para>
-#: login.1.xml:224(para)
+#: login.1.xml:260(para)
 #, fuzzy
 msgid ""
 "As with any program, <command>login</command>'s appearance can be faked. If "
@@ -5833,58 +6468,58 @@
 "предотвращения атаки."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: login.1.xml:289(filename)
+#: login.1.xml:325(filename)
 msgid "/var/log/wtmp"
 msgstr "/var/log/wtmp"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.1.xml:291(para)
+#: login.1.xml:327(para)
 msgid "List of previous login sessions."
 msgstr "содержит список завершённых сеансов работы с системой"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: login.1.xml:307(filename)
+#: login.1.xml:343(filename)
 msgid "/etc/motd"
 msgstr "/etc/motd"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.1.xml:309(para)
+#: login.1.xml:345(para)
 msgid "System message of the day file."
 msgstr "содержит системные сообщения за день"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: login.1.xml:313(filename)
+#: login.1.xml:349(filename)
 msgid "/etc/nologin"
 msgstr "/etc/nologin"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.1.xml:315(para)
+#: login.1.xml:351(para)
 msgid "Prevent non-root users from logging in."
 msgstr ""
 "при существовании файла блокируется доступ в систему обычным пользователям"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: login.1.xml:319(filename)
+#: login.1.xml:355(filename)
 msgid "/etc/ttytype"
 msgstr "/etc/ttytype"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.1.xml:321(para)
+#: login.1.xml:357(para)
 msgid "List of terminal types."
 msgstr "содержит список типов терминалов"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: login.1.xml:325(filename)
+#: login.1.xml:361(filename)
 msgid "$HOME/.hushlogin"
 msgstr "$HOME/.hushlogin"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: login.1.xml:327(para)
+#: login.1.xml:363(para)
 msgid "Suppress printing of system messages."
 msgstr ""
 "при существовании файла системные сообщения при входе в систему не выводятся"
 
-#: login.1.xml:335(para)
+#: login.1.xml:371(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -5915,17 +6550,17 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: limits.5.xml:5(refentrytitle) limits.5.xml:10(refname)
+#: limits.5.xml:35(refentrytitle) limits.5.xml:40(refname)
 msgid "limits"
 msgstr "limits"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: limits.5.xml:11(refpurpose)
+#: limits.5.xml:41(refpurpose)
 msgid "resource limits definition"
 msgstr "файл контроля ресурсов"
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:17(para)
+#: limits.5.xml:47(para)
 msgid ""
 "The <emphasis remap=\"I\">limits</emphasis> file (<filename>/etc/limits</"
 "filename> by default or LIMITS_FILE defined <filename>config.h</filename>) "
@@ -5939,7 +6574,7 @@
 "должно быть только у суперпользователя."
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:25(para)
+#: limits.5.xml:55(para)
 msgid ""
 "By default no quota is imposed on 'root'. In fact, there is no way to impose "
 "limits via this procedure to root-equiv accounts (accounts with UID 0)."
@@ -5949,17 +6584,17 @@
 "имеющие права суперпользователя (учётные записи с UID равным 0)."
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:31(para)
+#: limits.5.xml:61(para)
 msgid "Each line describes a limit for a user in the form:"
 msgstr "Каждая строка описывает ограничение для одного пользователя имеет вид:"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: limits.5.xml:34(emphasis)
+#: limits.5.xml:64(emphasis)
 msgid "user LIMITS_STRING"
 msgstr "user СТРОКА_ОГРАНИЧЕНИЙ"
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:37(para)
+#: limits.5.xml:67(para)
 msgid ""
 "The <emphasis>LIMITS_STRING</emphasis> is a string of a concatenated list of "
 "resource limits. Each limit consists of a letter identifier followed by a "
@@ -5970,61 +6605,61 @@
 "буквенного идентификатора и числового значения."
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:43(para)
+#: limits.5.xml:73(para)
 msgid "The valid identifiers are:"
 msgstr "Допустимые идентификаторы:"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:46(para)
+#: limits.5.xml:76(para)
 msgid "A: max address space (KB)"
 msgstr "A: максимальное адресное пространство (КБ)"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:47(para)
+#: limits.5.xml:77(para)
 msgid "C: max core file size (KB)"
 msgstr "C: максимальный размер файла core (КБ)"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:48(para)
+#: limits.5.xml:78(para)
 msgid "D: max data size (KB)"
 msgstr "D: максимальный размер данных (КБ)"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:49(para)
+#: limits.5.xml:79(para)
 msgid "F: maximum filesize (KB)"
 msgstr "F: максимальный размер файла (КБ)"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:50(para)
+#: limits.5.xml:80(para)
 msgid "M: max locked-in-memory address space (KB)"
 msgstr "M: максимальное синхронизируемое адресное пространство памяти (КБ)"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:51(para)
+#: limits.5.xml:81(para)
 msgid "N: max number of open files"
 msgstr "N: максимальное число открытых файлов"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:52(para)
+#: limits.5.xml:82(para)
 msgid "R: max resident set size (KB)"
 msgstr "R: максимальный размер резидентного сегмента (КБ)"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:53(para)
+#: limits.5.xml:83(para)
 msgid "S: max stack size (KB)"
 msgstr "S: максимальный размер стека (КБ)"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:54(para)
+#: limits.5.xml:84(para)
 msgid "T: max CPU time (MIN)"
 msgstr "T: максимальное время использования процессора (минут)"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:55(para)
+#: limits.5.xml:85(para)
 msgid "U: max number of processes"
 msgstr "U: максимальное число процессов"
 
-#: limits.5.xml:56(para)
+#: limits.5.xml:86(para)
 msgid ""
 "K: file creation mask, set by <citerefentry><refentrytitle>umask</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
@@ -6034,12 +6669,12 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: limits.5.xml:61(para)
+#: limits.5.xml:91(para)
 msgid "L: max number of logins for this user"
 msgstr ""
 "L: максимальное число возможных регистраций в системе этого пользователя"
 
-#: limits.5.xml:62(para)
+#: limits.5.xml:92(para)
 msgid ""
 "P: process priority, set by <citerefentry><refentrytitle>setpriority</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
@@ -6048,18 +6683,23 @@
 "<citerefentry><refentrytitle>setpriority</refentrytitle><manvolnum>2</"
 "manvolnum></citerefentry>."
 
-#: limits.5.xml:67(para)
+#: limits.5.xml:97(para)
 msgid "I: max nice value (0..39 which translates to 20..-19)"
 msgstr ""
 
-#: limits.5.xml:69(para)
+#: limits.5.xml:99(para)
 msgid "O: max real time priority"
 msgstr ""
 
-#: limits.5.xml:72(para)
+#: limits.5.xml:102(para)
+#, fuzzy
+#| msgid ""
+#| "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
+#| "<emphasis>LIMITS_STRING </emphasis>. For reading convenience, the "
+#| "following entries are equivalent:"
 msgid ""
 "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
-"<emphasis>LIMITS_STRING </emphasis>. For reading convenience, the following "
+"<emphasis>LIMITS_STRING</emphasis>. For reading convenience, the following "
 "entries are equivalent:"
 msgstr ""
 "Например, значение <emphasis remap=\"I\">L2D2048N5</emphasis> допустимо для "
@@ -6067,7 +6707,7 @@
 "записи эквивалентны:"
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:78(programlisting)
+#: limits.5.xml:108(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -6081,7 +6721,7 @@
 "    "
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:83(para)
+#: limits.5.xml:113(para)
 msgid ""
 "Be aware that after <emphasis remap=\"I\">username</emphasis> the rest of "
 "the line is considered a limit string, thus comments are not allowed. A "
@@ -6093,7 +6733,7 @@
 "Неправильная строка ограничений будет отброшена (не учтена) программой "
 "<command>login</command>."
 
-#: limits.5.xml:90(para)
+#: limits.5.xml:120(para)
 msgid ""
 "The default entry is denoted by username \"<emphasis>*</emphasis>\". If you "
 "have multiple <emphasis remap=\"I\">default</emphasis> entries in your "
@@ -6105,7 +6745,7 @@
 "файле <emphasis>LIMITS_FILE</emphasis>, то будет использоваться последняя."
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:97(para)
+#: limits.5.xml:127(para)
 msgid ""
 "To completely disable limits for a user, a single dash \"<emphasis>-</"
 "emphasis>\" will do."
@@ -6114,7 +6754,7 @@
 "тире \"<emphasis>-</emphasis> \"."
 
 # type: Content of: <refentry><refsect1><para>
-#: limits.5.xml:102(para)
+#: limits.5.xml:132(para)
 msgid ""
 "Also, please note that all limit settings are set PER LOGIN. They are not "
 "global, nor are they permanent. Perhaps global limits will come, but for now "
@@ -6125,11 +6765,11 @@
 "глобальные ограничения и появятся, но пока это только в планах ;)"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: limits.5.xml:113(filename)
+#: limits.5.xml:143(filename)
 msgid "/etc/limits"
 msgstr "/etc/limits"
 
-#: limits.5.xml:121(para)
+#: limits.5.xml:151(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>setpriority</"
@@ -6144,18 +6784,18 @@
 "manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><filename>
-#: lastlog.8.xml:5(refentrytitle) lastlog.8.xml:10(refname)
-#: lastlog.8.xml:16(command)
+#: lastlog.8.xml:35(refentrytitle) lastlog.8.xml:40(refname)
+#: lastlog.8.xml:46(command)
 msgid "lastlog"
 msgstr "lastlog"
 
-#: lastlog.8.xml:11(refpurpose)
+#: lastlog.8.xml:41(refpurpose)
 msgid "reports the most recent login of all users or of a given user"
 msgstr ""
 "выводит отчёт о последней регистрации в системе всех или указанного "
 "пользователя"
 
-#: lastlog.8.xml:25(para)
+#: lastlog.8.xml:55(para)
 msgid ""
 "<command>lastlog</command> formats and prints the contents of the last login "
 "log <filename>/var/log/lastlog</filename> file. The <emphasis>login-name</"
@@ -6172,38 +6812,38 @@
 "пользователей в файле <filename>/etc/passwd</filename>."
 
 # type: Content of: <refentry><refsect1><para>
-#: lastlog.8.xml:37(para)
+#: lastlog.8.xml:67(para)
 msgid "The options which apply to the <command>lastlog</command> command are:"
 msgstr "Параметры команды <command>lastlog</command>:"
 
-#: lastlog.8.xml:42(term)
+#: lastlog.8.xml:72(term)
 msgid ""
 "<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-b</option>, <option>--before</option><replaceable>ДНЕЙ</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: lastlog.8.xml:46(para)
+#: lastlog.8.xml:76(para)
 msgid ""
 "Print only lastlog records older than <emphasis remap=\"I\">DAYS</emphasis>."
 msgstr ""
 "Показать записи lastlog за последние <emphasis remap=\"I\">ДНЕЙ</emphasis>."
 
-#: lastlog.8.xml:60(term) faillog.8.xml:93(term)
+#: lastlog.8.xml:90(term) faillog.8.xml:142(term)
 msgid ""
 "<option>-t</option>, <option>--time</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>ДНЕЙ</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: lastlog.8.xml:65(para)
+#: lastlog.8.xml:95(para)
 msgid ""
 "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</"
 "emphasis>."
 msgstr ""
 "Показать записи lastlog новее чем <emphasis remap=\"I\">ДНЕЙ</emphasis>."
 
-#: lastlog.8.xml:72(term)
+#: lastlog.8.xml:102(term) faillog.8.xml:153(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-K</option>, <option>--key</option><replaceable>KEY</"
@@ -6216,7 +6856,7 @@
 "replaceable>=<replaceable>ЗНАЧЕНИЕ</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: lastlog.8.xml:77(para)
+#: lastlog.8.xml:107(para)
 #, fuzzy
 #| msgid ""
 #| "Print the lastlog record for user with specified <emphasis remap=\"I"
@@ -6226,7 +6866,7 @@
 "Показать запись lastlog только для указанного пользователя с emphasis remap="
 "\"I\">ИМЕНЕМ</emphasis>."
 
-#: lastlog.8.xml:80(para)
+#: lastlog.8.xml:110(para) faillog.8.xml:163(para)
 msgid ""
 "The users can be specified by a login name, a numerical user ID, or a "
 "<replaceable>RANGE</replaceable> of users. This <replaceable>RANGE</"
@@ -6235,7 +6875,7 @@
 "UID_MAX</replaceable>), or a min value (<replaceable>UID_MIN-</replaceable>)."
 msgstr ""
 
-#: lastlog.8.xml:92(para)
+#: lastlog.8.xml:122(para)
 msgid ""
 "If the user has never logged in the message <emphasis>** Never logged in**</"
 "emphasis> will be displayed instead of the port and time."
@@ -6244,14 +6884,20 @@
 "сообщение <emphasis>** Никогда не входил в систему**</emphasis> вместо "
 "названия порта и даты."
 
+#: lastlog.8.xml:127(para)
+msgid ""
+"Only the entries for the current users of the system will be displayed. "
+"Other entries may exist for users that were deleted previously."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><title>
-#: lastlog.8.xml:99(title) groups.1.xml:36(title) chsh.1.xml:77(title)
-#: chage.1.xml:164(title)
+#: lastlog.8.xml:135(title) groups.1.xml:65(title) chsh.1.xml:106(title)
+#: chage.1.xml:193(title)
 msgid "NOTE"
 msgstr "ЗАМЕЧАНИЕ"
 
 # type: Content of: <refentry><refsect1><para>
-#: lastlog.8.xml:100(para)
+#: lastlog.8.xml:136(para)
 msgid ""
 "The <filename>lastlog</filename> file is a database which contains info on "
 "the last login of each user. You should not rotate it. It is a sparse file, "
@@ -6270,17 +6916,17 @@
 "\"."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: lastlog.8.xml:114(filename)
+#: lastlog.8.xml:150(filename)
 msgid "/var/log/lastlog"
 msgstr "/var/log/lastlog"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: lastlog.8.xml:116(para)
+#: lastlog.8.xml:152(para)
 msgid "Database times of previous user logins."
 msgstr "содержит список завершённых сеансов работы с системой"
 
 # type: Content of: <refentry><refsect1><para>
-#: lastlog.8.xml:124(para)
+#: lastlog.8.xml:160(para)
 msgid ""
 "Large gaps in UID numbers will cause the lastlog program to run longer with "
 "no output to the screen (i.e. if in lastlog database there is no entries for "
@@ -6293,17 +6939,17 @@
 "800, то во время обработки UID с 171 по 799 программа кажется повисшей)."
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: gshadow.5.xml:5(refentrytitle) gshadow.5.xml:10(refname)
+#: gshadow.5.xml:33(refentrytitle) gshadow.5.xml:38(refname)
 msgid "gshadow"
 msgstr "gshadow"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: gshadow.5.xml:11(refpurpose)
+#: gshadow.5.xml:39(refpurpose)
 msgid "shadowed group file"
 msgstr "файл с защищаемой информацией о группах"
 
 # type: Content of: <refentry><refsect1><para>
-#: gshadow.5.xml:16(para)
+#: gshadow.5.xml:44(para)
 msgid ""
 "<filename>/etc/gshadow</filename> contains the shadowed information for "
 "group accounts. It contains lines with the following colon-separated fields:"
@@ -6313,21 +6959,21 @@
 "Поля:"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: gshadow.5.xml:23(para)
+#: gshadow.5.xml:51(para)
 msgid "group name"
 msgstr "имя группы"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: gshadow.5.xml:29(para)
+#: gshadow.5.xml:57(para)
 msgid "comma-separated list of group administrators"
 msgstr "список администраторов группы, перечисленных через запятую"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: gshadow.5.xml:32(para)
+#: gshadow.5.xml:60(para)
 msgid "comma-separated list of group members"
 msgstr "список членов группы, перечисленных через запятую"
 
-#: gshadow.5.xml:36(para)
+#: gshadow.5.xml:64(para)
 msgid ""
 "The group name and password fields must be filled. The encrypted password "
 "consists of characters from the 64-character alphabet a thru z, A thru Z, 0 "
@@ -6352,7 +6998,7 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refsect1><para>
-#: gshadow.5.xml:49(para)
+#: gshadow.5.xml:77(para)
 msgid ""
 "This information supersedes any password present in <filename>/etc/group</"
 "filename>."
@@ -6360,28 +7006,43 @@
 "Данная информация заменяет любой пароль файла <filename>/etc/group</"
 "filename>."
 
-#: gshadow.5.xml:80(para)
+#: gshadow.5.xml:108(para)
 #, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>group</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>grpconv</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</manvolnum></"
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: grpck.8.xml:15(refpurpose)
+#: grpck.8.xml:44(refpurpose)
 msgid "verify integrity of group files"
 msgstr "проверяет корректность файлов групп"
 
 # type: Content of: <refentry><refsect1><para>
-#: grpck.8.xml:41(para)
+#: grpck.8.xml:70(para)
 #, fuzzy
 #| msgid ""
 #| "The <command>grpck</command> command verifies the integrity of the system "
@@ -6406,17 +7067,17 @@
 "которых невозможно."
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: grpck.8.xml:58(para)
+#: grpck.8.xml:87(para)
 msgid "a unique group name"
 msgstr "уникальность имени группы"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: grpck.8.xml:61(para)
+#: grpck.8.xml:90(para)
 msgid "a valid list of members and administrators"
 msgstr "корректный список членов и администраторов"
 
 # type: Content of: <refentry><refsect1><para>
-#: grpck.8.xml:65(para)
+#: grpck.8.xml:94(para)
 msgid ""
 "The checks for correct number of fields and unique group name are fatal. If "
 "the entry has the wrong number of fields, the user will be prompted to "
@@ -6435,7 +7096,7 @@
 "предлагается запустить команду <command>groupmod</command> чтобы исправить "
 "ошибку."
 
-#: grpck.8.xml:76(para)
+#: grpck.8.xml:105(para)
 msgid ""
 "The commands which operate on the <filename>/etc/group</filename> file are "
 "not able to alter corrupted or duplicated entries. <command>grpck</command> "
@@ -6447,20 +7108,20 @@
 "испорченной записи."
 
 # type: Content of: <refentry><refsect1><para>
-#: grpck.8.xml:86(para)
+#: grpck.8.xml:115(para)
 #, fuzzy
 #| msgid "The options which apply to the <command>pwck</command> command are:"
 msgid "The options which apply to the <command>grpck</command> command are:"
 msgstr "Параметры команды <command>pwck</command>:"
 
-#: grpck.8.xml:93(para)
+#: grpck.8.xml:122(para)
 msgid ""
 "Execute the <command>grpck</command> command in read-only mode. This causes "
 "all questions regarding changes to be answered <emphasis>no</emphasis> "
 "without user intervention."
 msgstr ""
 
-#: grpck.8.xml:103(para)
+#: grpck.8.xml:132(para)
 #, fuzzy
 #| msgid ""
 #| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
@@ -6472,7 +7133,7 @@
 "Отсортировать все записи в файлах <filename>/etc/passwd</filename> и "
 "<filename>/etc/shadow</filename> по числовому идентификатору пользователя."
 
-#: grpck.8.xml:112(para)
+#: grpck.8.xml:141(para)
 #, fuzzy
 #| msgid ""
 #| "By default, <command>pwck</command> operates on the files <filename>/etc/"
@@ -6492,58 +7153,61 @@
 "указать другие файлы с помощью параметров <emphasis remap=\"I\">passwd</"
 "emphasis> и <emphasis remap=\"I\">shadow</emphasis>"
 
-#: grpck.8.xml:162(para)
+#: grpck.8.xml:191(para)
 #, fuzzy
 #| msgid ""
-#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
-#| "citerefentry>, <citerefentry><refentrytitle>group</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>."
+#| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>login</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum>, </"
-"citerefentry><citerefentry><refentrytitle>passwd</"
+"citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
+"condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum>, </citerefentry><citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>groupmod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>shadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>group</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
+"<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>login</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gshadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: grpck.8.xml:201(para)
+#: grpck.8.xml:233(para)
 msgid "one or more bad group entries"
 msgstr "есть одна или более неправильных записей групп"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: grpck.8.xml:207(para)
+#: grpck.8.xml:239(para)
 msgid "can't open group files"
 msgstr "не удалось открыть файл групп"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: grpck.8.xml:213(para)
+#: grpck.8.xml:245(para)
 msgid "can't lock group files"
 msgstr "не удалось заблокировать файл групп"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: grpck.8.xml:219(para)
+#: grpck.8.xml:251(para)
 msgid "can't update group files"
 msgstr "не удалось изменить файл групп"
 
 # type: Content of: <refentry><refsect1><para>
-#: grpck.8.xml:183(para)
+#: grpck.8.xml:215(para)
 msgid ""
 "The <command>grpck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6552,23 +7216,22 @@
 "значения: <placeholder-1/>"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: groups.1.xml:5(refentrytitle) groups.1.xml:10(refname)
-#: groups.1.xml:16(command)
+#: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
+#: groups.1.xml:45(command)
 msgid "groups"
 msgstr "groups"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: groups.1.xml:11(refpurpose)
+#: groups.1.xml:40(refpurpose)
 msgid "display current group names"
 msgstr "показывает имена групп запустившего программу пользователя"
 
 # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: groups.1.xml:18(replaceable) gpasswd.1.xml:94(replaceable)
-#: gpasswd.1.xml:107(replaceable) chfn.1.xml:29(replaceable)
+#: groups.1.xml:47(replaceable) chfn.1.xml:58(replaceable)
 msgid "user"
 msgstr "имя"
 
-#: groups.1.xml:25(para)
+#: groups.1.xml:54(para)
 msgid ""
 "The <command>groups</command> command displays the current group names or ID "
 "values. If the value does not have a corresponding entry in <filename>/etc/"
@@ -6583,7 +7246,7 @@
 "<emphasis remap=\"I\">имя</emphasis> выводятся группы для учётной записи с "
 "указанным <emphasis remap=\"I\">именем</emphasis>."
 
-#: groups.1.xml:37(para)
+#: groups.1.xml:66(para)
 msgid ""
 "Systems which do not support concurrent group sets will have the information "
 "from <filename>/etc/group</filename> reported. The user must use "
@@ -6595,7 +7258,7 @@
 "своей текущей реальной или эффективной группы пользователь должен "
 "использовать команды <command>newgrp</command> или <command>sg</command>."
 
-#: groups.1.xml:59(para)
+#: groups.1.xml:88(para)
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getgid</"
@@ -6612,15 +7275,15 @@
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: groupmod.8.xml:15(refpurpose)
+#: groupmod.8.xml:44(refpurpose)
 msgid "modify a group definition on the system"
 msgstr "изменяет определение группы в системе"
 
-#: groupmod.8.xml:24(replaceable)
+#: groupmod.8.xml:53(replaceable)
 msgid "GROUP"
 msgstr "ГРУППА"
 
-#: groupmod.8.xml:30(para)
+#: groupmod.8.xml:59(para)
 msgid ""
 "The <command>groupmod</command> command modifies the definition of the "
 "specified <replaceable>GROUP</replaceable> by modifying the appropriate "
@@ -6630,18 +7293,18 @@
 "<replaceable>ГРУППЫ</replaceable>, изменяя соответствующую запись в базе "
 "данных групп."
 
-#: groupmod.8.xml:39(para)
+#: groupmod.8.xml:68(para)
 msgid "The options which apply to the <command>groupmod</command> command are:"
 msgstr "Параметры команды <command>groupmod</command>:"
 
-#: groupmod.8.xml:45(term) groupadd.8.xml:66(term)
+#: groupmod.8.xml:74(term) groupadd.8.xml:92(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupmod.8.xml:49(para)
+#: groupmod.8.xml:78(para)
 #, fuzzy
 msgid ""
 "The group ID of the given <replaceable>GROUP</replaceable> will be changed "
@@ -6659,7 +7322,7 @@
 "системные группы. Изменение принадлежности всех файлов старой группе "
 "необходимо выполнять вручную."
 
-#: groupmod.8.xml:70(term)
+#: groupmod.8.xml:99(term)
 msgid ""
 "<option>-n</option>, <option>--new-name</option><replaceable>NEW_GROUP</"
 "replaceable>"
@@ -6667,7 +7330,7 @@
 "<option>-n</option>, <option>--new-name</option><replaceable>НОВАЯ_ГРУППА</"
 "replaceable>"
 
-#: groupmod.8.xml:75(para)
+#: groupmod.8.xml:104(para)
 msgid ""
 "The name of the group will be changed from <replaceable>GROUP</replaceable> "
 "to <replaceable>NEW_GROUP</replaceable> name."
@@ -6676,7 +7339,7 @@
 "<emphasis remap=\"I\">НОВАЯ_ГРУППА</emphasis>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupmod.8.xml:86(para)
+#: groupmod.8.xml:115(para)
 #, fuzzy
 msgid ""
 "When used with the <option>-g</option> option, allow to change the group "
@@ -6685,7 +7348,7 @@
 "При использовании с параметром <option>-g</option> разрешается изменять "
 "<replaceable>GID</replaceable> группы не уникальным значением."
 
-#: groupmod.8.xml:98(para) groupadd.8.xml:122(para)
+#: groupmod.8.xml:127(para) groupadd.8.xml:148(para)
 #, fuzzy
 #| msgid ""
 #| "The encrypted password, as returned by "
@@ -6701,12 +7364,12 @@
 "citerefentry>. По умолчанию учётная запись заблокирована."
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: groupmod.8.xml:176(para)
+#: groupmod.8.xml:205(para)
 msgid "group name already in use"
 msgstr "такое имя группы уже используется"
 
 # type: Content of: <refentry><refsect1><para>
-#: groupmod.8.xml:140(para)
+#: groupmod.8.xml:169(para)
 msgid ""
 "The <command>groupmod</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6714,7 +7377,7 @@
 "Команда <command>groupmod</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
-#: groupmod.8.xml:191(para)
+#: groupmod.8.xml:220(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6747,34 +7410,38 @@
 "manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: groupmems.8.xml:15(refpurpose)
+#: groupmems.8.xml:44(refpurpose)
 msgid "administer members of a user's primary group"
 msgstr "управляет членами первичной группы пользователя"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
-#: groupmems.8.xml:22(replaceable) groupmems.8.xml:23(replaceable)
-#: groupmems.8.xml:53(replaceable) groupmems.8.xml:59(replaceable)
+#: groupmems.8.xml:51(replaceable) groupmems.8.xml:52(replaceable)
 msgid "user_name"
 msgstr "имя_пользователя"
 
-#: groupmems.8.xml:22(arg)
+#: groupmems.8.xml:51(arg)
 msgid "-a <placeholder-1/>"
 msgstr "-a <placeholder-1/>"
 
-#: groupmems.8.xml:23(arg)
+#: groupmems.8.xml:52(arg)
 msgid "-d <placeholder-1/>"
 msgstr "-d <placeholder-1/>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
-#: groupmems.8.xml:25(replaceable) groupmems.8.xml:71(replaceable)
+#: groupmems.8.xml:53(replaceable)
 msgid "group_name"
 msgstr "имя_группы"
 
-#: groupmems.8.xml:25(arg) groupadd.8.xml:24(arg)
+#: groupmems.8.xml:53(arg)
 msgid "-g <placeholder-1/>"
 msgstr "-g <placeholder-1/>"
 
-#: groupmems.8.xml:32(para)
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
+#: groupmems.8.xml:54(arg)
+msgid "-l"
+msgstr "-l"
+
+#: groupmems.8.xml:61(para)
 msgid ""
 "The <command>groupmems</command> command allows a user to administer his/her "
 "own group membership list without the requirement of superuser privileges. "
@@ -6787,7 +7454,7 @@
 "группы пользователя является группа с именем совпадающим с именем "
 "пользователя (то есть, guest / guest)."
 
-#: groupmems.8.xml:40(para)
+#: groupmems.8.xml:69(para)
 msgid ""
 "Only the superuser, as administrator, can use <command>groupmems</command> "
 "to alter the memberships of other groups."
@@ -6795,59 +7462,101 @@
 "Только суперпользователь как администратор может использовать "
 "<command>groupmems</command>, чтобы изменить список членов не своей группы."
 
-#: groupmems.8.xml:47(para)
+#: groupmems.8.xml:76(para)
 msgid ""
 "The options which apply to the <command>groupmems</command> command are:"
 msgstr "Параметры команды <command>groupmems</command>:"
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: groupmems.8.xml:53(option) gpasswd.1.xml:94(option)
-msgid "-a"
-msgstr "-a"
+#: groupmems.8.xml:82(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+msgid ""
+"<option>-a</option>, <option>--add</option><replaceable>user_name</"
+"replaceable>"
+msgstr ""
+"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupmems.8.xml:55(para)
-msgid "Add a new user to the group membership list."
+#: groupmems.8.xml:84(para)
+#, fuzzy
+#| msgid "Add a new user to the group membership list."
+msgid "Add an user to the group membership list."
 msgstr "Добавить нового пользователя в группу."
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: groupmems.8.xml:59(option) gpasswd.1.xml:107(option)
-msgid "-d"
-msgstr "-d"
+#: groupmems.8.xml:85(para) groupmems.8.xml:101(para)
+#: groupmems.8.xml:126(para)
+msgid ""
+"If the <filename>/etc/gshadow</filename> file exist, and the group has no "
+"entry in the <filename>/etc/gshadow</filename> file, a new entry will be "
+"created."
+msgstr ""
 
+#: groupmems.8.xml:93(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-d</option>, <option>--delete</option><replaceable>user_name</"
+"replaceable>"
+msgstr ""
+"<option>-t</option>, <option>--time</option><replaceable>ДНЕЙ</replaceable>"
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupmems.8.xml:61(para)
+#: groupmems.8.xml:95(para)
 msgid "Delete a user from the group membership list."
 msgstr "Удалить пользователя из группы."
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupmems.8.xml:67(para)
-msgid "Purge all users from the group membership list."
-msgstr "Вычистить всех пользователей из списка членов группы."
+#: groupmems.8.xml:96(para)
+msgid ""
+"If the <filename>/etc/gshadow</filename> file exist, the user will be "
+"removed from the list of members and administrators of the group."
+msgstr ""
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
-#: groupmems.8.xml:71(option)
-msgid "-g"
-msgstr "-g"
+#: groupmems.8.xml:109(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
+msgid ""
+"<option>-g</option>, <option>--group</option><replaceable>group_name</"
+"replaceable>"
+msgstr ""
+"<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupmems.8.xml:73(para)
+#: groupmems.8.xml:111(para)
 msgid "The superuser can specify which group membership list to modify."
 msgstr ""
 "Суперпользователь может указать группу, в которой нужно изменить список "
 "членов."
 
+#: groupmems.8.xml:117(term) chage.1.xml:128(term)
+msgid "<option>-l</option>, <option>--list</option>"
+msgstr "<option>-l</option>, <option>--list</option>"
+
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupmems.8.xml:81(para)
+#: groupmems.8.xml:119(para)
 msgid "List the group membership list."
 msgstr "Показать список членов группы."
 
+#: groupmems.8.xml:123(term)
+#, fuzzy
+#| msgid "<option>-e</option>, <option>--expire</option>"
+msgid "<option>-p</option>, <option>--purge</option>"
+msgstr "<option>-e</option>, <option>--expire</option>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: groupmems.8.xml:125(para)
+msgid "Purge all users from the group membership list."
+msgstr "Вычистить всех пользователей из списка членов группы."
+
 # type: Content of: <refentry><refsect1><title>
-#: groupmems.8.xml:88(title)
+#: groupmems.8.xml:137(title)
 msgid "SETUP"
 msgstr "НАСТРОЙКА"
 
-#: groupmems.8.xml:89(para)
+#: groupmems.8.xml:138(para)
 msgid ""
 "The <command>groupmems</command> executable should be in mode <literal>2770</"
 "literal> as user <emphasis>root</emphasis> and in group <emphasis>groups</"
@@ -6863,7 +7572,7 @@
 "членством в своей группе."
 
 # type: Content of: <refentry><refsect1><programlisting>
-#: groupmems.8.xml:98(programlisting)
+#: groupmems.8.xml:147(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -6881,11 +7590,11 @@
 "    "
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupmems.8.xml:130(para)
+#: groupmems.8.xml:179(para)
 msgid "secure group account information"
 msgstr "содержит защищаемую информацию о группах"
 
-#: groupmems.8.xml:138(para)
+#: groupmems.8.xml:187(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6914,11 +7623,11 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: groupdel.8.xml:15(refpurpose)
+#: groupdel.8.xml:44(refpurpose)
 msgid "delete a group"
 msgstr "удаляет группу"
 
-#: groupdel.8.xml:29(para)
+#: groupdel.8.xml:58(para)
 msgid ""
 "The <command>groupdel</command> command modifies the system account files, "
 "deleting all entries that refer to <emphasis remap=\"I\">group</emphasis>. "
@@ -6929,7 +7638,7 @@
 "emphasis>. Группа с таким именем должна существовать."
 
 # type: Content of: <refentry><refsect1><para>
-#: groupdel.8.xml:34(para)
+#: groupdel.8.xml:63(para)
 msgid ""
 "You must manually check all file systems to insure that no files remain with "
 "the named group as the file group ID."
@@ -6938,7 +7647,7 @@
 "осталось файлов, принадлежащих удалённой группе."
 
 # type: Content of: <refentry><refsect1><para>
-#: groupdel.8.xml:41(para)
+#: groupdel.8.xml:70(para)
 msgid ""
 "You may not remove the primary group of any existing user. You must remove "
 "the user before you remove the group."
@@ -6947,12 +7656,12 @@
 "пользователя. Вы должны удалить пользователя перед тем как удалять группу."
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: groupdel.8.xml:102(para)
+#: groupdel.8.xml:131(para)
 msgid "can't remove user's primary group"
 msgstr "не удалось удалить первичную пользовательскую группу"
 
 # type: Content of: <refentry><refsect1><para>
-#: groupdel.8.xml:78(para)
+#: groupdel.8.xml:107(para)
 msgid ""
 "The <command>groupdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6960,7 +7669,7 @@
 "Программа <command>groupdel</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
-#: groupdel.8.xml:117(para)
+#: groupdel.8.xml:146(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -6993,36 +7702,12 @@
 "manvolnum></citerefentry>"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: groupadd.8.xml:17(refpurpose)
+#: groupadd.8.xml:48(refpurpose)
 msgid "create a new group"
 msgstr "создаёт новую группу"
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
-#: groupadd.8.xml:24(replaceable)
-msgid "GID"
-msgstr "GID"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><option>
-#: groupadd.8.xml:25(arg)
-msgid "-o"
-msgstr "-o"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
-#: groupadd.8.xml:28(replaceable)
-msgid "KEY"
-msgstr "КЛЮЧ"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
-#: groupadd.8.xml:28(replaceable)
-msgid "VALUE"
-msgstr "ЗНАЧЕНИЕ"
-
-#: groupadd.8.xml:28(arg)
-msgid "-K <placeholder-1/>=<placeholder-2/>"
-msgstr "-K <placeholder-1/>=<placeholder-2/>"
-
 # type: Content of: <refentry><refsect1><para>
-#: groupadd.8.xml:37(para)
+#: groupadd.8.xml:63(para)
 #, fuzzy
 msgid ""
 "The <command>groupadd</command> command creates a new group account using "
@@ -7033,11 +7718,11 @@
 "указанным значениям командной строки и системным значениям по умолчанию. "
 "Новая группа будет добавлена в системные файлы."
 
-#: groupadd.8.xml:46(para)
+#: groupadd.8.xml:72(para)
 msgid "The options which apply to the <command>groupadd</command> command are:"
 msgstr "Параметры команды <command>groupadd</command>:"
 
-#: groupadd.8.xml:56(para)
+#: groupadd.8.xml:82(para)
 #, fuzzy
 msgid ""
 "This option causes the command to simply exit with success status if the "
@@ -7051,7 +7736,7 @@
 "g</option> игнорируется)."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupadd.8.xml:70(para)
+#: groupadd.8.xml:96(para)
 msgid ""
 "The numerical value of the group's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. The "
@@ -7066,7 +7751,7 @@
 "зарезервированы под системные группы."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupadd.8.xml:90(para)
+#: groupadd.8.xml:116(para)
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (GID_MIN, GID_MAX "
 "and others). Multiple <option>-K</option> options can be specified."
@@ -7075,7 +7760,7 @@
 "в файле <filename>/etc/login.defs</filename>. Можно указать несколько "
 "параметров <option>-K</option>."
 
-#: groupadd.8.xml:95(para)
+#: groupadd.8.xml:121(para)
 msgid ""
 "Example: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>100</replaceable><option> -K </"
@@ -7085,7 +7770,7 @@
 "replaceable>=<replaceable>100</replaceable><option> -K </"
 "option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 
-#: groupadd.8.xml:99(para)
+#: groupadd.8.xml:125(para)
 msgid ""
 "Note: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</"
@@ -7096,19 +7781,19 @@
 "replaceable>=<replaceable>499</replaceable> пока не работает."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: groupadd.8.xml:111(para)
+#: groupadd.8.xml:137(para)
 #, fuzzy
 msgid "This option permits to add a group with a non-unique GID."
 msgstr "Разрешить добавление группы с не уникальным GID."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: groupadd.8.xml:134(para)
+#: groupadd.8.xml:160(para)
 #, fuzzy
 #| msgid "create a new group"
 msgid "Create a system group."
 msgstr "создаёт новую группу"
 
-#: groupadd.8.xml:137(para)
+#: groupadd.8.xml:163(para)
 msgid ""
 "The numeric identifiers of new system groups are choosen in the "
 "<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
@@ -7117,23 +7802,30 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: groupadd.8.xml:188(para)
+#: groupadd.8.xml:214(para)
+#, fuzzy
+#| msgid ""
+#| "Groupnames must begin with a lower case letter or an underscore, and only "
+#| "lower case letters, underscores, dashes, and dollar signs may follow. In "
+#| "regular expression terms: [a-z_][a-z0-9_-]*[$]"
 msgid ""
 "Groupnames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
-"regular expression terms: [a-z_][a-z0-9_-]*[$]"
+"regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 "Имена групп должны начинаться со строчной буквы или символа подчёркивания. "
 "Они могут содержать только строчные буквы, символ подчёркивания, тире и знак "
 "доллара. Это можно описать регулярным выражением: [a-z_][a-z0-9_-]*[$]"
 
 # type: Content of: <refentry><refsect1><para>
-#: groupadd.8.xml:193(para)
-msgid "Groupnames may only be up to 16 characters long."
+#: groupadd.8.xml:219(para)
+#, fuzzy
+#| msgid "Groupnames may only be up to 16 characters long."
+msgid "Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long."
 msgstr "Имена групп могут быть длиной не более 16 знаков."
 
 # type: Content of: <refentry><refsect1><para>
-#: groupadd.8.xml:196(para)
+#: groupadd.8.xml:222(para)
 #, fuzzy
 msgid ""
 "You may not add a NIS or LDAP group. This must be performed on the "
@@ -7143,7 +7835,7 @@
 "сервере."
 
 # type: Content of: <refentry><refsect1><para>
-#: groupadd.8.xml:200(para)
+#: groupadd.8.xml:226(para)
 #, fuzzy
 msgid ""
 "If the groupname already exists in an external group database such as NIS or "
@@ -7152,17 +7844,17 @@
 "Если имя группы уже существует во внешней базе данных групп, например в NIS, "
 "то <command>groupadd</command> не станет создавать группу."
 
-#: groupadd.8.xml:233(para)
+#: groupadd.8.xml:259(para)
 msgid "GID not unique (when <option>-o</option> not used)"
 msgstr "не уникальный gid (если не задан параметр <option>-o</option>)"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: groupadd.8.xml:239(para)
+#: groupadd.8.xml:265(para)
 msgid "group name not unique"
 msgstr "не уникальное имя группы"
 
 # type: Content of: <refentry><refsect1><para>
-#: groupadd.8.xml:209(para)
+#: groupadd.8.xml:235(para)
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -7170,7 +7862,7 @@
 "Программа <command>groupadd</command> завершая работу, возвращает следующие "
 "значения: <placeholder-1/>"
 
-#: groupadd.8.xml:254(para)
+#: groupadd.8.xml:280(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -7204,27 +7896,27 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:21(phrase)
+#: gpasswd.1.xml:50(phrase)
 #, fuzzy
 msgid "and <placeholder-1/> files"
 msgstr "-a <placeholder-1/>"
 
-#: gpasswd.1.xml:23(phrase)
+#: gpasswd.1.xml:52(phrase)
 msgid "file"
 msgstr ""
 
-#: gpasswd.1.xml:19(refpurpose)
+#: gpasswd.1.xml:48(refpurpose)
 #, fuzzy
 msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
 msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
 # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: gpasswd.1.xml:31(replaceable)
+#: gpasswd.1.xml:60(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "параметры"
 
-#: gpasswd.1.xml:41(para)
+#: gpasswd.1.xml:70(para)
 #, fuzzy
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
@@ -7240,7 +7932,7 @@
 "администратора(ов) и параметр <option>-M</option> для определения списка "
 "членов, а также имеет все права администраторов и членов группы."
 
-#: gpasswd.1.xml:49(para)
+#: gpasswd.1.xml:78(para)
 #, fuzzy
 msgid ""
 "System administrator can use the <option>-A</option> option to define group "
@@ -7255,7 +7947,7 @@
 "администратора(ов) и параметр <option>-M</option> для определения списка "
 "членов, а также имеет все права администраторов и членов группы."
 
-#: gpasswd.1.xml:54(para)
+#: gpasswd.1.xml:83(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -7263,7 +7955,7 @@
 "of the <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:61(para)
+#: gpasswd.1.xml:90(para)
 #, fuzzy
 msgid ""
 "If a password is set the members can still "
@@ -7277,12 +7969,12 @@
 "не члены группы должны ввести пароль."
 
 # type: Content of: <refentry><refsect1><refsect2><title>
-#: gpasswd.1.xml:69(title)
+#: gpasswd.1.xml:98(title)
 msgid "Notes about group passwords"
 msgstr "Замечания о паролях групп"
 
 # type: Content of: <refentry><refsect1><refsect2><para>
-#: gpasswd.1.xml:70(para)
+#: gpasswd.1.xml:99(para)
 msgid ""
 "Group passwords are an inherent security problem since more than one person "
 "is permitted to know the password. However, groups are a useful tool for "
@@ -7292,7 +7984,7 @@
 "более одного человека. Однако, группы являются полезным инструментом "
 "совместной работы различных пользователей."
 
-#: gpasswd.1.xml:81(para)
+#: gpasswd.1.xml:110(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
@@ -7302,79 +7994,115 @@
 "используются только если <command>login</command> запускается "
 "суперпользователем."
 
-#: gpasswd.1.xml:85(para)
+#: gpasswd.1.xml:114(para)
 msgid "The options cannot be combined."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: gpasswd.1.xml:88(para)
+#: gpasswd.1.xml:117(para)
 #, fuzzy
 msgid "The options which apply to the <command>gpasswd</command> command are:"
 msgstr "Параметры команды <command>passwd</command>:"
 
-#: gpasswd.1.xml:97(para)
+#: gpasswd.1.xml:122(term)
 #, fuzzy
+#| msgid ""
+#| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgid ""
+"<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
+msgstr ""
+"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+
+#: gpasswd.1.xml:126(para)
+#, fuzzy
+msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
 "replaceable>."
 msgstr ""
 "Имя группы будет изменено с <emphasis remap=\"I\">ГРУППА</emphasis> на "
 "<emphasis remap=\"I\">НОВАЯ_ГРУППА</emphasis>."
 
-#: gpasswd.1.xml:110(para)
+#: gpasswd.1.xml:135(term)
 #, fuzzy
+#| msgid ""
+#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
+#| "replaceable>"
 msgid ""
+"<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
+msgstr ""
+"<option>-t</option>, <option>--time</option><replaceable>ДНЕЙ</replaceable>"
+
+#: gpasswd.1.xml:139(para)
+#, fuzzy
+msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
 "<replaceable>group</replaceable>."
 msgstr ""
 "Имя группы будет изменено с <emphasis remap=\"I\">ГРУППА</emphasis> на "
 "<emphasis remap=\"I\">НОВАЯ_ГРУППА</emphasis>."
 
-#: gpasswd.1.xml:123(para)
+#: gpasswd.1.xml:148(term)
+#, fuzzy
+#| msgid "<option>-r</option>, <option>--remove</option>"
+msgid "<option>-r</option>, <option>--remove-password</option>"
+msgstr "<option>-r</option>, <option>--remove</option>"
+
+#: gpasswd.1.xml:152(para)
 msgid ""
 "Remove the password from the named <replaceable>group</replaceable>. Only "
 "group members will be allowed to use <command>newgrp</command> to join the "
 "named <replaceable>group</replaceable>."
 msgstr ""
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><option>
-#: gpasswd.1.xml:135(option)
+#: gpasswd.1.xml:163(term)
 #, fuzzy
-msgid "-R"
-msgstr "-"
+#| msgid "<option>-r</option>, <option>--reset</option>"
+msgid "<option>-R</option>, <option>--restrict</option>"
+msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: gpasswd.1.xml:138(para)
+#: gpasswd.1.xml:167(para)
 msgid ""
 "Restrict the access to the named <replaceable>group</replaceable>. Only "
 "group members will be allowed to use <command>newgrp</command> to join the "
 "named <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:149(term)
+#: gpasswd.1.xml:178(term)
 #, fuzzy
-msgid "<option>-A</option><replaceable>user</replaceable>,..."
+#| msgid ""
+#| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-A</option>, <option>--administrators</option><replaceable>user</"
+"replaceable>,..."
 msgstr ""
-"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+"<option>-m</option>, <option>--mindays</option><replaceable>МИН_ДНЕЙ</"
+"replaceable>"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: gpasswd.1.xml:153(para)
+#: gpasswd.1.xml:182(para)
 #, fuzzy
 msgid "Set the list of administrative users."
 msgstr "список администраторов группы, перечисленных через запятую"
 
-#: gpasswd.1.xml:161(term)
+#: gpasswd.1.xml:190(term)
 #, fuzzy
-msgid "<option>-M</option><replaceable>user</replaceable>,..."
+#| msgid ""
+#| "<option>-b</option>, <option>--before</option><replaceable>DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-M</option>, <option>--members</option><replaceable>user</"
+"replaceable>,..."
 msgstr ""
-"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+"<option>-b</option>, <option>--before</option><replaceable>ДНЕЙ</replaceable>"
 
 # type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: gpasswd.1.xml:165(para)
+#: gpasswd.1.xml:194(para)
 #, fuzzy
 msgid "Set the list of group members."
 msgstr "список членов группы, перечисленных через запятую"
 
-#: gpasswd.1.xml:175(para)
+#: gpasswd.1.xml:204(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -7383,7 +8111,7 @@
 "server."
 msgstr ""
 
-#: gpasswd.1.xml:220(para)
+#: gpasswd.1.xml:249(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
@@ -7411,20 +8139,20 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><citerefentry><refentrytitle>
-#: faillog.8.xml:5(refentrytitle) faillog.8.xml:10(refname)
-#: faillog.8.xml:16(command) faillog.5.xml:5(refentrytitle)
-#: faillog.5.xml:10(refname) faillog.5.xml:53(refentrytitle)
+#: faillog.8.xml:34(refentrytitle) faillog.8.xml:39(refname)
+#: faillog.8.xml:45(command) faillog.5.xml:34(refentrytitle)
+#: faillog.5.xml:39(refname) faillog.5.xml:82(refentrytitle)
 msgid "faillog"
 msgstr "faillog"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: faillog.8.xml:11(refpurpose)
+#: faillog.8.xml:40(refpurpose)
 msgid "display faillog records or set login failure limits"
 msgstr ""
 "показывает записи из файла faillog или задаёт предел неудачных попыток входа "
 "в систему"
 
-#: faillog.8.xml:25(para)
+#: faillog.8.xml:54(para)
 msgid ""
 "<command>faillog</command> formats the contents of the failure log from "
 "<filename>/var/log/faillog</filename> database. It also can be used for "
@@ -7440,16 +8168,17 @@
 "имеется хотя бы одна неудачная попытка входа."
 
 # type: Content of: <refentry><refsect1><para>
-#: faillog.8.xml:36(para)
+#: faillog.8.xml:65(para)
 msgid "The options which apply to the <command>faillog</command> command are:"
 msgstr "Параметры команды <command>faillog</command>:"
 
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: faillog.8.xml:44(para)
-msgid "Display faillog records for all users."
-msgstr "Показать записи faillog для всех пользователей."
+#: faillog.8.xml:73(para)
+msgid ""
+"Display (or act on) faillog records for all users having an entry in the "
+"<filename>faillog</filename> database."
+msgstr ""
 
-#: faillog.8.xml:54(term)
+#: faillog.8.xml:86(term)
 msgid ""
 "<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
 "replaceable>"
@@ -7457,76 +8186,115 @@
 "<option>-l</option>, <option>--lock-time</option><replaceable>СЕКУНД</"
 "replaceable>"
 
-#: faillog.8.xml:59(para)
+#: faillog.8.xml:91(para)
 msgid ""
 "Lock account to <replaceable>SEC</replaceable> seconds after failed login."
 msgstr ""
 "Блокировать учётную запись на <replaceable>СЕКУНД</replaceable> после "
 "неудачной попытки входа."
 
-#: faillog.8.xml:66(term)
+#: faillog.8.xml:95(para) faillog.8.xml:121(para) faillog.8.xml:135(para)
 msgid ""
+"Write access to <filename>/var/log/faillog</filename> is required for this "
+"option."
+msgstr ""
+
+#: faillog.8.xml:102(term)
+msgid ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--maximum</option><replaceable>МАКС_ЧИСЛО</"
 "replaceable>"
 
-#: faillog.8.xml:71(para)
+#: faillog.8.xml:107(para)
 msgid ""
 "Set maximum number of login failures after the account is disabled to "
-"<replaceable>MAX</replaceable>. Selecting <replaceable>MAX</replaceable> "
-"value of 0 has the effect of not placing a limit on the number of failed "
-"logins. The maximum failure count should always be 0 for <emphasis>root</"
-"emphasis> to prevent a denial of services attack against the system."
+"<replaceable>MAX</replaceable>."
 msgstr ""
-"Установить максимальное число неудачных попыток входа "
-"равному<replaceable>МАКС_ЧИСЛО</replaceable>, после чего учётная запись "
-"блокируется. Если <replaceable>МАКС_ЧИСЛО</replaceable> равно 0, то "
-"количество неудачных попыток не ограничивается. Максимальное значение "
-"неудачных попыток должно быть всегда равно 0 для <emphasis>root</emphasis>, "
-"для того чтобы предотвратить атаку отказа в обслуживании на систему."
 
-#: faillog.8.xml:82(term)
+#: faillog.8.xml:111(para)
+msgid ""
+"Selecting a <replaceable>MAX</replaceable> value of 0 has the effect of not "
+"placing a limit on the number of failed logins."
+msgstr ""
+
+#: faillog.8.xml:116(para)
+msgid ""
+"The maximum failure count should always be 0 for <emphasis>root</emphasis> "
+"to prevent a denial of services attack against the system."
+msgstr ""
+
+#: faillog.8.xml:128(term)
 msgid "<option>-r</option>, <option>--reset</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: faillog.8.xml:84(para)
+#: faillog.8.xml:130(para)
+#, fuzzy
+#| msgid ""
+#| "Reset the counters of login failures or one record if used with the "
+#| "<option>-u</option><replaceable>LOGIN</replaceable> option. Write access "
+#| "to <filename>/var/log/faillog</filename> is required for this option."
 msgid ""
 "Reset the counters of login failures or one record if used with the <option>-"
-"u</option><replaceable>LOGIN</replaceable> option. Write access to "
-"<filename>/var/log/faillog</filename> is required for this option."
+"u</option><replaceable>LOGIN</replaceable> option."
 msgstr ""
 "Обнулить счётчик неудачных попыток входа для всех записей или для одного "
 "пользователя, заданного параметром <option>-u</option> <replaceable>ИМЯ</"
 "replaceable>. Для этого требуются права на запись в файл <filename>/var/log/"
 "faillog</filename>."
 
-#: faillog.8.xml:97(para)
+#: faillog.8.xml:146(para)
+#, fuzzy
+#| msgid ""
+#| "Display faillog records more recent than <replaceable>DAYS</replaceable>. "
+#| "The <option>-t</option> flag overrides the use of <option>-u</option>."
 msgid ""
-"Display faillog records more recent than <replaceable>DAYS</replaceable>. "
-"The <option>-t</option> flag overrides the use of <option>-u</option>."
+"Display faillog records more recent than <replaceable>DAYS</replaceable>."
 msgstr ""
 "Показать записи faillog новее чем <replaceable>ДНЕЙ</replaceable>. Параметр "
 "<option>-t</option> отменяет действие параметра <option>-u</option>."
 
-#: faillog.8.xml:105(term)
+#: faillog.8.xml:158(para)
+#, fuzzy
+#| msgid ""
+#| "Display faillog record or maintains failure counters and limits (if used "
+#| "with <option>-l</option>, <option>-m</option> or <option>-r</option> "
+#| "options) only for user with <replaceable>LOGIN</replaceable>."
 msgid ""
-"<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>"
-msgstr ""
-"<option>-u</option>, <option>--user</option><replaceable>ИМЯ</replaceable>"
-
-#: faillog.8.xml:109(para)
-msgid ""
 "Display faillog record or maintains failure counters and limits (if used "
 "with <option>-l</option>, <option>-m</option> or <option>-r</option> "
-"options) only for user with <replaceable>LOGIN</replaceable>."
+"options) only for the specified user(s)."
 msgstr ""
 "Показать запись faillog или изменить счётчики и пределы (если задан параметр "
 "<option>-l</option>, <option>-m</option> или <option>-r</option>) только для "
 "учётной записи с <replaceable>ИМЕНЕМ</replaceable>."
 
+#: faillog.8.xml:176(para)
+#, fuzzy
+#| msgid ""
+#| "The <option>-r</option>, <option>-h</option> and <option>-f</option> "
+#| "options are only used when <command>login</command> is invoked by root."
+msgid ""
+"When none of the <option>-l</option>, <option>-m</option>, or <option>-r</"
+"option> options are used, <command>faillog</command> displays the faillog "
+"record of the specified user(s)."
+msgstr ""
+"Параметры <option>-r</option>, <option>-h</option> и <option>-f</option> "
+"используются только если <command>login</command> запускается "
+"суперпользователем."
+
+#: faillog.8.xml:181(para)
+msgid ""
+"NOTE: in display mode, only the records of users which currently exist in "
+"the system are displayed. In the other modes (when the <option>-l</option>, "
+"<option>-m</option>, or <option>-r</option> options are used), the records "
+"of the user, or the range of users, or all the users that may have an entry "
+"in the faillog database will be changed. This is useful to reset records of "
+"users that have been deleted or set a policy in advance for a range of users."
+msgstr ""
+
 # type: Content of: <refentry><refsect1><para>
-#: faillog.8.xml:122(para)
+#: faillog.8.xml:194(para)
 msgid ""
 "<command>faillog</command> only prints out users with no successful login "
 "since the last failure. To print out a user who has had a successful login "
@@ -7540,16 +8308,16 @@
 "специально указать имя пользователя с помощью параметра <option>-a</option>."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: faillog.8.xml:135(filename) faillog.5.xml:41(filename)
+#: faillog.8.xml:207(filename) faillog.5.xml:70(filename)
 msgid "/var/log/faillog"
 msgstr "/var/log/faillog"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: faillog.8.xml:137(para) faillog.5.xml:43(para)
+#: faillog.8.xml:209(para) faillog.5.xml:72(para)
 msgid "Failure logging file."
 msgstr "содержит журнал неудавшихся попыток входа в систему"
 
-#: faillog.8.xml:145(para)
+#: faillog.8.xml:217(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
@@ -7560,12 +8328,12 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: faillog.5.xml:11(refpurpose)
+#: faillog.5.xml:40(refpurpose)
 msgid "login failure logging file"
 msgstr "файл протокола неудачных попыток входа в систему"
 
 # type: Content of: <refentry><refsect1><para>
-#: faillog.5.xml:16(para)
+#: faillog.5.xml:45(para)
 msgid ""
 "<filename>/var/log/faillog</filename> maintains a count of login failures "
 "and the limits for each account. The file is fixed length record, indexed by "
@@ -7586,12 +8354,12 @@
 "заблокирована в случае неудачной регистрации."
 
 # type: Content of: <refentry><refsect1><para>
-#: faillog.5.xml:26(para)
+#: faillog.5.xml:55(para)
 msgid "The structure of the file is:"
 msgstr "Структура файла:"
 
 # type: Content of: <refentry><refsect1><programlisting>
-#: faillog.5.xml:27(programlisting)
+#: faillog.5.xml:56(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -7613,17 +8381,17 @@
 "};"
 
 # type: Content of: <refentry><refsect1><para><command>
-#: expiry.1.xml:11(refentrytitle) expiry.1.xml:16(refname)
-#: expiry.1.xml:22(command)
+#: expiry.1.xml:41(refentrytitle) expiry.1.xml:46(refname)
+#: expiry.1.xml:52(command)
 msgid "expiry"
 msgstr "expiry"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: expiry.1.xml:17(refpurpose)
+#: expiry.1.xml:47(refpurpose)
 msgid "check and enforce password expiration policy"
 msgstr "проверяет и изменяет пароль согласно срокам действия"
 
-#: expiry.1.xml:30(para)
+#: expiry.1.xml:60(para)
 msgid ""
 "The <command>expiry</command> command checks (<option>-c</option>) the "
 "current password expiration and forces (<option>-f</option>) changes when "
@@ -7634,7 +8402,7 @@
 "его (параметр <option>-f</option>), если это требуется. Она может "
 "запускаться обычным пользователем."
 
-#: expiry.1.xml:57(para) chage.1.xml:233(para)
+#: expiry.1.xml:87(para) chage.1.xml:262(para)
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -7645,12 +8413,12 @@
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: chsh.1.xml:17(refpurpose)
+#: chsh.1.xml:46(refpurpose)
 msgid "change login shell"
 msgstr "изменяет регистрационную оболочку пользователя"
 
 # type: Content of: <refentry><refsect1><para>
-#: chsh.1.xml:34(para)
+#: chsh.1.xml:63(para)
 msgid ""
 "The <command>chsh</command> command changes the user login shell. This "
 "determines the name of the user's initial login command. A normal user may "
@@ -7664,12 +8432,12 @@
 "регистрационную оболочку любой учётной записи."
 
 # type: Content of: <refentry><refsect1><para>
-#: chsh.1.xml:45(para)
+#: chsh.1.xml:74(para)
 msgid "The options which apply to the <command>chsh</command> command are:"
 msgstr "Параметры команды <command>chsh</command>:"
 
 # type: Content of: <refentry><refsect1><para>
-#: chsh.1.xml:67(para)
+#: chsh.1.xml:96(para)
 msgid ""
 "If the <option>-s</option> option is not selected, <command>chsh</command> "
 "operates in an interactive fashion, prompting the user with the current "
@@ -7683,7 +8451,7 @@
 "если введена пустая строка, то текущее значение остаётся неизменным. Текущее "
 "значение регистрационной оболочки указано в скобках <emphasis>[ ]</emphasis>."
 
-#: chsh.1.xml:78(para)
+#: chsh.1.xml:107(para)
 msgid ""
 "The only restriction placed on the login shell is that the command name must "
 "be listed in <filename>/etc/shells</filename>, unless the invoker is the "
@@ -7703,16 +8471,16 @@
 "ограниченную оболочку, то не сможет восстановить её первоначальное значение."
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><term><filename>
-#: chsh.1.xml:113(filename)
+#: chsh.1.xml:142(filename)
 msgid "/etc/shells"
 msgstr "/etc/shells"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: chsh.1.xml:115(para)
+#: chsh.1.xml:144(para)
 msgid "List of valid login shells."
 msgstr "содержит список разрешённых регистрационных оболочек"
 
-#: chsh.1.xml:129(para)
+#: chsh.1.xml:158(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -7727,12 +8495,12 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: chpasswd.8.xml:18(refpurpose)
+#: chpasswd.8.xml:47(refpurpose)
 msgid "update passwords in batch mode"
 msgstr "обновляет пароли в пакетном режиме"
 
 # type: Content of: <refentry><refsect1><para>
-#: chpasswd.8.xml:32(para)
+#: chpasswd.8.xml:61(para)
 msgid ""
 "The <command>chpasswd</command> command reads a list of user name and "
 "password pairs from standard input and uses this information to update a "
@@ -7742,7 +8510,7 @@
 "\" из стандартного входного потока и обновляет информацию о существующих "
 "пользователях. Каждая строка имеет вид:"
 
-#: chpasswd.8.xml:37(para)
+#: chpasswd.8.xml:66(para)
 msgid ""
 "<emphasis remap=\"I\">user_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -7751,7 +8519,7 @@
 "\">пароль</emphasis>"
 
 # type: Content of: <refentry><refsect1><para>
-#: chpasswd.8.xml:41(para)
+#: chpasswd.8.xml:70(para)
 #, fuzzy
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
@@ -7762,7 +8530,7 @@
 "Алгоритмом шифрования по умолчанию является DES. Также, если есть срок "
 "устаревания пароля, то он будет обновлён."
 
-#: chpasswd.8.xml:46(para) chgpasswd.8.xml:46(para)
+#: chpasswd.8.xml:75(para) chgpasswd.8.xml:75(para)
 msgid ""
 "The default encryption algorithm can be defined for the system with the "
 "ENCRYPT_METHOD variable of <filename>/etc/login.defs</filename>, and can be "
@@ -7771,7 +8539,7 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: chpasswd.8.xml:52(para) chgpasswd.8.xml:52(para)
+#: chpasswd.8.xml:81(para) chgpasswd.8.xml:81(para)
 msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are created at a single time."
@@ -7779,25 +8547,29 @@
 "Данная команда предназначена для работы в крупных системных средах, где за "
 "один раз заводится несколько учётных записей."
 
-#: chpasswd.8.xml:60(para)
+#: chpasswd.8.xml:89(para)
 msgid "The options which apply to the <command>chpasswd</command> command are:"
 msgstr "Параметры команды <command>chpasswd</command>:"
 
-#: chpasswd.8.xml:76(term) chgpasswd.8.xml:76(term)
+#: chpasswd.8.xml:98(para) chgpasswd.8.xml:98(para)
+msgid "The available methods are DES, MD5, and NONE."
+msgstr ""
+
+#: chpasswd.8.xml:108(term) chgpasswd.8.xml:108(term)
 msgid "<option>-e</option>, <option>--encrypted</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: chpasswd.8.xml:78(para) chgpasswd.8.xml:78(para)
+#: chpasswd.8.xml:110(para) chgpasswd.8.xml:110(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr "Передаваемые пароли заданы в шифрованном виде."
 
-#: chpasswd.8.xml:88(term) chgpasswd.8.xml:88(term)
+#: chpasswd.8.xml:120(term) chgpasswd.8.xml:120(term)
 msgid "<option>-m</option>, <option>--md5</option>"
 msgstr "<option>-m</option>, <option>--md5</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: chpasswd.8.xml:90(para) chgpasswd.8.xml:90(para)
+#: chpasswd.8.xml:122(para) chgpasswd.8.xml:122(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
@@ -7806,7 +8578,7 @@
 "шифрованными."
 
 # type: Content of: <refentry><refsect1><para>
-#: chpasswd.8.xml:126(para) chgpasswd.8.xml:126(para)
+#: chpasswd.8.xml:158(para) chgpasswd.8.xml:158(para)
 msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
@@ -7814,7 +8586,7 @@
 "Не забудьте установить права или umask, чтобы не позволить чтение "
 "нешифрованных файлов другими пользователями."
 
-#: chpasswd.8.xml:178(para)
+#: chpasswd.8.xml:210(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
@@ -7832,12 +8604,12 @@
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: chgpasswd.8.xml:19(refpurpose)
+#: chgpasswd.8.xml:48(refpurpose)
 msgid "update group passwords in batch mode"
 msgstr "обновляет пароли групп в пакетном режиме"
 
 # type: Content of: <refentry><refsect1><para>
-#: chgpasswd.8.xml:33(para)
+#: chgpasswd.8.xml:62(para)
 msgid ""
 "The <command>chgpasswd</command> command reads a list of group name and "
 "password pairs from standard input and uses this information to update a set "
@@ -7847,7 +8619,7 @@
 "из стандартного входного потока и обновляет информацию о существующих "
 "группах. Каждая строка имеет вид:"
 
-#: chgpasswd.8.xml:38(para)
+#: chgpasswd.8.xml:67(para)
 msgid ""
 "<emphasis remap=\"I\">group_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -7856,7 +8628,7 @@
 "emphasis>"
 
 # type: Content of: <refentry><refsect1><para>
-#: chgpasswd.8.xml:42(para)
+#: chgpasswd.8.xml:71(para)
 #, fuzzy
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
@@ -7865,12 +8637,12 @@
 "По умолчанию, передаваемый пароль должен быть в виде обычного текста. "
 "Алгоритмом шифрования по умолчанию является DES."
 
-#: chgpasswd.8.xml:60(para)
+#: chgpasswd.8.xml:89(para)
 msgid ""
 "The options which apply to the <command>chgpasswd</command> command are:"
 msgstr "Параметры команды <command>chgpasswd</command>:"
 
-#: chgpasswd.8.xml:173(para)
+#: chgpasswd.8.xml:205(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
@@ -7886,44 +8658,48 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: chfn.1.xml:18(refpurpose)
+#: chfn.1.xml:47(refpurpose)
 msgid "change real user name and information"
 msgstr "изменяет информацию о пользователе"
 
 # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: chfn.1.xml:24(replaceable)
+#: chfn.1.xml:53(replaceable)
 msgid "full_name"
 msgstr "ФИО"
 
+#: chfn.1.xml:53(arg)
+msgid "-f <placeholder-1/>"
+msgstr "-f <placeholder-1/>"
+
 # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: chfn.1.xml:25(replaceable)
+#: chfn.1.xml:54(replaceable)
 msgid "room_no"
 msgstr "номер комнаты"
 
 # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: chfn.1.xml:26(replaceable)
+#: chfn.1.xml:55(replaceable)
 msgid "work_ph"
 msgstr "рабочий телефон"
 
-#: chfn.1.xml:26(arg)
+#: chfn.1.xml:55(arg)
 msgid "-w <placeholder-1/>"
 msgstr "-w <placeholder-1/>"
 
 # type: Content of: <refentry><refsynopsisdiv><cmdsynopsis><arg><replaceable>
-#: chfn.1.xml:27(replaceable)
+#: chfn.1.xml:56(replaceable)
 msgid "home_ph"
 msgstr "домашний телефон"
 
 # type: Content of: <refentry><refsect1><para><emphasis>
-#: chfn.1.xml:28(replaceable)
+#: chfn.1.xml:57(replaceable)
 msgid "other"
 msgstr "другое"
 
-#: chfn.1.xml:28(arg)
+#: chfn.1.xml:57(arg)
 msgid "-o <placeholder-1/>"
 msgstr "-o <placeholder-1/>"
 
-#: chfn.1.xml:35(para)
+#: chfn.1.xml:64(para)
 msgid ""
 "The <command>chfn</command> command changes user fullname, office number, "
 "office extension, and home phone number information for a user's account. "
@@ -7947,7 +8723,7 @@
 "записи. Кроме того, только суперпользователь может использовать параметр "
 "<option>-o</option> для изменения нестандартизованной части поля GECOS."
 
-#: chfn.1.xml:49(para)
+#: chfn.1.xml:78(para)
 msgid ""
 "These fields must not contain any colons. Except for the <emphasis remap=\"I"
 "\">other</emphasis> field, they should not contain any comma or equal sign. "
@@ -7957,7 +8733,7 @@
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
-#: chfn.1.xml:58(para)
+#: chfn.1.xml:87(para)
 msgid ""
 "If none of the options are selected, <command>chfn</command> operates in an "
 "interactive fashion, prompting the user with the current values for all of "
@@ -7974,7 +8750,7 @@
 "Без параметров, программа <command>chfn</command> изменяет учётную запись "
 "запустившего пользователя."
 
-#: chfn.1.xml:103(para)
+#: chfn.1.xml:132(para)
 msgid ""
 "<citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -7989,18 +8765,18 @@
 "citerefentry>."
 
 # type: Content of: <refentry><refsect1><para><command>
-#: chage.1.xml:5(refentrytitle) chage.1.xml:10(refname)
-#: chage.1.xml:15(command)
+#: chage.1.xml:34(refentrytitle) chage.1.xml:39(refname)
+#: chage.1.xml:44(command)
 msgid "chage"
 msgstr "chage"
 
 # type: Content of: <refentry><refnamediv><refpurpose>
-#: chage.1.xml:11(refpurpose)
+#: chage.1.xml:40(refpurpose)
 msgid "change user password expiry information"
 msgstr "изменяет информацию об устаревании пароля пользователя"
 
 # type: Content of: <refentry><refsect1><para>
-#: chage.1.xml:27(para)
+#: chage.1.xml:56(para)
 msgid ""
 "The <command>chage</command> command changes the number of days between "
 "password changes and the date of the last password change. This information "
@@ -8012,11 +8788,11 @@
 "сменить свой пароль."
 
 # type: Content of: <refentry><refsect1><para>
-#: chage.1.xml:37(para)
+#: chage.1.xml:66(para)
 msgid "The options which apply to the <command>chage</command> command are:"
 msgstr "Параметры команды <command>chage</command>:"
 
-#: chage.1.xml:42(term)
+#: chage.1.xml:71(term)
 msgid ""
 "<option>-d</option>, <option>--lastday</option><replaceable>LAST_DAY</"
 "replaceable>"
@@ -8025,7 +8801,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: chage.1.xml:46(para)
+#: chage.1.xml:75(para)
 msgid ""
 "Set the number of days since January 1st, 1970 when the password was last "
 "changed. The date may also be expressed in the format YYYY-MM-DD (or the "
@@ -8035,7 +8811,7 @@
 "смена пароля. Дата может быть также указана в виде ГГГГ-ММ-ДД (или в форме "
 "согласно региональным настройкам)."
 
-#: chage.1.xml:54(term)
+#: chage.1.xml:83(term)
 msgid ""
 "<option>-E</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -8044,7 +8820,7 @@
 "option><replaceable>ДАТА_УСТАРЕВАНИЯ</replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: chage.1.xml:58(para)
+#: chage.1.xml:87(para)
 msgid ""
 "Set the date or number of days since January 1, 1970 on which the user's "
 "account will no longer be accessible. The date may also be expressed in the "
@@ -8058,7 +8834,7 @@
 "Пользователь, чья учётная запись была заблокирована, должен обратиться к "
 "системному администратору, если хочет в дальнейшем работать с системой."
 
-#: chage.1.xml:66(para)
+#: chage.1.xml:95(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>EXPIRE_DATE</replaceable> will remove an account expiration "
@@ -8068,7 +8844,7 @@
 "<replaceable>ДАТА_УСТАРЕВАНИЯ</replaceable> отменяет устаревание учётной "
 "записи."
 
-#: chage.1.xml:80(term)
+#: chage.1.xml:109(term)
 msgid ""
 "<option>-I</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -8077,7 +8853,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: chage.1.xml:84(para)
+#: chage.1.xml:113(para)
 msgid ""
 "Set the number of days of inactivity after a password has expired before the "
 "account is locked. The <replaceable>INACTIVE</replaceable> option is the "
@@ -8090,7 +8866,7 @@
 "запись была заблокирована, должен обратиться к системному администратору, "
 "если хочет в дальнейшем работать с системой."
 
-#: chage.1.xml:91(para)
+#: chage.1.xml:120(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>INACTIVE</replaceable> will remove an account's inactivity."
@@ -8098,16 +8874,12 @@
 "Указание значения <emphasis remap=\"I\">-1</emphasis> в параметре "
 "<replaceable>ДНЕЙ</replaceable> отменяет неактивность учётной записи."
 
-#: chage.1.xml:99(term)
-msgid "<option>-l</option>, <option>--list</option>"
-msgstr "<option>-l</option>, <option>--list</option>"
-
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: chage.1.xml:103(para)
+#: chage.1.xml:132(para)
 msgid "Show account aging information."
 msgstr "Показать информацию об устаревании учётной записи."
 
-#: chage.1.xml:121(term)
+#: chage.1.xml:150(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -8116,7 +8888,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: chage.1.xml:125(para)
+#: chage.1.xml:154(para)
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
 "<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
@@ -8132,7 +8904,7 @@
 "неожиданностью можно воспользоваться параметром <option>-W</option>, который "
 "активирует выдачу предупреждения о смене пароля пользователя заранее."
 
-#: chage.1.xml:134(para)
+#: chage.1.xml:163(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as "
 "<replaceable>MAX_DAYS</replaceable> will remove checking a password's "
@@ -8141,7 +8913,7 @@
 "Указание значения <emphasis remap=\"I\">-1</emphasis> в параметре "
 "<replaceable>МАКС_ДНЕЙ</replaceable> отменяет проверку пароля."
 
-#: chage.1.xml:142(term)
+#: chage.1.xml:171(term)
 msgid ""
 "<option>-W</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -8150,7 +8922,7 @@
 "replaceable>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: chage.1.xml:146(para)
+#: chage.1.xml:175(para)
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
@@ -8163,7 +8935,7 @@
 "пароля, перед тем как это случится."
 
 # type: Content of: <refentry><refsect1><para>
-#: chage.1.xml:155(para)
+#: chage.1.xml:184(para)
 msgid ""
 "If none of the options are selected, <command>chage</command> operates in an "
 "interactive fashion, prompting the user with the current values for all of "
@@ -8178,7 +8950,7 @@
 "Текущее значение показано в скобках <emphasis>[ ]</emphasis>."
 
 # type: Content of: <refentry><refsect1><para>
-#: chage.1.xml:165(para)
+#: chage.1.xml:194(para)
 msgid ""
 "The <command>chage</command> program requires a shadow password file to be "
 "available."
@@ -8186,7 +8958,7 @@
 "Программа <command>chage</command> требует наличия файла теневых паролей."
 
 # type: Content of: <refentry><refsect1><para>
-#: chage.1.xml:169(para)
+#: chage.1.xml:198(para)
 msgid ""
 "The <command>chage</command> command is restricted to the root user, except "
 "for the <option>-l</option> option, which may be used by an unprivileged "
@@ -8198,17 +8970,17 @@
 "устаревания своего пароля."
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term><replaceable>
-#: chage.1.xml:222(replaceable)
+#: chage.1.xml:251(replaceable)
 msgid "15"
 msgstr "15"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: chage.1.xml:224(para)
+#: chage.1.xml:253(para)
 msgid "can't find the shadow password file"
 msgstr "не удалось найти файл теневых паролей"
 
 # type: Content of: <refentry><refsect1><para>
-#: chage.1.xml:200(para)
+#: chage.1.xml:229(para)
 msgid ""
 "The <command>chage</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -8221,7 +8993,287 @@
 msgid "translator-credits"
 msgstr "Yuri Kozlov <kozlov.y at gmail.com>, 2005, 2006"
 
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #~ msgid ""
+#~ "The group name or number of the user's initial login group. The group "
+#~ "name must exist. A group number must refer to an already existing group. "
+#~ "The default group number is 1 or whatever is specified in <filename>/etc/"
+#~ "default/useradd</filename>."
+#~ msgstr ""
+#~ "Имя или числовой идентификатор новой начальной группы пользователя. "
+#~ "Группа с таким именем должна существовать. Идентификатор группы должен "
+#~ "указывать на уже существующую группу. Идентификатор группы по умолчанию "
+#~ "равен 1 или значению указанному в файле <filename>/etc/default/useradd</"
+#~ "filename>."
+
+# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "The group name or ID for a new user's initial group. The named group must "
+#~ "exist, and a numerical group ID must have an existing entry."
+#~ msgstr ""
+#~ "Имя или числовой идентификатор новой начальной группы пользователя. "
+#~ "Группа с таким именем должна существовать и для числового идентификатора "
+#~ "должна быть запись."
+
+# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#~ msgid "days since Jan 1, 1970 that password was last changed"
+#~ msgstr ""
+#~ "число дней с момента последнего изменения пароля, начиная с 1 января 1970 "
+#~ "года"
+
+# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#~ msgid "days after which password must be changed"
+#~ msgstr "число дней, после которых пароль должен быть изменён"
+
+# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#~ msgid "days before password is to expire that user is warned"
+#~ msgstr ""
+#~ "число дней, за сколько пользователя начнут предупреждать, что пароль "
+#~ "устаревает"
+
+# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#~ msgid "days after password expires that account is disabled"
+#~ msgstr "число дней, после устаревания пароля для блокировки учётной записи"
+
+# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#~ msgid "days since Jan 1, 1970 that account is disabled"
+#~ msgstr ""
+#~ "дней, отсчитывая с 1 января 1970 года, когда учётная запись была "
+#~ "заблокирована"
+
+# type: Content of: <refentry><refsect1><para>
+#, fuzzy
+#~ msgid ""
+#~ "The password field must be filled. The encrypted password consists of 13 "
+#~ "to 24 characters from the 64 character alphabet a thru z, A thru Z, 0 "
+#~ "thru 9, \\. and /. Optionally it can start with a \"$\" character. This "
+#~ "means the encrypted password was generated using another (not DES) "
+#~ "algorithm. For example if it starts with \"$1$\" it means the MD5-based "
+#~ "algorithm was used."
+#~ msgstr ""
+#~ "Поле пароля должно быть заполнено. Шифрованный пароль имеет длину от 13 "
+#~ "до 24 символов и состоит из 64 символов алфавита от a до z, от A до Z, от "
+#~ "0 до 9, \\. и /. Пароль может начинаться с символа \"$\". Это означает, "
+#~ "что шифрованный пароль был сгенерирован с использованием другого (не DES) "
+#~ "алгоритма. Например, если он начинается с \"$1$\", то это означает, что "
+#~ "использовался алгоритм на основе MD5."
+
+# type: Content of: <refentry><refsect1><para>
+#~ msgid ""
+#~ "The date of the last password change is given as the number of days since "
+#~ "Jan 1, 1970. The password may not be changed again until the proper "
+#~ "number of days have passed, and must be changed after the maximum number "
+#~ "of days. If the minimum number of days required is greater than the "
+#~ "maximum number of day allowed, this password may not be changed by the "
+#~ "user."
+#~ msgstr ""
+#~ "Дата последнего изменения пароля задаётся в днях, прошедших с 1 января "
+#~ "1970 года. Пароль не может быть изменён пока не пройдёт положенное число "
+#~ "дней, и должен быть изменён после максимального числа дней. Если "
+#~ "обязательное минимальное число дней больше чем максимальное число дней, "
+#~ "то такой пароль не может быть изменён пользователем."
+
+# type: Content of: <refentry><refsect1><para>
+#~ msgid ""
+#~ "An account is considered to be inactive and is disabled if the password "
+#~ "is not changed within the specified number of days after the password "
+#~ "expires. An account will also be disabled on the specified day regardless "
+#~ "of other password expiration information."
+#~ msgstr ""
+#~ "Учётная запись считается неактивной и будет заблокирована, если пароль не "
+#~ "был изменён за заданное число дней после устаревания пароля. Учётная "
+#~ "запись также будет заблокирована в заданный день, независимо от другой "
+#~ "информации об устаревании пароля."
+
+# type: Content of: <refentry><refsect1><para>
+#~ msgid ""
+#~ "This information supersedes any password or password age information "
+#~ "present in <filename>/etc/passwd</filename>."
+#~ msgstr ""
+#~ "Информация из этого файла заменяет любой пароль или информацию об "
+#~ "устаревании, содержащуюся в файле <filename>/etc/passwd</filename>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>getpwnam</"
+#~ "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>getpwnam</"
+#~ "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "This field must contain the name (or number) of a group. The user will be "
+#~ "added as a member to this group. When a non-existent group name or number "
+#~ "is specified, a new group will be created. In the case of a non-existent "
+#~ "group number, both the name and the number of the new group will be this "
+#~ "number."
+#~ msgstr ""
+#~ "Это поле должно содержать имя (или номер). Пользователь будет добавлен в "
+#~ "эту группу. Если указан числовой идентификатор или имя несуществующей "
+#~ "группы, то будет создана новая группа с данным именем и номером."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "This field will be checked for existence as a directory, and a new "
+#~ "directory with this name will be created if it does not already exist. "
+#~ "The ownership of the directory will be set to be that of the user being "
+#~ "created or updated."
+#~ msgstr ""
+#~ "Будет проверено существование каталога с именем значения данного поля и "
+#~ "если такого каталога нет, то он будет создан. Владельцем каталога будет "
+#~ "назначен обновляемый или создаваемый пользователь."
+
+#, fuzzy
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>."
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
+#~ msgid "-a"
+#~ msgstr "-a"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
+#~ msgid "-d"
+#~ msgstr "-d"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option>
+#~ msgid "-g"
+#~ msgstr "-g"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
+#~ msgid "GID"
+#~ msgstr "GID"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><option>
+#~ msgid "-o"
+#~ msgstr "-o"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
+#~ msgid "KEY"
+#~ msgstr "КЛЮЧ"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><term><replaceable>
+#~ msgid "VALUE"
+#~ msgstr "ЗНАЧЕНИЕ"
+
+#~ msgid "-K <placeholder-1/>=<placeholder-2/>"
+#~ msgstr "-K <placeholder-1/>=<placeholder-2/>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><option>
+#, fuzzy
+#~ msgid "-R"
+#~ msgstr "-"
+
+#, fuzzy
+#~ msgid "<option>-A</option><replaceable>user</replaceable>,..."
+#~ msgstr ""
+#~ "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+
+#, fuzzy
+#~ msgid "<option>-M</option><replaceable>user</replaceable>,..."
+#~ msgstr ""
+#~ "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid "Display faillog records for all users."
+#~ msgstr "Показать записи faillog для всех пользователей."
+
+#~ msgid ""
+#~ "Set maximum number of login failures after the account is disabled to "
+#~ "<replaceable>MAX</replaceable>. Selecting <replaceable>MAX</replaceable> "
+#~ "value of 0 has the effect of not placing a limit on the number of failed "
+#~ "logins. The maximum failure count should always be 0 for <emphasis>root</"
+#~ "emphasis> to prevent a denial of services attack against the system."
+#~ msgstr ""
+#~ "Установить максимальное число неудачных попыток входа "
+#~ "равному<replaceable>МАКС_ЧИСЛО</replaceable>, после чего учётная запись "
+#~ "блокируется. Если <replaceable>МАКС_ЧИСЛО</replaceable> равно 0, то "
+#~ "количество неудачных попыток не ограничивается. Максимальное значение "
+#~ "неудачных попыток должно быть всегда равно 0 для <emphasis>root</"
+#~ "emphasis>, для того чтобы предотвратить атаку отказа в обслуживании на "
+#~ "систему."
+
+#~ msgid ""
+#~ "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
+#~ "replaceable>"
+#~ msgstr ""
+#~ "<option>-u</option>, <option>--user</option><replaceable>ИМЯ</replaceable>"
+
+#~ msgid ""
 #~ "The user's home directory will be created if it does not exist. The files "
 #~ "contained in <replaceable>SKEL_DIR</replaceable> will be copied to the "
 #~ "home directory if the <option>-k</option> option is used, otherwise the "
@@ -8387,27 +9439,6 @@
 #~ "Если программа запущена без параметров, <command>useradd</command> "
 #~ "покажет текущие значения по умолчанию."
 
-#~ msgid ""
-#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>login</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
-#~ msgstr ""
-#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>login</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
-
 # type: Content of: <refentry><refnamediv><refpurpose>
 #~ msgid "administer the <placeholder-1/> file"
 #~ msgstr "управляет файлом <placeholder-1/>"

Modified: upstream/trunk/man/po/sv.po
===================================================================
--- upstream/trunk/man/po/sv.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/man/po/sv.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: man pages for shadow 4.0.18\n"
-"POT-Creation-Date: 2008-05-24 21:02+0200\n"
+"POT-Creation-Date: 2009-04-06 00:48+0200\n"
 "PO-Revision-Date: 2006-12-15 18:09+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -14,74 +14,73 @@
 # This file is distributed under the same license as the shadow package.
 # Daniel Nylander <po at danielnylander.se>, 2006.
 #
-#: vipw.8.xml:9(refentrytitle) vipw.8.xml:14(refname) vipw.8.xml:23(command)
-#: login.defs.5.xml:419(term)
+#: vipw.8.xml:38(refentrytitle) vipw.8.xml:43(refname) vipw.8.xml:52(command)
 msgid "vipw"
 msgstr "vipw"
 
-#: vipw.8.xml:10(manvolnum) usermod.8.xml:11(manvolnum)
-#: userdel.8.xml:13(manvolnum) userdel.8.xml:170(replaceable)
-#: useradd.8.xml:20(manvolnum) pwconv.8.xml:13(manvolnum)
-#: pwck.8.xml:12(manvolnum) nologin.8.xml:6(manvolnum)
-#: newusers.8.xml:22(manvolnum) logoutd.8.xml:6(manvolnum)
-#: lastlog.8.xml:6(manvolnum) grpck.8.xml:10(manvolnum)
-#: groupmod.8.xml:10(manvolnum) groupmems.8.xml:10(manvolnum)
-#: groupdel.8.xml:10(manvolnum) groupdel.8.xml:100(replaceable)
-#: groupadd.8.xml:12(manvolnum) faillog.8.xml:6(manvolnum)
-#: faillog.5.xml:53(manvolnum) chpasswd.8.xml:13(manvolnum)
-#: chgpasswd.8.xml:14(manvolnum)
+#: vipw.8.xml:39(manvolnum) usermod.8.xml:40(manvolnum)
+#: userdel.8.xml:42(manvolnum) userdel.8.xml:199(replaceable)
+#: useradd.8.xml:50(manvolnum) pwconv.8.xml:43(manvolnum)
+#: pwck.8.xml:41(manvolnum) nologin.8.xml:35(manvolnum)
+#: newusers.8.xml:51(manvolnum) logoutd.8.xml:35(manvolnum)
+#: lastlog.8.xml:36(manvolnum) grpck.8.xml:39(manvolnum)
+#: groupmod.8.xml:39(manvolnum) groupmems.8.xml:39(manvolnum)
+#: groupdel.8.xml:39(manvolnum) groupdel.8.xml:129(replaceable)
+#: groupadd.8.xml:43(manvolnum) faillog.8.xml:35(manvolnum)
+#: faillog.5.xml:82(manvolnum) chpasswd.8.xml:42(manvolnum)
+#: chgpasswd.8.xml:43(manvolnum)
 msgid "8"
 msgstr "8"
 
-#: vipw.8.xml:11(refmiscinfo) usermod.8.xml:12(refmiscinfo)
-#: userdel.8.xml:14(refmiscinfo) useradd.8.xml:21(refmiscinfo)
-#: pwconv.8.xml:14(refmiscinfo) pwck.8.xml:13(refmiscinfo)
-#: nologin.8.xml:7(refmiscinfo) newusers.8.xml:23(refmiscinfo)
-#: logoutd.8.xml:7(refmiscinfo) lastlog.8.xml:7(refmiscinfo)
-#: grpck.8.xml:11(refmiscinfo) groupmod.8.xml:11(refmiscinfo)
-#: groupmems.8.xml:11(refmiscinfo) groupdel.8.xml:11(refmiscinfo)
-#: groupadd.8.xml:13(refmiscinfo) faillog.8.xml:7(refmiscinfo)
-#: chpasswd.8.xml:14(refmiscinfo) chgpasswd.8.xml:15(refmiscinfo)
+#: vipw.8.xml:40(refmiscinfo) usermod.8.xml:41(refmiscinfo)
+#: userdel.8.xml:43(refmiscinfo) useradd.8.xml:51(refmiscinfo)
+#: pwconv.8.xml:44(refmiscinfo) pwck.8.xml:42(refmiscinfo)
+#: nologin.8.xml:36(refmiscinfo) newusers.8.xml:52(refmiscinfo)
+#: logoutd.8.xml:36(refmiscinfo) lastlog.8.xml:37(refmiscinfo)
+#: grpck.8.xml:40(refmiscinfo) groupmod.8.xml:40(refmiscinfo)
+#: groupmems.8.xml:40(refmiscinfo) groupdel.8.xml:40(refmiscinfo)
+#: groupadd.8.xml:44(refmiscinfo) faillog.8.xml:36(refmiscinfo)
+#: chpasswd.8.xml:43(refmiscinfo) chgpasswd.8.xml:44(refmiscinfo)
 msgid "System Management Commands"
 msgstr "Systemhanteringskommandon"
 
-#: vipw.8.xml:15(refname) vipw.8.xml:29(command)
+#: vipw.8.xml:44(refname) vipw.8.xml:58(command)
 msgid "vigr"
 msgstr "vigr"
 
-#: vipw.8.xml:16(refpurpose)
+#: vipw.8.xml:45(refpurpose)
 msgid "edit the password, group, shadow-password or shadow-group file"
 msgstr "redigera lösenordet, grupp, skugglösenord eller skuggruppfil"
 
-#: vipw.8.xml:25(replaceable) vipw.8.xml:31(replaceable)
-#: usermod.8.xml:23(replaceable) userdel.8.xml:23(arg)
-#: useradd.8.xml:31(replaceable) useradd.8.xml:43(replaceable)
-#: su.1.xml:37(replaceable) passwd.1.xml:28(replaceable)
-#: lastlog.8.xml:18(replaceable) groupmod.8.xml:22(replaceable)
-#: faillog.8.xml:18(replaceable) chsh.1.xml:24(replaceable)
-#: chpasswd.8.xml:25(replaceable) chgpasswd.8.xml:26(replaceable)
-#: chage.1.xml:17(replaceable)
+#: vipw.8.xml:54(replaceable) vipw.8.xml:60(replaceable)
+#: usermod.8.xml:52(replaceable) userdel.8.xml:52(arg)
+#: useradd.8.xml:61(replaceable) useradd.8.xml:73(replaceable)
+#: su.1.xml:66(replaceable) passwd.1.xml:57(replaceable)
+#: lastlog.8.xml:48(replaceable) groupmod.8.xml:51(replaceable)
+#: groupadd.8.xml:55(replaceable) faillog.8.xml:47(replaceable)
+#: chsh.1.xml:53(replaceable) chpasswd.8.xml:54(replaceable)
+#: chgpasswd.8.xml:55(replaceable) chage.1.xml:46(replaceable)
 msgid "options"
 msgstr "flaggor"
 
-#: vipw.8.xml:37(title) usermod.8.xml:30(title) userdel.8.xml:31(title)
-#: useradd.8.xml:49(title) suauth.5.xml:21(title) su.1.xml:48(title)
-#: sg.1.xml:30(title) shadow.5.xml:15(title) shadow.3.xml:64(title)
-#: shadow.3.xml:120(title) pwconv.8.xml:40(title) pwck.8.xml:52(title)
-#: porttime.5.xml:15(title) passwd.5.xml:15(title) passwd.1.xml:37(title)
-#: nologin.8.xml:21(title) newusers.8.xml:40(title) newgrp.1.xml:26(title)
-#: logoutd.8.xml:21(title) login.defs.5.xml:76(title)
-#: login.access.5.xml:15(title) login.1.xml:72(title) limits.5.xml:16(title)
-#: lastlog.8.xml:24(title) gshadow.5.xml:15(title) grpck.8.xml:40(title)
-#: groups.1.xml:24(title) groupmod.8.xml:29(title) groupmems.8.xml:31(title)
-#: groupdel.8.xml:28(title) groupadd.8.xml:36(title) gpasswd.1.xml:40(title)
-#: faillog.8.xml:24(title) faillog.5.xml:15(title) expiry.1.xml:29(title)
-#: chsh.1.xml:33(title) chpasswd.8.xml:31(title) chgpasswd.8.xml:32(title)
-#: chfn.1.xml:34(title) chage.1.xml:26(title)
+#: vipw.8.xml:66(title) usermod.8.xml:59(title) userdel.8.xml:60(title)
+#: useradd.8.xml:79(title) suauth.5.xml:50(title) su.1.xml:77(title)
+#: sg.1.xml:59(title) shadow.5.xml:44(title) shadow.3.xml:93(title)
+#: shadow.3.xml:149(title) pwconv.8.xml:70(title) pwck.8.xml:81(title)
+#: porttime.5.xml:44(title) passwd.5.xml:44(title) passwd.1.xml:66(title)
+#: nologin.8.xml:50(title) newusers.8.xml:69(title) newgrp.1.xml:55(title)
+#: logoutd.8.xml:50(title) login.defs.5.xml:107(title)
+#: login.access.5.xml:45(title) login.1.xml:103(title) limits.5.xml:46(title)
+#: lastlog.8.xml:54(title) gshadow.5.xml:43(title) grpck.8.xml:69(title)
+#: groups.1.xml:53(title) groupmod.8.xml:58(title) groupmems.8.xml:60(title)
+#: groupdel.8.xml:57(title) groupadd.8.xml:62(title) gpasswd.1.xml:69(title)
+#: faillog.8.xml:53(title) faillog.5.xml:44(title) expiry.1.xml:59(title)
+#: chsh.1.xml:62(title) chpasswd.8.xml:60(title) chgpasswd.8.xml:61(title)
+#: chfn.1.xml:63(title) chage.1.xml:55(title)
 msgid "DESCRIPTION"
 msgstr "BESKRIVNING"
 
-#: vipw.8.xml:38(para)
+#: vipw.8.xml:67(para)
 #, fuzzy
 msgid ""
 "The <command>vipw</command> and <command>vigr</command> commands edits the "
@@ -106,17 +105,17 @@
 "envar> och till sist standardredigeraren, <citerefentry><refentrytitle>vi</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: vipw.8.xml:55(title) usermod.8.xml:38(title) userdel.8.xml:40(title)
-#: useradd.8.xml:62(title) su.1.xml:94(title) pwck.8.xml:104(title)
-#: passwd.1.xml:123(title) newusers.8.xml:98(title) login.1.xml:157(title)
-#: lastlog.8.xml:36(title) grpck.8.xml:85(title) groupmod.8.xml:38(title)
-#: groupmems.8.xml:46(title) groupadd.8.xml:45(title) gpasswd.1.xml:80(title)
-#: faillog.8.xml:35(title) chsh.1.xml:44(title) chpasswd.8.xml:59(title)
-#: chgpasswd.8.xml:59(title) chage.1.xml:36(title)
+#: vipw.8.xml:84(title) usermod.8.xml:67(title) userdel.8.xml:69(title)
+#: useradd.8.xml:97(title) su.1.xml:123(title) pwck.8.xml:133(title)
+#: passwd.1.xml:151(title) newusers.8.xml:221(title) login.1.xml:188(title)
+#: lastlog.8.xml:66(title) grpck.8.xml:114(title) groupmod.8.xml:67(title)
+#: groupmems.8.xml:75(title) groupadd.8.xml:71(title) gpasswd.1.xml:109(title)
+#: faillog.8.xml:64(title) chsh.1.xml:73(title) chpasswd.8.xml:88(title)
+#: chgpasswd.8.xml:88(title) chage.1.xml:65(title)
 msgid "OPTIONS"
 msgstr "FLAGGOR"
 
-#: vipw.8.xml:56(para)
+#: vipw.8.xml:85(para)
 msgid ""
 "The options which apply to the <command>vipw</command> and <command>vigr</"
 "command> commands are:"
@@ -124,249 +123,166 @@
 "Flaggorna som gäller för kommandona <command>vipw</command> och "
 "<command>vigr</command> är:"
 
-#: vipw.8.xml:62(term)
+#: vipw.8.xml:91(term)
 msgid "<option>-g</option>, <option>--group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: vipw.8.xml:64(para)
+#: vipw.8.xml:93(para)
 msgid "Edit group database."
 msgstr "Redigera gruppdatabasen."
 
-#: vipw.8.xml:68(term) userdel.8.xml:70(term) useradd.8.xml:179(term)
-#: passwd.1.xml:163(term) lastlog.8.xml:52(term) groupmod.8.xml:64(term)
-#: groupadd.8.xml:80(term) faillog.8.xml:48(term) chsh.1.xml:50(term)
-#: chpasswd.8.xml:82(term) chgpasswd.8.xml:82(term) chage.1.xml:74(term)
+#: vipw.8.xml:97(term) userdel.8.xml:99(term) useradd.8.xml:247(term)
+#: passwd.1.xml:191(term) lastlog.8.xml:82(term) groupmod.8.xml:93(term)
+#: groupadd.8.xml:106(term) faillog.8.xml:80(term) chsh.1.xml:79(term)
+#: chpasswd.8.xml:114(term) chgpasswd.8.xml:114(term) chage.1.xml:103(term)
 msgid "<option>-h</option>, <option>--help</option>"
 msgstr "<option>-h</option>, <option>--help</option>"
 
-#: vipw.8.xml:70(para) userdel.8.xml:72(para) useradd.8.xml:181(para)
-#: passwd.1.xml:165(para) lastlog.8.xml:56(para) groupmod.8.xml:66(para)
-#: groupadd.8.xml:82(para) faillog.8.xml:50(para) chsh.1.xml:52(para)
-#: chpasswd.8.xml:84(para) chgpasswd.8.xml:84(para) chage.1.xml:76(para)
+#: vipw.8.xml:99(para) userdel.8.xml:101(para) useradd.8.xml:249(para)
+#: passwd.1.xml:193(para) lastlog.8.xml:86(para) groupmod.8.xml:95(para)
+#: groupadd.8.xml:108(para) faillog.8.xml:82(para) chsh.1.xml:81(para)
+#: chpasswd.8.xml:116(para) chgpasswd.8.xml:116(para) chage.1.xml:105(para)
 msgid "Display help message and exit."
 msgstr "Visa hjälpmeddelande och avsluta."
 
-#: vipw.8.xml:74(term)
+#: vipw.8.xml:103(term)
 msgid "<option>-p</option>, <option>--passwd</option>"
 msgstr "<option>-p</option>, <option>--passwd</option>"
 
-#: vipw.8.xml:76(para)
+#: vipw.8.xml:105(para)
 msgid "Edit passwd database."
 msgstr "Redigera lösenordsdatabasen."
 
-#: vipw.8.xml:80(term) passwd.1.xml:218(term)
+#: vipw.8.xml:109(term) passwd.1.xml:258(term)
 msgid "<option>-q</option>, <option>--quiet</option>"
 msgstr "<option>-q</option>, <option>--quiet</option>"
 
-#: vipw.8.xml:82(para) passwd.1.xml:222(para)
+#: vipw.8.xml:111(para) passwd.1.xml:262(para)
 msgid "Quiet mode."
 msgstr "Tyst läge."
 
-#: vipw.8.xml:86(term)
+#: vipw.8.xml:115(term)
 msgid "<option>-s</option>, <option>--shadow</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: vipw.8.xml:88(para)
+#: vipw.8.xml:117(para)
 msgid "Edit shadow or gshadow database."
 msgstr "Redigera shadow- eller gshadow-databasen."
 
-#: vipw.8.xml:95(title) usermod.8.xml:265(title) userdel.8.xml:96(title)
-#: useradd.8.xml:471(title) su.1.xml:196(title) sg.1.xml:47(title)
-#: pwconv.8.xml:116(title) pwck.8.xml:153(title) passwd.1.xml:307(title)
-#: newusers.8.xml:174(title) newgrp.1.xml:58(title) login.1.xml:236(title)
-#: grpck.8.xml:125(title) groupmod.8.xml:109(title) groupmems.8.xml:107(title)
-#: groupdel.8.xml:47(title) groupadd.8.xml:149(title) gpasswd.1.xml:186(title)
-#: chsh.1.xml:91(title) chpasswd.8.xml:139(title) chgpasswd.8.xml:133(title)
-#: chfn.1.xml:70(title)
-msgid "CONFIGURATION"
-msgstr ""
-
-#: vipw.8.xml:96(para) usermod.8.xml:266(para) userdel.8.xml:97(para)
-#: useradd.8.xml:472(para) su.1.xml:197(para) sg.1.xml:48(para)
-#: pwck.8.xml:154(para) passwd.1.xml:308(para) newusers.8.xml:175(para)
-#: newgrp.1.xml:59(para) login.1.xml:237(para) grpck.8.xml:126(para)
-#: groupmod.8.xml:110(para) groupmems.8.xml:108(para) groupdel.8.xml:48(para)
-#: groupadd.8.xml:150(para) gpasswd.1.xml:187(para) chsh.1.xml:92(para)
-#: chpasswd.8.xml:140(para) chgpasswd.8.xml:134(para) chfn.1.xml:71(para)
-msgid ""
-"The following configuration variables in <filename>/etc/login.defs</"
-"filename> change the behavior of this tool:"
-msgstr ""
-
-#: vipw.8.xml:2(term) usermod.8.xml:2(term) userdel.8.xml:2(term)
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) newusers.8.xml:2(term)
-#: login.defs.5.xml:2(term) grpck.8.xml:2(term) groupmod.8.xml:2(term)
-#: groupmems.8.xml:2(term) groupdel.8.xml:2(term) groupadd.8.xml:2(term)
-#: gpasswd.1.xml:2(term) chgpasswd.8.xml:2(term)
-msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
-msgstr ""
-
-#: vipw.8.xml:4(para) usermod.8.xml:4(para) userdel.8.xml:4(para)
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) newusers.8.xml:4(para)
-#: login.defs.5.xml:4(para) grpck.8.xml:4(para) groupmod.8.xml:4(para)
-#: groupmems.8.xml:4(para) groupdel.8.xml:4(para) groupadd.8.xml:4(para)
-#: gpasswd.1.xml:4(para) chgpasswd.8.xml:4(para)
-msgid ""
-"Maximum members per group entry. When the maximum is reached, a new group "
-"entry (line) is started in <filename>/etc/group</filename> (with the same "
-"name, same password, and same GID)."
-msgstr ""
-
-#: vipw.8.xml:9(para) usermod.8.xml:9(para) userdel.8.xml:9(para)
-#: useradd.8.xml:9(para) pwconv.8.xml:9(para) newusers.8.xml:9(para)
-#: login.defs.5.xml:9(para) grpck.8.xml:9(para) groupmod.8.xml:9(para)
-#: groupmems.8.xml:9(para) groupdel.8.xml:9(para) groupadd.8.xml:9(para)
-#: gpasswd.1.xml:9(para) chgpasswd.8.xml:9(para)
-msgid ""
-"The default value is 0, meaning that there are no limits in the number of "
-"members in a group."
-msgstr ""
-
-#. Note: on HP, split groups have the same ID, but different
-#.                names.
-#: vipw.8.xml:15(para) usermod.8.xml:15(para) userdel.8.xml:15(para)
-#: useradd.8.xml:15(para) pwconv.8.xml:15(para) newusers.8.xml:15(para)
-#: login.defs.5.xml:15(para) grpck.8.xml:15(para) groupmod.8.xml:15(para)
-#: groupmems.8.xml:15(para) groupdel.8.xml:15(para) groupadd.8.xml:15(para)
-#: gpasswd.1.xml:15(para) chgpasswd.8.xml:15(para)
-msgid ""
-"This feature (split group) permits to limit the length of lines in the group "
-"file. This is useful to make sure that lines for NIS groups are not larger "
-"than 1024 characters."
-msgstr ""
-
-#: vipw.8.xml:20(para) usermod.8.xml:20(para) userdel.8.xml:20(para)
-#: useradd.8.xml:20(para) pwconv.8.xml:20(para) newusers.8.xml:20(para)
-#: login.defs.5.xml:20(para) grpck.8.xml:20(para) groupmod.8.xml:20(para)
-#: groupmems.8.xml:20(para) groupdel.8.xml:20(para) groupadd.8.xml:20(para)
-#: gpasswd.1.xml:20(para) chgpasswd.8.xml:20(para)
-msgid "If you need to enforce such limit, you can use 25."
-msgstr ""
-
-#: vipw.8.xml:23(para) usermod.8.xml:23(para) userdel.8.xml:23(para)
-#: useradd.8.xml:23(para) pwconv.8.xml:23(para) newusers.8.xml:23(para)
-#: login.defs.5.xml:23(para) grpck.8.xml:23(para) groupmod.8.xml:23(para)
-#: groupmems.8.xml:23(para) groupdel.8.xml:23(para) groupadd.8.xml:23(para)
-#: gpasswd.1.xml:23(para) chgpasswd.8.xml:23(para)
-msgid ""
-"Note: split groups may not be supported by all tools (even in the Shadow "
-"toolsuite. You should not use this variable unless you really need it."
-msgstr ""
-
-#: vipw.8.xml:107(title) usermod.8.xml:278(title) userdel.8.xml:111(title)
-#: useradd.8.xml:493(title) suauth.5.xml:139(title) su.1.xml:224(title)
-#: sg.1.xml:59(title) shadow.5.xml:105(title) shadow.3.xml:172(title)
-#: pwconv.8.xml:138(title) pwck.8.xml:167(title) porttime.5.xml:76(title)
-#: passwd.5.xml:87(title) passwd.1.xml:325(title) newusers.8.xml:197(title)
-#: newgrp.1.xml:70(title) logoutd.8.xml:35(title) login.access.5.xml:66(title)
-#: login.1.xml:280(title) limits.5.xml:110(title) lastlog.8.xml:111(title)
-#: gshadow.5.xml:61(title) grpck.8.xml:137(title) groups.1.xml:46(title)
-#: groupmod.8.xml:121(title) groupmems.8.xml:119(title)
-#: groupdel.8.xml:59(title) groupadd.8.xml:163(title) gpasswd.1.xml:201(title)
-#: faillog.8.xml:132(title) faillog.5.xml:38(title) expiry.1.xml:38(title)
-#: chsh.1.xml:104(title) chpasswd.8.xml:153(title) chgpasswd.8.xml:148(title)
-#: chfn.1.xml:84(title) chage.1.xml:177(title)
+#: vipw.8.xml:124(title) usermod.8.xml:322(title) userdel.8.xml:140(title)
+#: useradd.8.xml:619(title) suauth.5.xml:168(title) su.1.xml:253(title)
+#: sg.1.xml:88(title) shadow.5.xml:230(title) shadow.3.xml:201(title)
+#: pwconv.8.xml:168(title) pwck.8.xml:196(title) porttime.5.xml:105(title)
+#: passwd.5.xml:116(title) passwd.1.xml:367(title) newusers.8.xml:320(title)
+#: newgrp.1.xml:99(title) logoutd.8.xml:64(title) login.access.5.xml:96(title)
+#: login.1.xml:316(title) limits.5.xml:140(title) lastlog.8.xml:147(title)
+#: gshadow.5.xml:89(title) grpck.8.xml:166(title) groups.1.xml:75(title)
+#: groupmod.8.xml:150(title) groupmems.8.xml:168(title)
+#: groupdel.8.xml:88(title) groupadd.8.xml:189(title) gpasswd.1.xml:230(title)
+#: faillog.8.xml:204(title) faillog.5.xml:67(title) expiry.1.xml:68(title)
+#: chsh.1.xml:133(title) chpasswd.8.xml:185(title) chgpasswd.8.xml:180(title)
+#: chfn.1.xml:113(title) chage.1.xml:206(title)
 msgid "FILES"
 msgstr "FILER"
 
-#: vipw.8.xml:110(filename) usermod.8.xml:281(filename)
-#: userdel.8.xml:114(filename) useradd.8.xml:508(filename)
-#: sg.1.xml:74(filename) pwck.8.xml:170(filename) newusers.8.xml:212(filename)
-#: newgrp.1.xml:85(filename) gshadow.5.xml:64(filename)
-#: grpck.8.xml:140(filename) groups.1.xml:49(filename)
-#: groupmod.8.xml:124(filename) groupmems.8.xml:122(filename)
-#: groupdel.8.xml:62(filename) groupadd.8.xml:166(filename)
-#: gpasswd.1.xml:20(filename) gpasswd.1.xml:204(filename)
-#: chgpasswd.8.xml:151(filename)
+#: vipw.8.xml:127(filename) usermod.8.xml:325(filename)
+#: userdel.8.xml:143(filename) useradd.8.xml:634(filename)
+#: sg.1.xml:103(filename) pwck.8.xml:199(filename)
+#: newusers.8.xml:335(filename) newgrp.1.xml:114(filename)
+#: gshadow.5.xml:92(filename) grpck.8.xml:169(filename)
+#: groups.1.xml:78(filename) groupmod.8.xml:153(filename)
+#: groupmems.8.xml:171(filename) groupdel.8.xml:91(filename)
+#: groupadd.8.xml:192(filename) gpasswd.1.xml:49(filename)
+#: gpasswd.1.xml:233(filename) chgpasswd.8.xml:183(filename)
 msgid "/etc/group"
 msgstr "/etc/group"
 
-#: vipw.8.xml:112(para) usermod.8.xml:283(para) userdel.8.xml:116(para)
-#: useradd.8.xml:510(para) sg.1.xml:76(para) pwck.8.xml:172(para)
-#: newusers.8.xml:214(para) newgrp.1.xml:87(para) gshadow.5.xml:66(para)
-#: grpck.8.xml:142(para) groups.1.xml:51(para) groupmod.8.xml:126(para)
-#: groupmems.8.xml:124(para) groupdel.8.xml:64(para) groupadd.8.xml:168(para)
-#: gpasswd.1.xml:206(para) chgpasswd.8.xml:153(para)
+#: vipw.8.xml:129(para) usermod.8.xml:327(para) userdel.8.xml:145(para)
+#: useradd.8.xml:636(para) sg.1.xml:105(para) pwck.8.xml:201(para)
+#: newusers.8.xml:337(para) newgrp.1.xml:116(para) gshadow.5.xml:94(para)
+#: grpck.8.xml:171(para) groups.1.xml:80(para) groupmod.8.xml:155(para)
+#: groupmems.8.xml:173(para) groupdel.8.xml:93(para) groupadd.8.xml:194(para)
+#: gpasswd.1.xml:235(para) chgpasswd.8.xml:185(para)
 msgid "Group account information."
 msgstr "Gruppkontoinformation."
 
-#: vipw.8.xml:116(filename) useradd.8.xml:514(filename) sg.1.xml:80(filename)
-#: newusers.8.xml:218(filename) newgrp.1.xml:91(filename)
-#: gshadow.5.xml:70(filename) grpck.8.xml:146(filename)
-#: groupmod.8.xml:130(filename) groupmems.8.xml:128(filename)
-#: groupdel.8.xml:68(filename) groupadd.8.xml:172(filename)
-#: gpasswd.1.xml:21(filename) gpasswd.1.xml:210(filename)
-#: chgpasswd.8.xml:157(filename)
+#: vipw.8.xml:133(filename) useradd.8.xml:640(filename) sg.1.xml:109(filename)
+#: newusers.8.xml:341(filename) newgrp.1.xml:120(filename)
+#: gshadow.5.xml:98(filename) grpck.8.xml:175(filename)
+#: groupmod.8.xml:159(filename) groupmems.8.xml:177(filename)
+#: groupdel.8.xml:97(filename) groupadd.8.xml:198(filename)
+#: gpasswd.1.xml:50(filename) gpasswd.1.xml:239(filename)
+#: chgpasswd.8.xml:189(filename)
 msgid "/etc/gshadow"
 msgstr "/etc/gshadow"
 
-#: vipw.8.xml:118(para) useradd.8.xml:516(para) sg.1.xml:82(para)
-#: newusers.8.xml:220(para) newgrp.1.xml:93(para) gshadow.5.xml:72(para)
-#: grpck.8.xml:148(para) groupmod.8.xml:132(para) groupdel.8.xml:70(para)
-#: groupadd.8.xml:174(para) gpasswd.1.xml:212(para) chgpasswd.8.xml:159(para)
+#: vipw.8.xml:135(para) useradd.8.xml:642(para) sg.1.xml:111(para)
+#: newusers.8.xml:343(para) newgrp.1.xml:122(para) gshadow.5.xml:100(para)
+#: grpck.8.xml:177(para) groupmod.8.xml:161(para) groupdel.8.xml:99(para)
+#: groupadd.8.xml:200(para) gpasswd.1.xml:241(para) chgpasswd.8.xml:191(para)
 msgid "Secure group account information."
 msgstr "Säker gruppkontoinformation."
 
-#: vipw.8.xml:122(filename) usermod.8.xml:287(filename)
-#: userdel.8.xml:126(filename) useradd.8.xml:496(filename)
-#: su.1.xml:227(filename) sg.1.xml:62(filename) shadow.5.xml:108(filename)
-#: pwck.8.xml:176(filename) passwd.5.xml:90(filename)
-#: passwd.1.xml:328(filename) newusers.8.xml:200(filename)
-#: newgrp.1.xml:73(filename) login.1.xml:295(filename)
-#: grpck.8.xml:152(filename) expiry.1.xml:41(filename)
-#: chsh.1.xml:107(filename) chpasswd.8.xml:156(filename)
-#: chfn.1.xml:93(filename) chage.1.xml:181(filename)
+#: vipw.8.xml:139(filename) usermod.8.xml:331(filename)
+#: userdel.8.xml:155(filename) useradd.8.xml:622(filename)
+#: su.1.xml:256(filename) sg.1.xml:91(filename) shadow.5.xml:233(filename)
+#: pwck.8.xml:205(filename) passwd.5.xml:119(filename)
+#: passwd.1.xml:370(filename) newusers.8.xml:323(filename)
+#: newgrp.1.xml:102(filename) login.1.xml:331(filename)
+#: grpck.8.xml:181(filename) expiry.1.xml:71(filename)
+#: chsh.1.xml:136(filename) chpasswd.8.xml:188(filename)
+#: chfn.1.xml:122(filename) chage.1.xml:210(filename)
 msgid "/etc/passwd"
 msgstr "/etc/passwd"
 
-#: vipw.8.xml:124(para) usermod.8.xml:289(para) userdel.8.xml:128(para)
-#: useradd.8.xml:498(para) su.1.xml:229(para) sg.1.xml:64(para)
-#: shadow.5.xml:110(para) pwck.8.xml:178(para) passwd.5.xml:92(para)
-#: passwd.1.xml:330(para) newusers.8.xml:202(para) newgrp.1.xml:75(para)
-#: login.1.xml:297(para) grpck.8.xml:154(para) expiry.1.xml:43(para)
-#: chsh.1.xml:109(para) chpasswd.8.xml:158(para) chfn.1.xml:95(para)
-#: chage.1.xml:184(para)
+#: vipw.8.xml:141(para) usermod.8.xml:333(para) userdel.8.xml:157(para)
+#: useradd.8.xml:624(para) su.1.xml:258(para) sg.1.xml:93(para)
+#: shadow.5.xml:235(para) pwck.8.xml:207(para) passwd.5.xml:121(para)
+#: passwd.1.xml:372(para) newusers.8.xml:325(para) newgrp.1.xml:104(para)
+#: login.1.xml:333(para) grpck.8.xml:183(para) expiry.1.xml:73(para)
+#: chsh.1.xml:138(para) chpasswd.8.xml:190(para) chfn.1.xml:124(para)
+#: chage.1.xml:213(para)
 msgid "User account information."
 msgstr "Användarkontoinformation."
 
-#: vipw.8.xml:128(filename) usermod.8.xml:293(filename)
-#: userdel.8.xml:132(filename) useradd.8.xml:502(filename)
-#: su.1.xml:233(filename) sg.1.xml:68(filename) shadow.5.xml:114(filename)
-#: shadow.3.xml:175(filename) pwck.8.xml:182(filename)
-#: passwd.5.xml:96(filename) passwd.1.xml:334(filename)
-#: newusers.8.xml:206(filename) newgrp.1.xml:79(filename)
-#: login.1.xml:301(filename) expiry.1.xml:47(filename)
-#: chpasswd.8.xml:162(filename) chage.1.xml:189(filename)
+#: vipw.8.xml:145(filename) usermod.8.xml:337(filename)
+#: userdel.8.xml:161(filename) useradd.8.xml:628(filename)
+#: su.1.xml:262(filename) sg.1.xml:97(filename) shadow.5.xml:239(filename)
+#: shadow.3.xml:204(filename) pwck.8.xml:211(filename)
+#: passwd.5.xml:125(filename) passwd.1.xml:376(filename)
+#: newusers.8.xml:329(filename) newgrp.1.xml:108(filename)
+#: login.1.xml:337(filename) expiry.1.xml:77(filename)
+#: chpasswd.8.xml:194(filename) chage.1.xml:218(filename)
 msgid "/etc/shadow"
 msgstr "/etc/shadow"
 
-#: vipw.8.xml:130(para) usermod.8.xml:295(para) userdel.8.xml:134(para)
-#: useradd.8.xml:504(para) su.1.xml:235(para) sg.1.xml:70(para)
-#: shadow.5.xml:116(para) shadow.3.xml:177(para) pwck.8.xml:184(para)
-#: passwd.1.xml:336(para) newusers.8.xml:208(para) newgrp.1.xml:81(para)
-#: login.1.xml:303(para) expiry.1.xml:49(para) chpasswd.8.xml:164(para)
-#: chage.1.xml:192(para)
+#: vipw.8.xml:147(para) usermod.8.xml:339(para) userdel.8.xml:163(para)
+#: useradd.8.xml:630(para) su.1.xml:264(para) sg.1.xml:99(para)
+#: shadow.5.xml:241(para) shadow.3.xml:206(para) pwck.8.xml:213(para)
+#: passwd.1.xml:378(para) newusers.8.xml:331(para) newgrp.1.xml:110(para)
+#: login.1.xml:339(para) expiry.1.xml:79(para) chpasswd.8.xml:196(para)
+#: chage.1.xml:221(para)
 msgid "Secure user account information."
 msgstr "Säker användarkontoinformation."
 
-#: vipw.8.xml:137(title) usermod.8.xml:302(title) userdel.8.xml:213(title)
-#: useradd.8.xml:610(title) suauth.5.xml:168(title) su.1.xml:242(title)
-#: sg.1.xml:89(title) shadow.5.xml:123(title) shadow.3.xml:184(title)
-#: pwconv.8.xml:150(title) pwck.8.xml:191(title) porttime.5.xml:88(title)
-#: passwd.5.xml:105(title) passwd.1.xml:394(title) nologin.8.xml:35(title)
-#: newusers.8.xml:233(title) newgrp.1.xml:100(title)
-#: login.defs.5.xml:445(title) login.access.5.xml:78(title)
-#: login.1.xml:334(title) limits.5.xml:120(title) gshadow.5.xml:79(title)
-#: grpck.8.xml:161(title) groups.1.xml:58(title) groupmod.8.xml:190(title)
-#: groupmems.8.xml:137(title) groupdel.8.xml:116(title)
-#: groupadd.8.xml:253(title) gpasswd.1.xml:219(title) faillog.8.xml:144(title)
-#: faillog.5.xml:50(title) expiry.1.xml:56(title) chsh.1.xml:128(title)
-#: chpasswd.8.xml:177(title) chgpasswd.8.xml:172(title) chfn.1.xml:102(title)
-#: chage.1.xml:232(title)
+#: vipw.8.xml:154(title) usermod.8.xml:346(title) userdel.8.xml:242(title)
+#: useradd.8.xml:736(title) suauth.5.xml:197(title) su.1.xml:271(title)
+#: sg.1.xml:118(title) shadow.5.xml:248(title) shadow.3.xml:213(title)
+#: pwconv.8.xml:180(title) pwck.8.xml:220(title) porttime.5.xml:117(title)
+#: passwd.5.xml:134(title) passwd.1.xml:436(title) nologin.8.xml:64(title)
+#: newusers.8.xml:356(title) newgrp.1.xml:129(title)
+#: login.defs.5.xml:471(title) login.access.5.xml:108(title)
+#: login.1.xml:370(title) limits.5.xml:150(title) gshadow.5.xml:107(title)
+#: grpck.8.xml:190(title) groups.1.xml:87(title) groupmod.8.xml:219(title)
+#: groupmems.8.xml:186(title) groupdel.8.xml:145(title)
+#: groupadd.8.xml:279(title) gpasswd.1.xml:248(title) faillog.8.xml:216(title)
+#: faillog.5.xml:79(title) expiry.1.xml:86(title) chsh.1.xml:157(title)
+#: chpasswd.8.xml:209(title) chgpasswd.8.xml:204(title) chfn.1.xml:131(title)
+#: chage.1.xml:261(title)
 msgid "SEE ALSO"
 msgstr "SE OCKSÅ"
 
-#: vipw.8.xml:138(para)
+#: vipw.8.xml:155(para)
 msgid ""
 "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>group</"
@@ -386,23 +302,22 @@
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: usermod.8.xml:10(refentrytitle) usermod.8.xml:15(refname)
-#: usermod.8.xml:21(command) login.defs.5.xml:411(term)
+#: usermod.8.xml:39(refentrytitle) usermod.8.xml:44(refname)
+#: usermod.8.xml:50(command) login.defs.5.xml:443(term)
 msgid "usermod"
 msgstr "usermod"
 
-#: usermod.8.xml:16(refpurpose)
+#: usermod.8.xml:45(refpurpose)
 msgid "modify a user account"
 msgstr "ändra ett användarkonto"
 
-#: usermod.8.xml:25(replaceable) userdel.8.xml:25(replaceable)
-#: useradd.8.xml:33(replaceable) su.1.xml:41(replaceable)
-#: passwd.1.xml:31(replaceable) chsh.1.xml:27(replaceable)
-#: chage.1.xml:20(replaceable)
+#: usermod.8.xml:54(replaceable) userdel.8.xml:54(replaceable)
+#: useradd.8.xml:63(replaceable) passwd.1.xml:60(replaceable)
+#: chsh.1.xml:56(replaceable) chage.1.xml:49(replaceable)
 msgid "LOGIN"
 msgstr "INLOGGNINGSNAMN"
 
-#: usermod.8.xml:31(para)
+#: usermod.8.xml:60(para)
 msgid ""
 "The <command>usermod</command> command modifies the system account files to "
 "reflect the changes that are specified on the command line."
@@ -410,15 +325,15 @@
 "Kommandot <command>usermod</command> ändrar systemkontofiler enligt det som "
 "anges på kommandoraden."
 
-#: usermod.8.xml:39(para)
+#: usermod.8.xml:68(para)
 msgid "The options which apply to the <command>usermod</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>usermod</command> är:"
 
-#: usermod.8.xml:45(term)
+#: usermod.8.xml:74(term)
 msgid "<option>-a</option>, <option>--append</option>"
 msgstr "<option>-a</option>, <option>--append</option>"
 
-#: usermod.8.xml:49(para)
+#: usermod.8.xml:78(para)
 msgid ""
 "Add the user to the supplemental group(s). Use only with <option>-G</option> "
 "option."
@@ -426,7 +341,7 @@
 "Lägg till användaren till tilläggsgrupp(er). Använd endast med flaggan "
 "<option>-G</option>."
 
-#: usermod.8.xml:56(term) useradd.8.xml:83(term)
+#: usermod.8.xml:85(term) useradd.8.xml:125(term)
 msgid ""
 "<option>-c</option>, <option>--comment</option><replaceable>COMMENT</"
 "replaceable>"
@@ -434,7 +349,7 @@
 "<option>-c</option>, <option>--comment</option><replaceable>KOMMENTAR</"
 "replaceable>"
 
-#: usermod.8.xml:61(para)
+#: usermod.8.xml:90(para)
 msgid ""
 "The new value of the user's password file comment field. It is normally "
 "modified using the <citerefentry><refentrytitle>chfn</"
@@ -444,7 +359,7 @@
 "ändras det med verktyget <citerefentry><refentrytitle>chfn</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>."
 
-#: usermod.8.xml:70(term) useradd.8.xml:96(term)
+#: usermod.8.xml:99(term) useradd.8.xml:138(term)
 msgid ""
 "<option>-d</option>, <option>--home</option><replaceable>HOME_DIR</"
 "replaceable>"
@@ -452,14 +367,20 @@
 "<option>-d</option>, <option>--home</option><replaceable>HEM_KAT</"
 "replaceable>"
 
-#: usermod.8.xml:75(para)
+#: usermod.8.xml:104(para)
+#, fuzzy
+#| msgid "user home directory"
+msgid "The user's new login directory."
+msgstr "användarens hemkatalog"
+
+#: usermod.8.xml:107(para)
 msgid ""
-"The user's new login directory. If the <option>-m</option> option is given "
-"the contents of the current home directory will be moved to the new home "
-"directory, which is created if it does not already exist."
+"If the <option>-m</option> option is given the contents of the current home "
+"directory will be moved to the new home directory, which is created if it "
+"does not already exist."
 msgstr ""
 
-#: usermod.8.xml:84(term) useradd.8.xml:123(term) useradd.8.xml:394(term)
+#: usermod.8.xml:116(term) useradd.8.xml:165(term) useradd.8.xml:494(term)
 msgid ""
 "<option>-e</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -467,13 +388,13 @@
 "<option>-e</option>, <option>--expiredate</option><replaceable>UTGÅNGSDATUM</"
 "replaceable>"
 
-#: usermod.8.xml:89(para) useradd.8.xml:128(para)
+#: usermod.8.xml:121(para) useradd.8.xml:170(para)
 msgid ""
 "The date on which the user account will be disabled. The date is specified "
 "in the format <emphasis remap=\"I\">YYYY-MM-DD</emphasis>."
 msgstr ""
 
-#: usermod.8.xml:96(term) useradd.8.xml:135(term) useradd.8.xml:403(term)
+#: usermod.8.xml:128(term) useradd.8.xml:183(term) useradd.8.xml:507(term)
 msgid ""
 "<option>-f</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -481,27 +402,38 @@
 "<option>-f</option>, <option>--inactive</option><replaceable>INAKTIV</"
 "replaceable>"
 
-#: usermod.8.xml:101(para) useradd.8.xml:140(para)
+#: usermod.8.xml:133(para)
+#, fuzzy
+#| msgid ""
+#| "The number of days after a password has expired before the account will "
+#| "be disabled."
 msgid ""
 "The number of days after a password expires until the account is permanently "
-"disabled. A value of 0 disables the account as soon as the password has "
-"expired, and a value of -1 disables the feature. The default value is -1."
+"disabled."
 msgstr ""
+"Antalet dagar efter att ett lösenord har gått ut innan kontot kommer att "
+"inaktiveras."
 
-#: usermod.8.xml:110(term) useradd.8.xml:149(term) useradd.8.xml:415(term)
+#: usermod.8.xml:137(para)
 msgid ""
+"A value of 0 disables the account as soon as the password has expired, and a "
+"value of -1 disables the feature. The default value is -1."
+msgstr ""
+
+#: usermod.8.xml:145(term) useradd.8.xml:203(term) useradd.8.xml:523(term)
+msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GROUP</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GRUPP</replaceable>"
 
-#: usermod.8.xml:115(para)
+#: usermod.8.xml:150(para)
 msgid ""
 "The group name or number of the user's new initial login group. The group "
 "name must exist. A group number must refer to an already existing group. The "
 "default group number is 1."
 msgstr ""
 
-#: usermod.8.xml:123(term) useradd.8.xml:163(term)
+#: usermod.8.xml:158(term) useradd.8.xml:231(term)
 msgid ""
 "<option>-G</option>, <option>--groups</option><replaceable>GROUP1</"
 "replaceable>[<emphasis remap=\"I\">,GROUP2,...</emphasis>[<emphasis remap=\"I"
@@ -511,38 +443,43 @@
 "replaceable>[<emphasis remap=\"I\">,GRUPP2,...</emphasis>[<emphasis remap=\"I"
 "\">,GRUPPN</emphasis>]]]"
 
-#: usermod.8.xml:128(para)
+#: usermod.8.xml:163(para)
 msgid ""
 "A list of supplementary groups which the user is also a member of. Each "
 "group is separated from the next by a comma, with no intervening whitespace. "
 "The groups are subject to the same restrictions as the group given with the "
-"<option>-g</option> option. If the user is currently a member of a group "
-"which is not listed, the user will be removed from the group. This behaviour "
-"can be changed via the <option>-a</option> option, which appends the user to "
-"the current supplementary group list."
+"<option>-g</option> option."
 msgstr ""
 
-#: usermod.8.xml:141(term)
+#: usermod.8.xml:170(para)
 msgid ""
+"If the user is currently a member of a group which is not listed, the user "
+"will be removed from the group. This behaviour can be changed via the "
+"<option>-a</option> option, which appends the user to the current "
+"supplementary group list."
+msgstr ""
+
+#: usermod.8.xml:179(term)
+msgid ""
 "<option>-l</option>, <option>--login</option><replaceable>NEW_LOGIN</"
 "replaceable>"
 msgstr ""
 "<option>-l</option>, <option>--login</"
 "option><replaceable>NYTT_INLOGGNINGSNAMN</replaceable>"
 
-#: usermod.8.xml:146(para)
+#: usermod.8.xml:184(para)
 msgid ""
-"The name of the user will be changed from <emphasis remap=\"I\">LOGIN</"
-"emphasis> to <emphasis remap=\"I\">NEW_LOGIN</emphasis>. Nothing else is "
-"changed. In particular, the user's home directory name should probably be "
-"changed manually to reflect the new login name."
+"The name of the user will be changed from <replaceable>LOGIN</replaceable> "
+"to <replaceable>NEW_LOGIN</replaceable>. Nothing else is changed. In "
+"particular, the user's home directory name should probably be changed "
+"manually to reflect the new login name."
 msgstr ""
 
-#: usermod.8.xml:156(term)
+#: usermod.8.xml:194(term)
 msgid "<option>-L</option>, <option>--lock</option>"
 msgstr "<option>-L</option>, <option>--lock</option>"
 
-#: usermod.8.xml:160(para)
+#: usermod.8.xml:198(para)
 msgid ""
 "Lock a user's password. This puts a '!' in front of the encrypted password, "
 "effectively disabling the password. You can't use this option with <option>-"
@@ -552,26 +489,26 @@
 "krypterade lösenordet som effektivt inaktiverar lösenordet. Du kan inte "
 "använda denna flagga med <option>-p</option> eller <option>-U</option>."
 
-#: usermod.8.xml:166(para)
+#: usermod.8.xml:204(para)
 msgid ""
 "Note: if you wish to lock the account (not only access with a password), you "
 "should also set the <replaceable>EXPIRE_DATE</replaceable> to "
 "<replaceable>1</replaceable>."
 msgstr ""
 
-#: usermod.8.xml:175(term) useradd.8.xml:282(term) groupmod.8.xml:82(term)
-#: groupadd.8.xml:107(term)
+#: usermod.8.xml:213(term) useradd.8.xml:364(term) groupmod.8.xml:111(term)
+#: groupadd.8.xml:133(term)
 msgid "<option>-o</option>, <option>--non-unique</option>"
 msgstr "<option>-o</option>, <option>--non-unique</option>"
 
-#: usermod.8.xml:179(para)
+#: usermod.8.xml:217(para)
 msgid ""
 "When used with the <option>-u</option> option, this option allows to change "
 "the user ID to a non-unique value."
 msgstr ""
 
-#: usermod.8.xml:186(term) useradd.8.xml:290(term) groupmod.8.xml:93(term)
-#: groupadd.8.xml:117(term)
+#: usermod.8.xml:224(term) useradd.8.xml:376(term) groupmod.8.xml:122(term)
+#: groupadd.8.xml:143(term)
 msgid ""
 "<option>-p</option>, <option>--password</option><replaceable>PASSWORD</"
 "replaceable>"
@@ -579,7 +516,7 @@
 "<option>-p</option>, <option>--password</option><replaceable>LÖSENORD</"
 "replaceable>"
 
-#: usermod.8.xml:191(para)
+#: usermod.8.xml:229(para)
 msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>."
@@ -588,40 +525,49 @@
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>."
 
-#: usermod.8.xml:199(term) useradd.8.xml:322(term) useradd.8.xml:428(term)
-#: su.1.xml:128(term) chsh.1.xml:56(term)
+#: usermod.8.xml:237(term) useradd.8.xml:416(term) useradd.8.xml:544(term)
+#: su.1.xml:157(term) chsh.1.xml:85(term)
 msgid ""
 "<option>-s</option>, <option>--shell</option><replaceable>SHELL</replaceable>"
 msgstr ""
 "<option>-s</option>, <option>--shell</option><replaceable>SKAL</replaceable>"
 
-#: usermod.8.xml:204(para) chsh.1.xml:60(para)
+#: usermod.8.xml:242(para) chsh.1.xml:89(para)
 msgid ""
 "The name of the user's new login shell. Setting this field to blank causes "
 "the system to select the default login shell."
 msgstr ""
 
-#: usermod.8.xml:211(term) useradd.8.xml:335(term)
+#: usermod.8.xml:249(term) useradd.8.xml:431(term)
 msgid ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgstr ""
 "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: usermod.8.xml:216(para)
+#: usermod.8.xml:254(para)
+msgid "The new numerical value of the user's ID."
+msgstr ""
+
+#: usermod.8.xml:257(para)
 msgid ""
-"The numerical value of the user's ID. This value must be unique, unless the "
-"<option>-o</option> option is used. The value must be non-negative. Values "
-"between 0 and 999 are typically reserved for system accounts. Any files "
-"which the user owns and which are located in the directory tree rooted at "
-"the user's home directory will have the file user ID changed automatically. "
-"Files outside of the user's home directory must be altered manually."
+"This value must be unique, unless the <option>-o</option> option is used. "
+"The value must be non-negative. Values between 0 and 999 are typically "
+"reserved for system accounts."
 msgstr ""
 
-#: usermod.8.xml:229(term)
+#: usermod.8.xml:263(para)
+msgid ""
+"Any files which the user owns and which are located in the directory tree "
+"rooted at the user's home directory will have the file user ID changed "
+"automatically. Files outside of the user's home directory must be altered "
+"manually."
+msgstr ""
+
+#: usermod.8.xml:273(term)
 msgid "<option>-U</option>, <option>--unlock</option>"
 msgstr "<option>-U</option>, <option>--unlock</option>"
 
-#: usermod.8.xml:233(para)
+#: usermod.8.xml:277(para)
 msgid ""
 "Unlock a user's password. This removes the '!' in front of the encrypted "
 "password. You can't use this option with <option>-p</option> or <option>-L</"
@@ -631,7 +577,7 @@
 "krypterade lösenordet. Du kan inte använda denna flagga med <option>-p</"
 "option> eller <option>-L</option>."
 
-#: usermod.8.xml:238(para)
+#: usermod.8.xml:282(para)
 msgid ""
 "Note: if you wish to unlock the account (not only access with a password), "
 "you should also set the <replaceable>EXPIRE_DATE</replaceable> (for example "
@@ -639,18 +585,18 @@
 "replaceable> value from <filename>/etc/default/useradd</filename>)."
 msgstr ""
 
-#: usermod.8.xml:252(title) userdel.8.xml:192(title) useradd.8.xml:451(title)
-#: su.1.xml:188(title) shadow.3.xml:164(title) passwd.1.xml:296(title)
-#: newusers.8.xml:160(title) login.1.xml:202(title) lastlog.8.xml:123(title)
-#: groupdel.8.xml:40(title) groupadd.8.xml:187(title) gpasswd.1.xml:174(title)
-#: faillog.8.xml:121(title) chpasswd.8.xml:125(title)
-#: chgpasswd.8.xml:125(title)
+#: usermod.8.xml:296(title) userdel.8.xml:221(title) useradd.8.xml:573(title)
+#: su.1.xml:217(title) shadow.3.xml:193(title) passwd.1.xml:338(title)
+#: newusers.8.xml:283(title) login.1.xml:238(title) lastlog.8.xml:159(title)
+#: groupdel.8.xml:69(title) groupadd.8.xml:213(title) gpasswd.1.xml:203(title)
+#: faillog.8.xml:193(title) chpasswd.8.xml:157(title)
+#: chgpasswd.8.xml:157(title)
 msgid "CAVEATS"
 msgstr "TÄNK PÅ"
 
-#: usermod.8.xml:253(para)
+#: usermod.8.xml:297(para)
 msgid ""
-"<command>usermod</command> will not allow you to change the name of a user "
+"<command>usermod</command> will not allow you to change the name of an user "
 "who is logged in. You must make certain that the named user is not executing "
 "any processes when this command is being executed if the user's numerical "
 "user ID is being changed. You must change the owner of any <command>crontab</"
@@ -659,44 +605,67 @@
 "server."
 msgstr ""
 
-#: usermod.8.xml:2(term) userdel.8.xml:2(term) useradd.8.xml:2(term)
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: usermod.8.xml:309(title) userdel.8.xml:125(title) useradd.8.xml:596(title)
+#: su.1.xml:225(title) sg.1.xml:76(title) pwconv.8.xml:146(title)
+#: pwck.8.xml:182(title) passwd.1.xml:349(title) newusers.8.xml:297(title)
+#: newgrp.1.xml:87(title) login.1.xml:272(title) grpck.8.xml:154(title)
+#: groupmod.8.xml:138(title) groupmems.8.xml:156(title)
+#: groupdel.8.xml:76(title) groupadd.8.xml:175(title) gpasswd.1.xml:215(title)
+#: chsh.1.xml:120(title) chpasswd.8.xml:171(title) chgpasswd.8.xml:165(title)
+#: chfn.1.xml:99(title)
+msgid "CONFIGURATION"
+msgstr ""
+
+#: usermod.8.xml:310(para) userdel.8.xml:126(para) useradd.8.xml:597(para)
+#: su.1.xml:226(para) sg.1.xml:77(para) pwck.8.xml:183(para)
+#: passwd.1.xml:350(para) newusers.8.xml:298(para) newgrp.1.xml:88(para)
+#: login.1.xml:273(para) grpck.8.xml:155(para) groupmod.8.xml:139(para)
+#: groupmems.8.xml:157(para) groupdel.8.xml:77(para) groupadd.8.xml:176(para)
+#: gpasswd.1.xml:216(para) chsh.1.xml:121(para) chpasswd.8.xml:172(para)
+#: chgpasswd.8.xml:166(para) chfn.1.xml:100(para)
+msgid ""
+"The following configuration variables in <filename>/etc/login.defs</"
+"filename> change the behavior of this tool:"
+msgstr ""
+
+#: usermod.8.xml:32(term) userdel.8.xml:32(term) useradd.8.xml:32(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>MAIL_DIR</option> (string)"
 msgstr "MAIL_DIR (sträng)"
 
-#: usermod.8.xml:4(para) userdel.8.xml:4(para) useradd.8.xml:4(para)
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: usermod.8.xml:34(para) userdel.8.xml:34(para) useradd.8.xml:34(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "The mail spool directory. This is needed to manipulate the mailbox when its "
 "corresponding user account is modified or deleted. If not specified, a "
 "compile-time default is used."
 msgstr ""
 
-#: usermod.8.xml:11(term) userdel.8.xml:11(term) useradd.8.xml:11(term)
-#: su.1.xml:11(term) login.defs.5.xml:11(term) login.1.xml:11(term)
+#: usermod.8.xml:41(term) userdel.8.xml:41(term) useradd.8.xml:41(term)
+#: su.1.xml:41(term) login.defs.5.xml:41(term) login.1.xml:41(term)
 #, fuzzy
 msgid "<option>MAIL_FILE</option> (string)"
 msgstr "MAIL_DIR (sträng)"
 
-#: usermod.8.xml:13(para) userdel.8.xml:13(para) useradd.8.xml:13(para)
-#: su.1.xml:13(para) login.defs.5.xml:13(para) login.1.xml:13(para)
+#: usermod.8.xml:43(para) userdel.8.xml:43(para) useradd.8.xml:43(para)
+#: su.1.xml:43(para) login.defs.5.xml:43(para) login.1.xml:43(para)
 msgid ""
 "Defines the location of the users mail spool files relatively to their home "
 "directory."
 msgstr ""
 
 #. FIXME: MAIL_FILE not used in useradd
-#: usermod.8.xml:20(para) userdel.8.xml:20(para) useradd.8.xml:20(para)
-#: su.1.xml:20(para) login.defs.5.xml:20(para) login.1.xml:20(para)
+#: usermod.8.xml:50(para) userdel.8.xml:50(para) useradd.8.xml:50(para)
+#: su.1.xml:50(para) login.defs.5.xml:50(para) login.1.xml:50(para)
 msgid ""
 "The <option>MAIL_DIR</option> and <option>MAIL_FILE</option> variables are "
 "used by <command>useradd</command>, <command>usermod</command>, and "
 "<command>userdel</command> to create, move, or delete the user's mail spool."
 msgstr ""
 
-#: usermod.8.xml:26(para) userdel.8.xml:26(para) useradd.8.xml:26(para)
-#: su.1.xml:26(para) login.defs.5.xml:26(para) login.1.xml:26(para)
+#: usermod.8.xml:56(para) userdel.8.xml:56(para) useradd.8.xml:56(para)
+#: su.1.xml:56(para) login.defs.5.xml:56(para) login.1.xml:56(para)
 #, fuzzy
 msgid ""
 "If <option>MAIL_CHECK_ENAB</option> is set to <replaceable>yes</"
@@ -706,8 +675,68 @@
 "Om <option>--preserve-environment</option> används, anges skalet med "
 "miljövariabeln <envar>$SHELL</envar>."
 
-#: usermod.8.xml:303(para)
+#: usermod.8.xml:30(term) userdel.8.xml:30(term) useradd.8.xml:30(term)
+#: pwconv.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: grpck.8.xml:30(term) groupmod.8.xml:30(term) groupmems.8.xml:30(term)
+#: groupdel.8.xml:30(term) groupadd.8.xml:30(term) gpasswd.1.xml:30(term)
+#: chgpasswd.8.xml:30(term)
+msgid "<option>MAX_MEMBERS_PER_GROUP</option> (number)"
+msgstr ""
+
+#: usermod.8.xml:32(para) userdel.8.xml:32(para) useradd.8.xml:32(para)
+#: pwconv.8.xml:32(para) newusers.8.xml:32(para) login.defs.5.xml:32(para)
+#: grpck.8.xml:32(para) groupmod.8.xml:32(para) groupmems.8.xml:32(para)
+#: groupdel.8.xml:32(para) groupadd.8.xml:32(para) gpasswd.1.xml:32(para)
+#: chgpasswd.8.xml:32(para)
 msgid ""
+"Maximum members per group entry. When the maximum is reached, a new group "
+"entry (line) is started in <filename>/etc/group</filename> (with the same "
+"name, same password, and same GID)."
+msgstr ""
+
+#: usermod.8.xml:37(para) userdel.8.xml:37(para) useradd.8.xml:37(para)
+#: pwconv.8.xml:37(para) newusers.8.xml:37(para) login.defs.5.xml:37(para)
+#: grpck.8.xml:37(para) groupmod.8.xml:37(para) groupmems.8.xml:37(para)
+#: groupdel.8.xml:37(para) groupadd.8.xml:37(para) gpasswd.1.xml:37(para)
+#: chgpasswd.8.xml:37(para)
+msgid ""
+"The default value is 0, meaning that there are no limits in the number of "
+"members in a group."
+msgstr ""
+
+#. Note: on HP, split groups have the same ID, but different
+#.                names.
+#: usermod.8.xml:43(para) userdel.8.xml:43(para) useradd.8.xml:43(para)
+#: pwconv.8.xml:43(para) newusers.8.xml:43(para) login.defs.5.xml:43(para)
+#: grpck.8.xml:43(para) groupmod.8.xml:43(para) groupmems.8.xml:43(para)
+#: groupdel.8.xml:43(para) groupadd.8.xml:43(para) gpasswd.1.xml:43(para)
+#: chgpasswd.8.xml:43(para)
+msgid ""
+"This feature (split group) permits to limit the length of lines in the group "
+"file. This is useful to make sure that lines for NIS groups are not larger "
+"than 1024 characters."
+msgstr ""
+
+#: usermod.8.xml:48(para) userdel.8.xml:48(para) useradd.8.xml:48(para)
+#: pwconv.8.xml:48(para) newusers.8.xml:48(para) login.defs.5.xml:48(para)
+#: grpck.8.xml:48(para) groupmod.8.xml:48(para) groupmems.8.xml:48(para)
+#: groupdel.8.xml:48(para) groupadd.8.xml:48(para) gpasswd.1.xml:48(para)
+#: chgpasswd.8.xml:48(para)
+msgid "If you need to enforce such limit, you can use 25."
+msgstr ""
+
+#: usermod.8.xml:51(para) userdel.8.xml:51(para) useradd.8.xml:51(para)
+#: pwconv.8.xml:51(para) newusers.8.xml:51(para) login.defs.5.xml:51(para)
+#: grpck.8.xml:51(para) groupmod.8.xml:51(para) groupmems.8.xml:51(para)
+#: groupdel.8.xml:51(para) groupadd.8.xml:51(para) gpasswd.1.xml:51(para)
+#: chgpasswd.8.xml:51(para)
+msgid ""
+"Note: split groups may not be supported by all tools (even in the Shadow "
+"toolsuite. You should not use this variable unless you really need it."
+msgstr ""
+
+#: usermod.8.xml:347(para)
+msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
@@ -744,16 +773,16 @@
 "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: userdel.8.xml:12(refentrytitle) userdel.8.xml:17(refname)
-#: userdel.8.xml:22(command) login.defs.5.xml:402(term)
+#: userdel.8.xml:41(refentrytitle) userdel.8.xml:46(refname)
+#: userdel.8.xml:51(command) login.defs.5.xml:434(term)
 msgid "userdel"
 msgstr "userdel"
 
-#: userdel.8.xml:18(refpurpose)
+#: userdel.8.xml:47(refpurpose)
 msgid "delete a user account and related files"
 msgstr "ta bort ett användarkonto och relaterade filer"
 
-#: userdel.8.xml:32(para)
+#: userdel.8.xml:61(para)
 #, fuzzy
 msgid ""
 "The <command>userdel</command> command modifies the system account files, "
@@ -764,15 +793,15 @@
 "alla poster som refererar till <emphasis remap=\"I\">login_name</emphasis>. "
 "Den angivna användaren måste finnas."
 
-#: userdel.8.xml:41(para)
+#: userdel.8.xml:70(para)
 msgid "The options which apply to the <command>userdel</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>userdel</command> är:"
 
-#: userdel.8.xml:46(term) groupadd.8.xml:52(term)
+#: userdel.8.xml:75(term) groupadd.8.xml:78(term)
 msgid "<option>-f</option>, <option>--force</option>"
 msgstr "<option>-f</option>, <option>--force</option>"
 
-#: userdel.8.xml:50(para)
+#: userdel.8.xml:79(para)
 msgid ""
 "This option forces the removal of the user account, even if the user is "
 "still logged in. It also forces <command>userdel</command> to remove the "
@@ -784,7 +813,7 @@
 "removed, even if it is still the primary group of another user."
 msgstr ""
 
-#: userdel.8.xml:63(para)
+#: userdel.8.xml:92(para)
 msgid ""
 "<emphasis>Note:</emphasis> This option is dangerous and may leave your "
 "system in an inconsistent state."
@@ -792,151 +821,156 @@
 "<emphasis>Notera:</emphasis> Denna flagga är farlig och kan göra att ditt "
 "system försätts i ett inkonsistent tillstånd."
 
-#: userdel.8.xml:76(term)
+#: userdel.8.xml:105(term)
 msgid "<option>-r</option>, <option>--remove</option>"
 msgstr "<option>-r</option>, <option>--remove</option>"
 
-#: userdel.8.xml:80(para)
+#: userdel.8.xml:109(para)
 msgid ""
 "Files in the user's home directory will be removed along with the home "
 "directory itself and the user's mail spool. Files located in other file "
 "systems will have to be searched for and deleted manually."
 msgstr ""
 
-#: userdel.8.xml:86(para)
+#: userdel.8.xml:115(para)
 msgid ""
 "The mail spool is defined by the <emphasis>MAIL_DIR</emphasis> variable in "
 "the <filename>login.defs</filename> file."
 msgstr ""
 
-#: userdel.8.xml:2(term) login.defs.5.xml:2(term)
+#: userdel.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>USERDEL_CMD</option> (string)"
 msgstr "USERDEL_CMD (sträng)"
 
-#: userdel.8.xml:4(para) login.defs.5.xml:4(para)
+#: userdel.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "If defined, this command is run when removing a user. It should remove any "
 "at/cron/print jobs etc. owned by the user to be removed (passed as the first "
 "argument)."
 msgstr ""
 
-#: userdel.8.xml:2(term) useradd.8.xml:2(term) su.1.xml:2(term)
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: userdel.8.xml:32(term) useradd.8.xml:32(term) su.1.xml:32(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>USERGROUPS_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (boolesk)"
 
-#: userdel.8.xml:4(para) useradd.8.xml:4(para) su.1.xml:4(para)
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: userdel.8.xml:34(para) useradd.8.xml:34(para) su.1.xml:34(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Enable setting of the umask group bits to be the same as owner bits "
 "(examples: 022 -&gt; 002, 077 -&gt; 007) for non-root users, if the uid is "
-"the same as gid, and username is the same as the primary group name. "
-"<placeholder-1/> If set to <replaceable>yes</replaceable>, <command>userdel</"
-"command> will remove the user's group if it contains no more members, and "
+"the same as gid, and username is the same as the primary group name."
+msgstr ""
+
+#: userdel.8.xml:39(para) useradd.8.xml:39(para) su.1.xml:39(para)
+#: login.defs.5.xml:39(para) login.1.xml:39(para)
+msgid ""
+"If set to <replaceable>yes</replaceable>, <command>userdel</command> will "
+"remove the user's group if it contains no more members, and "
 "<command>useradd</command> will create by default a group with the name of "
 "the user."
 msgstr ""
 
-#: userdel.8.xml:120(filename) useradd.8.xml:532(filename)
-#: pwconv.8.xml:141(filename) newusers.8.xml:224(filename)
-#: login.access.5.xml:69(filename) groupadd.8.xml:178(filename)
-#: chsh.1.xml:119(filename) chpasswd.8.xml:168(filename)
-#: chgpasswd.8.xml:163(filename) chfn.1.xml:87(filename)
+#: userdel.8.xml:149(filename) useradd.8.xml:658(filename)
+#: pwconv.8.xml:171(filename) newusers.8.xml:347(filename)
+#: login.access.5.xml:99(filename) groupadd.8.xml:204(filename)
+#: chsh.1.xml:148(filename) chpasswd.8.xml:200(filename)
+#: chgpasswd.8.xml:195(filename) chfn.1.xml:116(filename)
 msgid "/etc/login.defs"
 msgstr "/etc/login.defs"
 
-#: userdel.8.xml:122(para) useradd.8.xml:534(para) pwconv.8.xml:143(para)
-#: newusers.8.xml:226(para) login.access.5.xml:71(para)
-#: groupadd.8.xml:180(para) chsh.1.xml:121(para) chpasswd.8.xml:170(para)
-#: chgpasswd.8.xml:165(para) chfn.1.xml:89(para)
+#: userdel.8.xml:151(para) useradd.8.xml:660(para) pwconv.8.xml:173(para)
+#: newusers.8.xml:349(para) login.access.5.xml:101(para)
+#: groupadd.8.xml:206(para) chsh.1.xml:150(para) chpasswd.8.xml:202(para)
+#: chgpasswd.8.xml:197(para) chfn.1.xml:118(para)
 msgid "Shadow password suite configuration."
 msgstr ""
 
-#: userdel.8.xml:141(title) useradd.8.xml:541(title) pwck.8.xml:208(title)
-#: passwd.1.xml:343(title) grpck.8.xml:182(title) groupmod.8.xml:139(title)
-#: groupdel.8.xml:77(title) groupadd.8.xml:208(title) chage.1.xml:199(title)
+#: userdel.8.xml:170(title) useradd.8.xml:667(title) pwck.8.xml:241(title)
+#: passwd.1.xml:385(title) grpck.8.xml:214(title) groupmod.8.xml:168(title)
+#: groupdel.8.xml:106(title) groupadd.8.xml:234(title) chage.1.xml:228(title)
 msgid "EXIT VALUES"
 msgstr "AVSLUTNINGSVÄRDEN"
 
-#: userdel.8.xml:146(replaceable) useradd.8.xml:546(replaceable)
-#: pwck.8.xml:213(replaceable) passwd.1.xml:348(replaceable)
-#: grpck.8.xml:187(replaceable) groupmod.8.xml:144(replaceable)
-#: groupdel.8.xml:82(replaceable) groupadd.8.xml:213(replaceable)
-#: chage.1.xml:204(replaceable)
+#: userdel.8.xml:175(replaceable) useradd.8.xml:672(replaceable)
+#: pwck.8.xml:246(replaceable) passwd.1.xml:390(replaceable)
+#: grpck.8.xml:219(replaceable) groupmod.8.xml:173(replaceable)
+#: groupdel.8.xml:111(replaceable) groupadd.8.xml:239(replaceable)
+#: chage.1.xml:233(replaceable)
 msgid "0"
 msgstr "0"
 
-#: userdel.8.xml:148(para) useradd.8.xml:548(para) pwck.8.xml:215(para)
-#: passwd.1.xml:350(para) grpck.8.xml:189(para) groupmod.8.xml:146(para)
-#: groupdel.8.xml:84(para) groupadd.8.xml:215(para) chage.1.xml:206(para)
+#: userdel.8.xml:177(para) useradd.8.xml:674(para) pwck.8.xml:248(para)
+#: passwd.1.xml:392(para) grpck.8.xml:221(para) groupmod.8.xml:175(para)
+#: groupdel.8.xml:113(para) groupadd.8.xml:241(para) chage.1.xml:235(para)
 msgid "success"
 msgstr "lyckad"
 
-#: userdel.8.xml:152(replaceable) useradd.8.xml:552(replaceable)
-#: su.1.xml:26(manvolnum) sg.1.xml:10(manvolnum) pwck.8.xml:219(replaceable)
-#: passwd.1.xml:16(manvolnum) passwd.1.xml:354(replaceable)
-#: newgrp.1.xml:10(manvolnum) login.1.xml:42(manvolnum)
-#: grpck.8.xml:193(replaceable) groups.1.xml:6(manvolnum)
-#: gpasswd.1.xml:14(manvolnum) expiry.1.xml:12(manvolnum)
-#: chsh.1.xml:12(manvolnum) chfn.1.xml:13(manvolnum) chage.1.xml:6(manvolnum)
-#: chage.1.xml:210(replaceable)
+#: userdel.8.xml:181(replaceable) useradd.8.xml:678(replaceable)
+#: su.1.xml:55(manvolnum) sg.1.xml:39(manvolnum) pwck.8.xml:252(replaceable)
+#: passwd.1.xml:45(manvolnum) passwd.1.xml:396(replaceable)
+#: newgrp.1.xml:39(manvolnum) login.1.xml:71(manvolnum)
+#: grpck.8.xml:225(replaceable) groups.1.xml:35(manvolnum)
+#: gpasswd.1.xml:43(manvolnum) expiry.1.xml:42(manvolnum)
+#: chsh.1.xml:41(manvolnum) chfn.1.xml:42(manvolnum) chage.1.xml:35(manvolnum)
+#: chage.1.xml:239(replaceable)
 msgid "1"
 msgstr "1"
 
-#: userdel.8.xml:154(para) useradd.8.xml:554(para)
+#: userdel.8.xml:183(para) useradd.8.xml:680(para)
 msgid "can't update password file"
 msgstr "kan inte uppdatera lösenordsfilen"
 
-#: userdel.8.xml:158(replaceable) useradd.8.xml:558(replaceable)
-#: pwck.8.xml:225(replaceable) passwd.1.xml:360(replaceable)
-#: grpck.8.xml:199(replaceable) groupmod.8.xml:150(replaceable)
-#: groupdel.8.xml:88(replaceable) groupadd.8.xml:219(replaceable)
-#: chage.1.xml:216(replaceable)
+#: userdel.8.xml:187(replaceable) useradd.8.xml:684(replaceable)
+#: pwck.8.xml:258(replaceable) passwd.1.xml:402(replaceable)
+#: grpck.8.xml:231(replaceable) groupmod.8.xml:179(replaceable)
+#: groupdel.8.xml:117(replaceable) groupadd.8.xml:245(replaceable)
+#: chage.1.xml:245(replaceable)
 msgid "2"
 msgstr "2"
 
-#: userdel.8.xml:160(para) useradd.8.xml:560(para) pwck.8.xml:221(para)
-#: grpck.8.xml:195(para) groupmod.8.xml:152(para) groupdel.8.xml:90(para)
-#: groupadd.8.xml:221(para) chage.1.xml:218(para)
+#: userdel.8.xml:189(para) useradd.8.xml:686(para) pwck.8.xml:254(para)
+#: grpck.8.xml:227(para) groupmod.8.xml:181(para) groupdel.8.xml:119(para)
+#: groupadd.8.xml:247(para) chage.1.xml:247(para)
 msgid "invalid command syntax"
 msgstr "ogiltig kommandosyntax"
 
-#: userdel.8.xml:164(replaceable) useradd.8.xml:576(replaceable)
-#: passwd.1.xml:384(replaceable) groupmod.8.xml:168(replaceable)
-#: groupdel.8.xml:94(replaceable)
+#: userdel.8.xml:193(replaceable) useradd.8.xml:702(replaceable)
+#: pwck.8.xml:282(replaceable) passwd.1.xml:426(replaceable)
+#: groupmod.8.xml:197(replaceable) groupdel.8.xml:123(replaceable)
 msgid "6"
 msgstr "6"
 
-#: userdel.8.xml:166(para)
+#: userdel.8.xml:195(para)
 msgid "specified user doesn't exist"
 msgstr "angiven användare finns inte"
 
-#: userdel.8.xml:172(para)
+#: userdel.8.xml:201(para)
 msgid "user currently logged in"
 msgstr "användaren är för närvarande inloggad"
 
-#: userdel.8.xml:176(replaceable) useradd.8.xml:588(replaceable)
-#: groupmod.8.xml:180(replaceable) groupdel.8.xml:106(replaceable)
-#: groupadd.8.xml:243(replaceable)
+#: userdel.8.xml:205(replaceable) useradd.8.xml:714(replaceable)
+#: groupmod.8.xml:209(replaceable) groupdel.8.xml:135(replaceable)
+#: groupadd.8.xml:269(replaceable)
 msgid "10"
 msgstr "10"
 
-#: userdel.8.xml:178(para) useradd.8.xml:590(para) groupmod.8.xml:182(para)
-#: groupdel.8.xml:108(para) groupadd.8.xml:245(para)
+#: userdel.8.xml:207(para) useradd.8.xml:716(para) groupmod.8.xml:211(para)
+#: groupdel.8.xml:137(para) groupadd.8.xml:271(para)
 msgid "can't update group file"
 msgstr "kan inte uppdatera gruppfilen"
 
-#: userdel.8.xml:182(replaceable) useradd.8.xml:594(replaceable)
+#: userdel.8.xml:211(replaceable) useradd.8.xml:720(replaceable)
 msgid "12"
 msgstr "12"
 
-#: userdel.8.xml:184(para)
+#: userdel.8.xml:213(para)
 msgid "can't remove home directory"
 msgstr "kan inte ta bort hemkatalogen"
 
-#: userdel.8.xml:142(para)
+#: userdel.8.xml:171(para)
 msgid ""
 "The <command>userdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -944,14 +978,14 @@
 "Kommandot <command>userdel</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: userdel.8.xml:193(para)
+#: userdel.8.xml:222(para)
 msgid ""
 "<command>userdel</command> will not allow you to remove an account if the "
 "user is currently logged in. You must kill any running processes which "
 "belong to an account that you are deleting."
 msgstr ""
 
-#: userdel.8.xml:198(para)
+#: userdel.8.xml:227(para)
 msgid ""
 "You may not remove any NIS attributes on a NIS client. This must be "
 "performed on the NIS server."
@@ -959,7 +993,7 @@
 "Du får inte ta bort några NIS-attribut på en NIS-klient. Detta måste "
 "genomföras på NIS-servern."
 
-#: userdel.8.xml:201(para)
+#: userdel.8.xml:230(para)
 msgid ""
 "If <emphasis>USERGROUPS_ENAB</emphasis> is defined to <emphasis remap=\"I"
 "\">yes</emphasis> in <filename>/etc/login.defs</filename>, <command>userdel</"
@@ -970,7 +1004,7 @@
 "<option>-f</option> option can force the deletion of this group."
 msgstr ""
 
-#: userdel.8.xml:214(para)
+#: userdel.8.xml:243(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1004,22 +1038,22 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: useradd.8.xml:19(refentrytitle) useradd.8.xml:24(refname)
-#: useradd.8.xml:29(command) useradd.8.xml:36(command)
-#: useradd.8.xml:40(command) login.defs.5.xml:389(term)
+#: useradd.8.xml:49(refentrytitle) useradd.8.xml:54(refname)
+#: useradd.8.xml:59(command) useradd.8.xml:66(command)
+#: useradd.8.xml:70(command) login.defs.5.xml:421(term)
 msgid "useradd"
 msgstr "useradd"
 
-#: useradd.8.xml:25(refpurpose)
+#: useradd.8.xml:55(refpurpose)
 msgid "create a new user or update default new user information"
 msgstr ""
 "skapa en ny användare eller uppdatera standardinformation för nya användare"
 
-#: useradd.8.xml:37(arg) useradd.8.xml:41(arg)
+#: useradd.8.xml:67(arg) useradd.8.xml:71(arg)
 msgid "-D"
 msgstr "-D"
 
-#: useradd.8.xml:50(para)
+#: useradd.8.xml:80(para)
 msgid ""
 "When invoked without the <option>-D</option> option, the <command>useradd</"
 "command> command creates a new user account using the values specified on "
@@ -1029,17 +1063,24 @@
 "initial files."
 msgstr ""
 
-#: useradd.8.xml:63(para)
+#: useradd.8.xml:89(para)
+msgid ""
+"By default, a group will also be created for the new user (see <option>-g</"
+"option>, <option>-N</option>, <option>-U</option>, and "
+"<option>USERGROUPS_ENAB</option>)."
+msgstr ""
+
+#: useradd.8.xml:98(para)
 msgid "The options which apply to the <command>useradd</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>useradd</command> är:"
 
-#: useradd.8.xml:67(term) useradd.8.xml:379(term)
+#: useradd.8.xml:102(term) useradd.8.xml:475(term)
 msgid ""
 "<option>-b</option>, <option>--base-dir</option><replaceable>BASE_DIR</"
 "replaceable>"
 msgstr ""
 
-#: useradd.8.xml:72(para)
+#: useradd.8.xml:107(para)
 msgid ""
 "The default base directory for the system if <option>-d</"
 "option><replaceable>HOME_DIR</replaceable> is not specified. "
@@ -1048,13 +1089,20 @@
 "<replaceable>BASE_DIR</replaceable> must exist."
 msgstr ""
 
-#: useradd.8.xml:88(para)
+#: useradd.8.xml:115(para)
 msgid ""
+"If this option is not specified, <command>useradd</command> will use the "
+"base directory specified by the <option>HOME</option> variable in <filename>/"
+"etc/default/useradd</filename>, or <filename>/home</filename> by default."
+msgstr ""
+
+#: useradd.8.xml:130(para)
+msgid ""
 "Any text string. It is generally a short description of the login, and is "
 "currently used as the field for the user's full name."
 msgstr ""
 
-#: useradd.8.xml:101(para)
+#: useradd.8.xml:143(para)
 msgid ""
 "The new user will be created using <replaceable>HOME_DIR</replaceable> as "
 "the value for the user's login directory. The default is to append the "
@@ -1064,27 +1112,60 @@
 "created if it is missing."
 msgstr ""
 
-#: useradd.8.xml:113(term)
+#: useradd.8.xml:155(term)
 #, fuzzy
 #| msgid "<option>-d</option>, <option>--delete</option>"
 msgid "<option>-D</option>, <option>--defaults</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
-#: useradd.8.xml:117(para)
+#: useradd.8.xml:159(para)
 #, fuzzy
 msgid "See below, the subsection \"Changing the default values\"."
 msgstr "Ändrar standardvärden"
 
-#: useradd.8.xml:154(para)
+#: useradd.8.xml:174(para)
 msgid ""
+"If not specified, <command>useradd</command> will use the default expiry "
+"date specified by the <option>EXPIRE</option> variable in <filename>/etc/"
+"default/useradd</filename>, or an empty string (no expiry) by default."
+msgstr ""
+
+#: useradd.8.xml:188(para)
+msgid ""
+"The number of days after a password expires until the account is permanently "
+"disabled. A value of 0 disables the account as soon as the password has "
+"expired, and a value of -1 disables the feature."
+msgstr ""
+
+#: useradd.8.xml:194(para)
+msgid ""
+"If not specified, <command>useradd</command> will use the default inactivity "
+"period specified by the <option>INACTIVE</option> variable in the <filename>/"
+"etc/default/useradd</filename>, or -1 by default."
+msgstr ""
+
+#: useradd.8.xml:208(para)
+msgid ""
 "The group name or number of the user's initial login group. The group name "
-"must exist. A group number must refer to an already existing group. The "
-"default group number is 1 or whatever is specified in <filename>/etc/default/"
-"useradd</filename>."
+"must exist. A group number must refer to an already existing group."
 msgstr ""
 
-#: useradd.8.xml:168(para)
+#: useradd.8.xml:213(para)
 msgid ""
+"If not specified, the bahavior of <command>useradd</command> will depend on "
+"the <option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>. If this variable is set to <replaceable>yes</replaceable> (or "
+"<option>-U/--user-group</option> is specified on the command line), a group "
+"will be created for the user, with the same name as her loginname. If the "
+"variable is set to <replaceable>no</replaceable> (or <option>-N/--no-user-"
+"group</option> is specified on the command line), useradd will set the "
+"primary group of the new user to the value specified by the <option>GROUP</"
+"option> variable in <filename>/etc/default/useradd</filename>, or 100 by "
+"default."
+msgstr ""
+
+#: useradd.8.xml:236(para)
+msgid ""
 "A list of supplementary groups which the user is also a member of. Each "
 "group is separated from the next by a comma, with no intervening whitespace. "
 "The groups are subject to the same restrictions as the group given with the "
@@ -1092,7 +1173,7 @@
 "the initial group."
 msgstr ""
 
-#: useradd.8.xml:185(term)
+#: useradd.8.xml:253(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-s</option>, <option>--shell</option><replaceable>SHELL</"
@@ -1103,14 +1184,14 @@
 msgstr ""
 "<option>-s</option>, <option>--shell</option><replaceable>SKAL</replaceable>"
 
-#: useradd.8.xml:190(para)
+#: useradd.8.xml:258(para)
 msgid ""
 "The skeleton directory, which contains files and directories to be copied in "
 "the user's home directory, when the home directory is created by "
 "<command>useradd</command>."
 msgstr ""
 
-#: useradd.8.xml:195(para)
+#: useradd.8.xml:263(para)
 #, fuzzy
 #| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
@@ -1118,14 +1199,14 @@
 "home</option>) option is specified."
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:199(para)
+#: useradd.8.xml:267(para)
 msgid ""
-"If this option is not set, the skeleton directory is defined in <filename>/"
-"etc/default/useradd</filename> or, by default, <filename>/etc/skel</"
-"filename>."
+"If this option is not set, the skeleton directory is defined by the "
+"<option>SKEL</option> variable in <filename>/etc/default/useradd</filename> "
+"or, by default, <filename>/etc/skel</filename>."
 msgstr ""
 
-#: useradd.8.xml:207(term) groupadd.8.xml:86(term)
+#: useradd.8.xml:276(term) groupadd.8.xml:112(term)
 msgid ""
 "<option>-K</option>, <option>--key</option><replaceable>KEY</"
 "replaceable>=<replaceable>VALUE</replaceable>"
@@ -1133,10 +1214,21 @@
 "<option>-K</option>, <option>--key</option><replaceable>NYCKEL</"
 "replaceable>=<replaceable>VÄRDE</replaceable>"
 
-#: useradd.8.xml:212(para)
+#: useradd.8.xml:281(para)
+#, fuzzy
+#| msgid ""
+#| "Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, "
+#| "PASS_MAX_DAYS and others). <placeholder-1/> Example: <option>-K </"
+#| "option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</"
+#| "replaceable> can be used when creating system account to turn off "
+#| "password ageing, even though system account has no password at all. "
+#| "Multiple <option>-K</option> options can be specified, e.g.: <option>-K </"
+#| "option><replaceable>UID_MIN</replaceable>=<replaceable>100</"
+#| "replaceable><option> -K </option><replaceable>UID_MAX</"
+#| "replaceable>=<replaceable>499</replaceable>"
 msgid ""
-"Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS "
-"and others). <placeholder-1/> Example: <option>-K </"
+"Overrides <filename>/etc/login.defs</filename> defaults (UID_MIN, UID_MAX, "
+"UMASK, PASS_MAX_DAYS and others). <placeholder-1/> Example: <option>-K </"
 "option><replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</"
 "replaceable> can be used when creating system account to turn off password "
 "ageing, even though system account has no password at all. Multiple <option>-"
@@ -1155,7 +1247,7 @@
 "replaceable><option> -K </option><replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable>"
 
-#: useradd.8.xml:226(para)
+#: useradd.8.xml:295(para)
 msgid ""
 "Note: <option>-K </option><replaceable>UID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
@@ -1165,94 +1257,127 @@
 "replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</"
 "replaceable>=<replaceable>499</replaceable> fungerar ännu inte."
 
-#: useradd.8.xml:234(option) groupmems.8.xml:24(arg)
-#: groupmems.8.xml:79(option)
-msgid "-l"
-msgstr "-l"
+#: useradd.8.xml:303(term)
+#, fuzzy
+#| msgid "<option>-l</option>, <option>--list</option>"
+msgid "<option>-l</option>, <option>--no-log-init</option>"
+msgstr "<option>-l</option>, <option>--list</option>"
 
-#: useradd.8.xml:236(para)
+#: useradd.8.xml:305(para)
 msgid "Do not add the user to the lastlog and faillog databases."
 msgstr ""
 
-#: useradd.8.xml:239(para)
+#: useradd.8.xml:308(para)
 msgid ""
 "By default, the user's entries in the lastlog and faillog databases are "
 "resetted to avoid reusing the entry from a previously deleted user."
 msgstr ""
 
-#: useradd.8.xml:247(term)
+#: useradd.8.xml:316(term)
 msgid "<option>-m</option>, <option>--create-home</option>"
 msgstr "<option>-m</option>, <option>--create-home</option>"
 
-#: useradd.8.xml:251(para)
+#: useradd.8.xml:320(para)
 msgid ""
 "Create the user's home directory if it does not exist. The files and "
 "directories contained in the skeleton directory (which can be defined with "
 "the <option>-k</option> option) will be copied to the home directory."
 msgstr ""
 
-#: useradd.8.xml:257(para)
+#: useradd.8.xml:326(para)
 msgid "By default, no home directories are created."
 msgstr ""
 
-#: useradd.8.xml:263(term)
+#: useradd.8.xml:333(option)
 #, fuzzy
+#| msgid "-"
+msgid "-M"
+msgstr "-"
+
+#: useradd.8.xml:336(para)
+msgid ""
+"Do no create the user's home directory, even if the system wide setting from "
+"<filename>/etc/login.defs</filename> (<option>CREATE_HOME</option>) is set "
+"to <replaceable>yes</replaceable>."
+msgstr ""
+
+#: useradd.8.xml:345(term)
+#, fuzzy
 #| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-N</option>, <option>--no-user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: useradd.8.xml:267(para)
+#: useradd.8.xml:349(para)
 msgid ""
 "Do not create a group with the same name as the user, but add the user to "
 "the group specified by the <option>-g</option> option or by the GROUP "
 "variable in <filename>/etc/default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:273(para) useradd.8.xml:358(para)
+#: useradd.8.xml:355(para) useradd.8.xml:454(para)
 msgid ""
 "The default behavior (if the <option>-g</option>, <option>-N</option>, and "
 "<option>-U</option> options are not specified) is defined by the "
-"<option>USERGROUPS_ENAB</option> variable in <filename>login.defs</filename>."
+"<option>USERGROUPS_ENAB</option> variable in <filename>/etc/login.defs</"
+"filename>."
 msgstr ""
 
-#: useradd.8.xml:286(para)
+#: useradd.8.xml:368(para)
 msgid "Allow the creation of a user account with a duplicate (non-unique) UID."
 msgstr ""
 
-#: useradd.8.xml:295(para)
+#: useradd.8.xml:369(para)
+#, fuzzy
+#| msgid "<option>-m</option>, <option>--create-home</option>"
 msgid ""
+"This option is only valid in combination with the <option>-o</option> option."
+msgstr "<option>-m</option>, <option>--create-home</option>"
+
+#: useradd.8.xml:381(para)
+msgid ""
 "The encrypted password, as returned by <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>. The default is to "
 "disable the account."
 msgstr ""
 
-#: useradd.8.xml:303(term) newusers.8.xml:113(term) groupadd.8.xml:130(term)
+#: useradd.8.xml:389(term) newusers.8.xml:236(term) groupadd.8.xml:156(term)
 #, fuzzy
 #| msgid "<option>-r</option>, <option>--reset</option>"
 msgid "<option>-r</option>, <option>--system</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: useradd.8.xml:307(para) newusers.8.xml:117(para)
+#: useradd.8.xml:393(para) newusers.8.xml:240(para)
 msgid "Create a system account."
 msgstr ""
 
-#: useradd.8.xml:310(para) newusers.8.xml:120(para)
+#: useradd.8.xml:396(para)
 msgid ""
 "System users will be created with no aging information in <filename>/etc/"
 "shadow</filename>, and their numeric identifiers are choosen in the "
 "<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
-"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<filename>/etc/login.defs</filename>, instead of <option>UID_MIN</option>-"
 "<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
 "the creation of groups)."
 msgstr ""
 
-#: useradd.8.xml:327(para)
+#: useradd.8.xml:405(para)
 msgid ""
+"Note that <command>useradd</command> will not create a home directory for "
+"such an user, regardless of the default setting in <filename>/etc/login."
+"defs</filename> (<option>CREATE_HOME</option>). You have to specify the "
+"<option>-m</option> options if you want a home directory for a system "
+"account to be created."
+msgstr ""
+
+#: useradd.8.xml:421(para)
+msgid ""
 "The name of the user's login shell. The default is to leave this field "
-"blank, which causes the system to select the default login shell."
+"blank, which causes the system to select the default login shell specified "
+"by the <option>SHELL</option> variable in <filename>/etc/default/useradd</"
+"filename>, or an empty string by default."
 msgstr ""
 
-#: useradd.8.xml:340(para)
+#: useradd.8.xml:436(para)
 msgid ""
 "The numerical value of the user's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. The "
@@ -1261,23 +1386,23 @@
 "accounts."
 msgstr ""
 
-#: useradd.8.xml:350(term)
+#: useradd.8.xml:446(term)
 #, fuzzy
 #| msgid "<option>-g</option>, <option>--group</option>"
 msgid "<option>-U</option>, <option>--user-group</option>"
 msgstr "<option>-g</option>, <option>--group</option>"
 
-#: useradd.8.xml:354(para)
+#: useradd.8.xml:450(para)
 msgid ""
 "Create a group with the same name as the user, and add the user to this "
 "group."
 msgstr ""
 
-#: useradd.8.xml:369(title)
+#: useradd.8.xml:465(title)
 msgid "Changing the default values"
 msgstr "Ändrar standardvärden"
 
-#: useradd.8.xml:370(para)
+#: useradd.8.xml:466(para)
 msgid ""
 "When invoked with only the <option>-D</option> option, <command>useradd</"
 "command> will display the current default values. When invoked with <option>-"
@@ -1285,7 +1410,7 @@
 "default values for the specified options. Valid default-changing options are:"
 msgstr ""
 
-#: useradd.8.xml:384(para)
+#: useradd.8.xml:480(para)
 msgid ""
 "The path prefix for a new user's home directory. The user's name will be "
 "affixed to the end of <replaceable>BASE_DIR</replaceable> to form the new "
@@ -1293,41 +1418,80 @@
 "when creating a new account."
 msgstr ""
 
-#: useradd.8.xml:399(para)
+#: useradd.8.xml:487(para)
+msgid ""
+"This option sets the <option>HOME</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
+#: useradd.8.xml:499(para)
 msgid "The date on which the user account is disabled."
 msgstr "Datumet när användarkontot blir inaktiverat."
 
-#: useradd.8.xml:408(para)
+#: useradd.8.xml:500(para)
 msgid ""
+"This option sets the <option>EXPIRE</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
+#: useradd.8.xml:512(para)
+msgid ""
 "The number of days after a password has expired before the account will be "
 "disabled."
 msgstr ""
 "Antalet dagar efter att ett lösenord har gått ut innan kontot kommer att "
 "inaktiveras."
 
-#: useradd.8.xml:420(para)
+#: useradd.8.xml:516(para)
 msgid ""
-"The group name or ID for a new user's initial group. The named group must "
-"exist, and a numerical group ID must have an existing entry."
+"This option sets the <option>INACTIVE</option> variable in <filename>/etc/"
+"default/useradd</filename>."
 msgstr ""
 
-#: useradd.8.xml:433(para)
+#: useradd.8.xml:528(para)
+msgid ""
+"The group name or ID for a new user's initial group (when the <option>-N/--"
+"no-user-group</option> is used or when the <option>USERGROUPS_ENAB</option> "
+"variable is set to <replaceable>no</replaceable> in <filename>/etc/login."
+"defs</filename>. The named group must exist, and a numerical group ID must "
+"have an existing entry."
+msgstr ""
+
+#: useradd.8.xml:537(para)
+msgid ""
+"This option sets the <option>GROUP</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
+#: useradd.8.xml:549(para)
 msgid "The name of a new user's login shell."
 msgstr ""
 
-#: useradd.8.xml:444(title)
+#: useradd.8.xml:552(para)
+msgid ""
+"This option sets the <option>SHELL</option> variable in <filename>/etc/"
+"default/useradd</filename>."
+msgstr ""
+
+#: useradd.8.xml:564(title)
 msgid "NOTES"
 msgstr "NOTERINGAR"
 
-#: useradd.8.xml:445(para)
+#: useradd.8.xml:565(para)
+#, fuzzy
+#| msgid ""
+#| "The system administrator is responsible for placing the default user "
+#| "files in the <filename>/etc/skel/</filename> directory."
 msgid ""
 "The system administrator is responsible for placing the default user files "
-"in the <filename>/etc/skel/</filename> directory."
+"in the <filename>/etc/skel/</filename> directory (or any other skeleton "
+"directory specified in <filename>/etc/default/useradd</filename> or on the "
+"command line)."
 msgstr ""
 "Systemadministratören är ansvarig för att placera standardanvändarfiler i "
 "katalogen <filename>/etc/skel/</filename>."
 
-#: useradd.8.xml:452(para)
+#: useradd.8.xml:574(para)
 #, fuzzy
 msgid ""
 "You may not add a user to a NIS or LDAP group. This must be performed on the "
@@ -1336,215 +1500,258 @@
 "Du får inte lägga till en användare till en NIS-grupp. Detta måste "
 "genomföras på NIS-servern."
 
-#: useradd.8.xml:457(para)
+#: useradd.8.xml:579(para)
 msgid ""
 "Similarly, if the username already exists in an external user database such "
 "as NIS or LDAP, <command>useradd</command> will deny the user account "
 "creation request."
 msgstr ""
 
-#: useradd.8.xml:463(para)
+#: useradd.8.xml:585(para)
+#, fuzzy
+#| msgid ""
+#| "Usernames must begin with a lower case letter or an underscore, and only "
+#| "lower case letters, underscores, dashes, and dollar signs may follow. In "
+#| "regular expression terms: [a-z_][a-z0-9_-]*[$]"
 msgid ""
 "Usernames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
-"regular expression terms: [a-z_][a-z0-9_-]*[$]"
+"regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
 "Användarnamn måste börja med en gemen bokstav eller ett understreck och får "
 "endast innehålla gemener, understreck, minustecken och på slutet ett dollar-"
 "tecken. I reguljära uttryckstermer: [a-z_][a-z0-9_-]*[$]"
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: groupadd.8.xml:2(term)
+#: useradd.8.xml:590(para)
+msgid "Usernames may only be up to 32 characters long."
+msgstr ""
+
+#: useradd.8.xml:30(term) login.defs.5.xml:30(term)
 #, fuzzy
+msgid "<option>CREATE_HOME</option> (boolean)"
+msgstr "CHFN_AUTH (boolesk)"
+
+#: useradd.8.xml:32(para) login.defs.5.xml:32(para)
+msgid ""
+"Indicate if a home directory should be created by default for new users."
+msgstr ""
+
+#: useradd.8.xml:36(para) login.defs.5.xml:36(para)
+msgid ""
+"This setting does not apply to system users, and can be overriden on the "
+"command line."
+msgstr ""
+
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: groupadd.8.xml:32(term)
+#, fuzzy
 msgid "<option>GID_MAX</option> (number)"
 msgstr "GID_MAX (nummer)"
 
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
-#: groupadd.8.xml:3(term)
+#: useradd.8.xml:33(term) newusers.8.xml:33(term) login.defs.5.xml:33(term)
+#: groupadd.8.xml:33(term)
 #, fuzzy
 msgid "<option>GID_MIN</option> (number)"
 msgstr "GID_MIN (nummer)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
-#: groupadd.8.xml:5(para)
+#: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para)
+#: groupadd.8.xml:35(para)
 msgid ""
 "Range of group IDs used for the creation of regular groups by "
 "<command>useradd</command>, <command>useradd</command>, or "
 "<command>newusers</command>."
 msgstr ""
 
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) pwck.8.xml:2(term)
-#: newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_MAX_DAYS</option> (number)"
 msgstr "PASS_MAX_DAYS (nummer)"
 
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) pwck.8.xml:4(para)
-#: newusers.8.xml:4(para) login.defs.5.xml:4(para)
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "The maximum number of days a password may be used. If the password is older "
 "than this, a password change will be forced. If not specified, -1 will be "
 "assumed (which disables the restriction)."
 msgstr ""
 
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) pwck.8.xml:2(term)
-#: newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_MIN_DAYS</option> (number)"
 msgstr "PASS_MIN_DAYS (nummer)"
 
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) pwck.8.xml:4(para)
-#: newusers.8.xml:4(para) login.defs.5.xml:4(para)
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "The minimum number of days allowed between password changes. Any password "
 "changes attempted sooner than this will be rejected. If not specified, -1 "
 "will be assumed (which disables the restriction)."
 msgstr ""
 
-#: useradd.8.xml:2(term) pwconv.8.xml:2(term) pwck.8.xml:2(term)
-#: newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) pwconv.8.xml:32(term) pwck.8.xml:32(term)
+#: newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_WARN_AGE</option> (number)"
 msgstr "PASS_WARN_AGE (nummer)"
 
-#: useradd.8.xml:4(para) pwconv.8.xml:4(para) pwck.8.xml:4(para)
-#: newusers.8.xml:4(para) login.defs.5.xml:4(para)
+#: useradd.8.xml:34(para) pwconv.8.xml:34(para) pwck.8.xml:34(para)
+#: newusers.8.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "The number of days warning given before a password expires. A zero means "
 "warning is given only upon the day of expiration, a negative value means no "
 "warning is given. If not specified, no warning will be provided."
 msgstr ""
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: groupadd.8.xml:2(term)
+#: useradd.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: groupadd.8.xml:30(term)
 #, fuzzy
 msgid "<option>SYS_GID_MAX</option> (number)"
 msgstr "GID_MAX (nummer)"
 
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
-#: groupadd.8.xml:3(term)
+#: useradd.8.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
+#: groupadd.8.xml:31(term)
 #, fuzzy
 msgid "<option>SYS_GID_MIN</option> (number)"
 msgstr "GID_MIN (nummer)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
-#: groupadd.8.xml:5(para)
+#: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
+#: groupadd.8.xml:33(para)
 msgid ""
 "Range of group IDs used for the creation of system groups by "
 "<command>useradd</command>, <command>groupadd</command>, or "
 "<command>newusers</command>."
 msgstr ""
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
 #, fuzzy
 msgid "<option>SYS_UID_MAX</option> (number)"
 msgstr "UID_MAX (nummer)"
 
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
+#: useradd.8.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
 #, fuzzy
 msgid "<option>SYS_UID_MIN</option> (number)"
 msgstr "UID_MIN (nummer)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
+#: useradd.8.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
 msgid ""
 "Range of user IDs used for the creation of system users by <command>useradd</"
 "command> or <command>newusers</command>."
 msgstr ""
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>UID_MAX</option> (number)"
 msgstr "UID_MAX (nummer)"
 
-#: useradd.8.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
+#: useradd.8.xml:33(term) newusers.8.xml:33(term) login.defs.5.xml:33(term)
 #, fuzzy
 msgid "<option>UID_MIN</option> (number)"
 msgstr "UID_MIN (nummer)"
 
-#: useradd.8.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
+#: useradd.8.xml:35(para) newusers.8.xml:35(para) login.defs.5.xml:35(para)
 msgid ""
 "Range of user IDs used for the creation of regular users by "
 "<command>useradd</command> or <command>newusers</command>."
 msgstr ""
 
-#: useradd.8.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: login.1.xml:2(term)
+#: useradd.8.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: login.1.xml:32(term)
 #, fuzzy
 msgid "<option>UMASK</option> (number)"
 msgstr "UMASK (nummer)"
 
-#: useradd.8.xml:4(para) newusers.8.xml:4(para) login.defs.5.xml:4(para)
-#: login.1.xml:4(para)
+#: useradd.8.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
+#: login.1.xml:34(para)
 msgid ""
-"The permission mask is initialized to this value. If not specified, the "
-"permission mask will be initialized to 022."
+"The file mode creation mask is initialized to this value. If not specified, "
+"the mask will be initialized to 022."
 msgstr ""
 
-#: useradd.8.xml:520(filename)
+#: useradd.8.xml:38(para) newusers.8.xml:38(para) login.defs.5.xml:38(para)
+#: login.1.xml:38(para)
+msgid ""
+"<command>useradd</command> and <command>newusers</command> use this mask to "
+"set the mode of the home directory they create"
+msgstr ""
+
+#: useradd.8.xml:42(para) newusers.8.xml:42(para) login.defs.5.xml:42(para)
+#: login.1.xml:42(para)
+msgid ""
+"It is also used by <command>login</command> to define users' initial umask. "
+"Note that this mask can be overriden by the user's GECOS line (if "
+"<option>QUOTAS_ENAB</option> is set) or by the specification of a limit with "
+"the <emphasis>K</emphasis> identifier in "
+"<citerefentry><refentrytitle>limits</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>."
+msgstr ""
+
+#: useradd.8.xml:646(filename)
 msgid "/etc/default/useradd"
 msgstr "/etc/default/useradd"
 
-#: useradd.8.xml:522(para)
+#: useradd.8.xml:648(para)
 msgid "Default values for account creation."
 msgstr "Standardvärden för skapande av konto."
 
-#: useradd.8.xml:526(filename)
+#: useradd.8.xml:652(filename)
 msgid "/etc/skel/"
 msgstr "/etc/skel/"
 
-#: useradd.8.xml:528(para)
+#: useradd.8.xml:654(para)
 msgid "Directory containing default files."
 msgstr "Katalog som innehåller standardfiler."
 
-#: useradd.8.xml:564(replaceable) shadow.3.xml:6(manvolnum)
-#: pwck.8.xml:231(replaceable) passwd.1.xml:366(replaceable)
-#: grpck.8.xml:205(replaceable) groupmod.8.xml:156(replaceable)
-#: groupadd.8.xml:225(replaceable)
+#: useradd.8.xml:690(replaceable) shadow.3.xml:35(manvolnum)
+#: pwck.8.xml:264(replaceable) passwd.1.xml:408(replaceable)
+#: grpck.8.xml:237(replaceable) groupmod.8.xml:185(replaceable)
+#: groupadd.8.xml:251(replaceable)
 msgid "3"
 msgstr "3"
 
-#: useradd.8.xml:566(para) passwd.1.xml:386(para) groupmod.8.xml:158(para)
-#: groupadd.8.xml:227(para)
+#: useradd.8.xml:692(para) passwd.1.xml:428(para) groupmod.8.xml:187(para)
+#: groupadd.8.xml:253(para)
 msgid "invalid argument to option"
 msgstr "ogiltigt argument till flagga"
 
-#: useradd.8.xml:570(replaceable) pwck.8.xml:237(replaceable)
-#: passwd.1.xml:372(replaceable) grpck.8.xml:211(replaceable)
-#: groupmod.8.xml:162(replaceable) groupadd.8.xml:231(replaceable)
+#: useradd.8.xml:696(replaceable) pwck.8.xml:270(replaceable)
+#: passwd.1.xml:414(replaceable) grpck.8.xml:243(replaceable)
+#: groupmod.8.xml:191(replaceable) groupadd.8.xml:257(replaceable)
 msgid "4"
 msgstr "4"
 
-#: useradd.8.xml:572(para)
+#: useradd.8.xml:698(para)
 msgid "UID already in use (and no <option>-o</option>)"
 msgstr "UID används redan (och inget <option>-o</option>)"
 
-#: useradd.8.xml:578(para) groupmod.8.xml:164(para) groupmod.8.xml:170(para)
-#: groupdel.8.xml:96(para)
+#: useradd.8.xml:704(para) groupmod.8.xml:193(para) groupmod.8.xml:199(para)
+#: groupdel.8.xml:125(para)
 msgid "specified group doesn't exist"
 msgstr "angiven grupp finns inte"
 
-#: useradd.8.xml:582(replaceable) groupmod.8.xml:174(replaceable)
-#: groupadd.8.xml:237(replaceable)
+#: useradd.8.xml:708(replaceable) groupmod.8.xml:203(replaceable)
+#: groupadd.8.xml:263(replaceable)
 msgid "9"
 msgstr "9"
 
-#: useradd.8.xml:584(para)
+#: useradd.8.xml:710(para)
 msgid "username already in use"
 msgstr "användarnamnet används redan"
 
-#: useradd.8.xml:596(para)
+#: useradd.8.xml:722(para)
 msgid "can't create home directory"
 msgstr "kan inte skapa hemkatalog"
 
-#: useradd.8.xml:600(replaceable)
+#: useradd.8.xml:726(replaceable)
 msgid "13"
 msgstr "13"
 
-#: useradd.8.xml:602(para)
+#: useradd.8.xml:728(para)
 msgid "can't create mail spool"
 msgstr "kan inte skapa postkö"
 
-#: useradd.8.xml:542(para)
+#: useradd.8.xml:668(para)
 msgid ""
 "The <command>useradd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -1552,7 +1759,7 @@
 "Kommandot <command>useradd</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: useradd.8.xml:611(para)
+#: useradd.8.xml:737(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -1590,43 +1797,43 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: suauth.5.xml:5(refentrytitle) suauth.5.xml:10(refname)
+#: suauth.5.xml:34(refentrytitle) suauth.5.xml:39(refname)
 msgid "suauth"
 msgstr "suauth"
 
-#: suauth.5.xml:6(manvolnum) shadow.5.xml:6(manvolnum)
-#: pwck.8.xml:243(replaceable) porttime.5.xml:6(manvolnum)
-#: passwd.5.xml:6(manvolnum) passwd.1.xml:378(replaceable)
-#: login.defs.5.xml:67(manvolnum) login.access.5.xml:6(manvolnum)
-#: limits.5.xml:6(manvolnum) gshadow.5.xml:6(manvolnum)
-#: grpck.8.xml:217(replaceable) faillog.5.xml:6(manvolnum)
+#: suauth.5.xml:35(manvolnum) shadow.5.xml:35(manvolnum)
+#: pwck.8.xml:276(replaceable) porttime.5.xml:35(manvolnum)
+#: passwd.5.xml:35(manvolnum) passwd.1.xml:420(replaceable)
+#: login.defs.5.xml:98(manvolnum) login.access.5.xml:36(manvolnum)
+#: limits.5.xml:36(manvolnum) gshadow.5.xml:34(manvolnum)
+#: grpck.8.xml:249(replaceable) faillog.5.xml:35(manvolnum)
 msgid "5"
 msgstr "5"
 
-#: suauth.5.xml:7(refmiscinfo) shadow.5.xml:7(refmiscinfo)
-#: porttime.5.xml:7(refmiscinfo) passwd.5.xml:7(refmiscinfo)
-#: login.defs.5.xml:68(refmiscinfo) login.access.5.xml:7(refmiscinfo)
-#: limits.5.xml:7(refmiscinfo) gshadow.5.xml:7(refmiscinfo)
-#: faillog.5.xml:7(refmiscinfo)
+#: suauth.5.xml:36(refmiscinfo) shadow.5.xml:36(refmiscinfo)
+#: porttime.5.xml:36(refmiscinfo) passwd.5.xml:36(refmiscinfo)
+#: login.defs.5.xml:99(refmiscinfo) login.access.5.xml:37(refmiscinfo)
+#: limits.5.xml:37(refmiscinfo) gshadow.5.xml:35(refmiscinfo)
+#: faillog.5.xml:36(refmiscinfo)
 msgid "File Formats and Conversions"
 msgstr "Filformat och konversioner"
 
-#: suauth.5.xml:11(refpurpose)
+#: suauth.5.xml:40(refpurpose)
 msgid "detailed su control file"
 msgstr "detaljerad kontrollfil för su"
 
-#: suauth.5.xml:16(command) suauth.5.xml:142(filename)
+#: suauth.5.xml:45(command) suauth.5.xml:171(filename)
 msgid "/etc/suauth"
 msgstr "/etc/suauth"
 
-#: suauth.5.xml:22(para)
+#: suauth.5.xml:51(para)
 msgid ""
 "The file <filename>/etc/suauth</filename> is referenced whenever the su "
 "command is called. It can change the behaviour of the su command, based upon:"
 msgstr ""
 
 #. .RS
-#: suauth.5.xml:29(literallayout)
+#: suauth.5.xml:58(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -1635,12 +1842,12 @@
 msgstr ""
 
 #. .fi
-#: suauth.5.xml:33(para)
+#: suauth.5.xml:62(para)
 msgid ""
 "2) the user executing the su command (or any groups he might be a member of)"
 msgstr ""
 
-#: suauth.5.xml:38(para)
+#: suauth.5.xml:67(para)
 msgid ""
 "The file is formatted like this, with lines starting with a # being treated "
 "as comment lines and ignored;"
@@ -1648,7 +1855,7 @@
 "Filen är i följande format, med de rader som inleds med # behandlas som "
 "kommentarsrader och ignoreras;"
 
-#: suauth.5.xml:43(literallayout)
+#: suauth.5.xml:72(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -1659,7 +1866,7 @@
 "      till-id:från-id:ÅTGÄRD\n"
 "    "
 
-#: suauth.5.xml:47(para)
+#: suauth.5.xml:76(para)
 msgid ""
 "Where to-id is either the word <emphasis>ALL</emphasis>, a list of usernames "
 "delimited by \",\" or the words <emphasis>ALL EXCEPT</emphasis> followed by "
@@ -1669,7 +1876,7 @@
 "användarnamn separerade med \",\" eller orden <emphasis>ALL EXCEPT</"
 "emphasis> följt av en lista med användarnamn separerade med \",\""
 
-#: suauth.5.xml:53(para)
+#: suauth.5.xml:82(para)
 msgid ""
 "from-id is formatted the same as to-id except the extra word "
 "<emphasis>GROUP</emphasis> is recognised. <emphasis>ALL EXCEPT GROUP</"
@@ -1687,34 +1894,34 @@
 "<citerefentry><refentrytitle>/etc/group</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry> är nödvändigt."
 
-#: suauth.5.xml:64(para)
+#: suauth.5.xml:93(para)
 msgid "Action can be one only of the following currently supported options."
 msgstr "Åtgärden kan endast vara en av följande för närvarande stödda flaggor."
 
-#: suauth.5.xml:70(emphasis)
+#: suauth.5.xml:99(emphasis)
 msgid "DENY"
 msgstr "DENY"
 
-#: suauth.5.xml:73(para)
+#: suauth.5.xml:102(para)
 msgid "The attempt to su is stopped before a password is even asked for."
 msgstr "Försöket att använda su stoppades före ett lösenord har efterfrågats."
 
-#: suauth.5.xml:80(emphasis)
+#: suauth.5.xml:109(emphasis)
 msgid "NOPASS"
 msgstr "NOPASS"
 
-#: suauth.5.xml:83(para)
+#: suauth.5.xml:112(para)
 msgid ""
 "The attempt to su is automatically successful; no password is asked for."
 msgstr ""
 "Försöket att använda su lyckades helt automatiskt; inget lösenord har "
 "efterfrågats."
 
-#: suauth.5.xml:91(emphasis)
+#: suauth.5.xml:120(emphasis)
 msgid "OWNPASS"
 msgstr "OWNPASS"
 
-#: suauth.5.xml:94(para)
+#: suauth.5.xml:123(para)
 msgid ""
 "For the su command to be successful, the user must enter his or her own "
 "password. They are told this."
@@ -1722,7 +1929,7 @@
 "För att su-kommandot ska lyckas måste användaren mata in sitt egna lösenord. "
 "De blir frågade att göra detta."
 
-#: suauth.5.xml:102(para)
+#: suauth.5.xml:131(para)
 msgid ""
 "Note there are three separate fields delimited by a colon. No whitespace "
 "must surround this colon. Also note that the file is examined sequentially "
@@ -1731,11 +1938,11 @@
 "as fine control as he or she wishes."
 msgstr ""
 
-#: suauth.5.xml:112(title)
+#: suauth.5.xml:141(title)
 msgid "EXAMPLE"
 msgstr "EXEMPEL"
 
-#: suauth.5.xml:113(literallayout)
+#: suauth.5.xml:142(literallayout)
 #, no-wrap
 msgid ""
 "\n"
@@ -1784,29 +1991,29 @@
 "      #\n"
 "    "
 
-#: suauth.5.xml:149(title) pwconv.8.xml:105(title) login.defs.5.xml:428(title)
+#: suauth.5.xml:178(title) pwconv.8.xml:135(title) login.defs.5.xml:455(title)
 msgid "BUGS"
 msgstr "FEL"
 
-#: suauth.5.xml:150(para)
+#: suauth.5.xml:179(para)
 msgid ""
 "There could be plenty lurking. The file parser is particularly unforgiving "
 "about syntax errors, expecting no spurious whitespace (apart from beginning "
 "and end of lines), and a specific token delimiting different things."
 msgstr ""
 
-#: suauth.5.xml:159(title) shadow.3.xml:154(title)
+#: suauth.5.xml:188(title) shadow.3.xml:183(title)
 msgid "DIAGNOSTICS"
 msgstr "DIAGNOSTIK"
 
-#: suauth.5.xml:160(para)
+#: suauth.5.xml:189(para)
 msgid ""
 "An error parsing the file is reported using "
 "<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry> as level ERR on facility AUTH."
 msgstr ""
 
-#: suauth.5.xml:169(para)
+#: suauth.5.xml:198(para)
 msgid ""
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -1814,26 +2021,31 @@
 "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: su.1.xml:25(refentrytitle) su.1.xml:30(refname) su.1.xml:35(command)
-#: login.defs.5.xml:363(term)
+#: su.1.xml:54(refentrytitle) su.1.xml:59(refname) su.1.xml:64(command)
+#: login.defs.5.xml:395(term)
 msgid "su"
 msgstr "su"
 
-#: su.1.xml:27(refmiscinfo) sg.1.xml:11(refmiscinfo)
-#: passwd.1.xml:17(refmiscinfo) newgrp.1.xml:11(refmiscinfo)
-#: login.1.xml:43(refmiscinfo) groups.1.xml:7(refmiscinfo)
-#: gpasswd.1.xml:15(refmiscinfo) expiry.1.xml:13(refmiscinfo)
-#: chsh.1.xml:13(refmiscinfo) chfn.1.xml:14(refmiscinfo)
-#: chage.1.xml:7(refmiscinfo)
+#: su.1.xml:56(refmiscinfo) sg.1.xml:40(refmiscinfo)
+#: passwd.1.xml:46(refmiscinfo) newgrp.1.xml:40(refmiscinfo)
+#: login.1.xml:72(refmiscinfo) groups.1.xml:36(refmiscinfo)
+#: gpasswd.1.xml:44(refmiscinfo) expiry.1.xml:43(refmiscinfo)
+#: chsh.1.xml:42(refmiscinfo) chfn.1.xml:43(refmiscinfo)
+#: chage.1.xml:36(refmiscinfo)
 msgid "User Commands"
 msgstr "Användarkommandon"
 
-#: su.1.xml:31(refpurpose)
+#: su.1.xml:60(refpurpose)
 #, fuzzy
 msgid "change user ID or become superuser"
 msgstr "ändra användar-id eller bli superanvändare"
 
-#: su.1.xml:49(para)
+#: su.1.xml:70(replaceable) login.1.xml:85(replaceable)
+#: login.1.xml:93(replaceable)
+msgid "username"
+msgstr "användarnamn"
+
+#: su.1.xml:78(para)
 #, fuzzy
 msgid ""
 "The <command>su</command> command is used to become another user during a "
@@ -1848,7 +2060,7 @@
 "<option>-</option> kan användas för att tillhandahålla en miljö som liknar "
 "den som användaren skulle förvänta sig om användaren hade loggat in direkt."
 
-#: su.1.xml:58(para)
+#: su.1.xml:87(para)
 msgid ""
 "Additional arguments may be provided after the username, in which case they "
 "are supplied to the user's login shell. In particular, an argument of "
@@ -1857,7 +2069,7 @@
 "specified in <filename>/etc/passwd</filename> for the target user."
 msgstr ""
 
-#: su.1.xml:67(para)
+#: su.1.xml:96(para)
 msgid ""
 "You can use the <option>--</option> argument to separate <command>su</"
 "command> options from the arguments supplied to the shell."
@@ -1865,7 +2077,7 @@
 "Du kan använda argumentet <option>--</option> för att separera flaggorna "
 "till <command>su</command> från de argument som skickas till skalet."
 
-#: su.1.xml:72(para)
+#: su.1.xml:101(para)
 msgid ""
 "The user will be prompted for a password, if appropriate. Invalid passwords "
 "will produce an error message. All attempts, both valid and invalid, are "
@@ -1875,7 +2087,7 @@
 "Ogiltiga lösenord kommer att ge ett felmeddelande. Alla försök, både giltiga "
 "och ogiltiga, loggas för att detektera misskötsel av systemet."
 
-#: su.1.xml:77(para)
+#: su.1.xml:106(para)
 msgid ""
 "The current environment is passed to the new shell. The value of <envar>"
 "$PATH</envar> is reset to <filename>/bin:/usr/bin</filename> for normal "
@@ -1885,18 +2097,18 @@
 "filename>."
 msgstr ""
 
-#: su.1.xml:86(para) login.1.xml:135(para)
+#: su.1.xml:115(para) login.1.xml:166(para)
 msgid ""
 "A subsystem login is indicated by the presence of a \"*\" as the first "
 "character of the login shell. The given home directory will be used as the "
 "root of a new file system which the user is actually logged into."
 msgstr ""
 
-#: su.1.xml:95(para)
+#: su.1.xml:124(para)
 msgid "The options which apply to the <command>su</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>su</command> är:"
 
-#: su.1.xml:99(term)
+#: su.1.xml:128(term)
 #, fuzzy
 msgid ""
 "<option>-c</option>, <option>--command</option><replaceable>COMMAND</"
@@ -1905,17 +2117,17 @@
 "<option>-c</option>, <option>--comment</option><replaceable>KOMMENTAR</"
 "replaceable>"
 
-#: su.1.xml:104(para)
+#: su.1.xml:133(para)
 msgid ""
 "Specify a command that will be invoked by the shell using its <option>-c</"
 "option>."
 msgstr "Ange ett kommando som ska startas av skalet med <option>-c</option>."
 
-#: su.1.xml:111(term)
+#: su.1.xml:140(term)
 msgid "<option>-</option>, <option>-l</option>, <option>--login</option>"
 msgstr "<option>-</option>, <option>-l</option>, <option>--login</option>"
 
-#: su.1.xml:115(para)
+#: su.1.xml:144(para)
 msgid ""
 "Provide an environment similar to what the user would expect had the user "
 "logged in directly."
@@ -1923,7 +2135,7 @@
 "Tillhandahåll en miljö som liknar den som användaren skulle förvänta sig om "
 "användaren loggat in direkt."
 
-#: su.1.xml:119(para)
+#: su.1.xml:148(para)
 msgid ""
 "When <option>-</option> is used, it must be specified as the last "
 "<command>su</command> option. The other forms (<option>-l</option> and "
@@ -1933,15 +2145,15 @@
 "<command>su</command>. De andra formerna (<option>-l</option> och <option>--"
 "login</option>) har inte denna restriktion."
 
-#: su.1.xml:133(para)
+#: su.1.xml:162(para)
 msgid "The shell that will be invoked."
 msgstr "Skalet som ska startas."
 
-#: su.1.xml:138(para)
+#: su.1.xml:167(para)
 msgid "The shell specified with --shell."
 msgstr "Skalet angivet med --shell."
 
-#: su.1.xml:141(para)
+#: su.1.xml:170(para)
 msgid ""
 "If <option>--preserve-environment</option> is used, the shell specified by "
 "the <envar>$SHELL</envar> environment variable."
@@ -1949,13 +2161,13 @@
 "Om <option>--preserve-environment</option> används, anges skalet med "
 "miljövariabeln <envar>$SHELL</envar>."
 
-#: su.1.xml:148(para)
+#: su.1.xml:177(para)
 msgid ""
 "The shell indicated in the <filename>/etc/passwd</filename> entry for the "
 "target user."
 msgstr ""
 
-#: su.1.xml:154(para)
+#: su.1.xml:183(para)
 msgid ""
 "<filename>/bin/sh</filename> if a shell could not be found by any above "
 "method."
@@ -1963,12 +2175,12 @@
 "<filename>/bin/sh</filename> om ett skal inte kunde hittas med någon "
 "ovanstående metod."
 
-#: su.1.xml:134(para)
+#: su.1.xml:163(para)
 msgid ""
 "The invoked shell is chosen from (highest priority first): <placeholder-1/>"
 msgstr ""
 
-#: su.1.xml:161(para)
+#: su.1.xml:190(para)
 msgid ""
 "If the target user has a restricted shell (i.e. the shell field of this "
 "user's entry in <filename>/etc/passwd</filename> is not listed in <filename>/"
@@ -1977,7 +2189,7 @@
 "unless <command>su</command> is called by root."
 msgstr ""
 
-#: su.1.xml:172(term)
+#: su.1.xml:201(term)
 msgid ""
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
@@ -1985,11 +2197,11 @@
 "<option>-m</option>, <option>-p</option>, <option>--preserve-environment</"
 "option>"
 
-#: su.1.xml:177(para)
+#: su.1.xml:206(para)
 msgid "Preserve the current environment."
 msgstr "Behåll den aktuella miljön."
 
-#: su.1.xml:178(para)
+#: su.1.xml:207(para)
 msgid ""
 "If the target user has a restricted shell, this option has no effect (unless "
 "<command>su</command> is called by root)."
@@ -1997,7 +2209,7 @@
 "Om målanvändaren har ett begränsat skal har denna flagga ingen effekt "
 "(såvida inte <command>su</command> har startats av root)."
 
-#: su.1.xml:189(para)
+#: su.1.xml:218(para)
 msgid ""
 "This version of <command>su</command> has many compilation options, only "
 "some of which may be in use at any particular site."
@@ -2005,28 +2217,28 @@
 "Denna version av <command>su</command> har många kompileringsflaggor, kanske "
 "bara några används på specifika system."
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>CONSOLE</option> (string)"
 msgstr "CHFN_RESTRICT (sträng)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, either full pathname of a file containing device names or a \":"
 "\" delimited list of device names. Root logins will be allowed only upon "
 "these devices."
 msgstr ""
 
-#: su.1.xml:9(para) login.defs.5.xml:9(para) login.1.xml:9(para)
+#: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
 msgid "If not defined, root will be allowed on any device."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>CONSOLE_GROUPS</option> (string)"
 msgstr "CHFN_RESTRICT (sträng)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "List of groups to add to the user's supplementary group set when logging in "
 "on the console (as determined by the CONSOLE setting). Default is none. "
@@ -2034,18 +2246,18 @@
 "permanent access to these groups, even when not logged in on the console."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>DEFAULT_HOME</option> (boolean)"
 msgstr "CHFN_AUTH (boolesk)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Indicate if login is allowed if we can't cd to the home directory. Default "
 "in no."
 msgstr ""
 
-#: su.1.xml:8(para) login.defs.5.xml:8(para) login.1.xml:8(para)
+#: su.1.xml:38(para) login.defs.5.xml:38(para) login.1.xml:38(para)
 msgid ""
 "If set to <replaceable>yes</replaceable>, the user will login in the root "
 "(<filename>/</filename>) directory if it is not possible to cd to her home "
@@ -2053,41 +2265,41 @@
 msgstr ""
 
 #. XXX: When compiled with PAM support, only sulogin uses ENV_HZ
-#: su.1.xml:3(term) login.defs.5.xml:3(term) login.1.xml:3(term)
+#: su.1.xml:33(term) login.defs.5.xml:33(term) login.1.xml:33(term)
 #, fuzzy
 msgid "<option>ENV_HZ</option> (string)"
 msgstr "MAIL_DIR (sträng)"
 
-#: su.1.xml:5(para) login.defs.5.xml:5(para) login.1.xml:5(para)
+#: su.1.xml:35(para) login.defs.5.xml:35(para) login.1.xml:35(para)
 msgid ""
 "If set, it will be used to define the HZ environment variable when a user "
 "login. The value must be preceded by <replaceable>HZ=</replaceable>. A "
 "common value on Linux is <replaceable>HZ=100</replaceable>."
 msgstr ""
 
-#: su.1.xml:11(para) login.defs.5.xml:11(para) login.1.xml:11(para)
+#: su.1.xml:41(para) login.defs.5.xml:41(para) login.1.xml:41(para)
 msgid ""
 "The <envar>HZ</envar> environment variable is only set when the user (the "
 "superuser) logs in with <command>sulogin</command>."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENVIRON_FILE</option> (string)"
 msgstr "MAIL_DIR (sträng)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If this file exists and is readable, login environment will be read from it. "
 "Every line should be in the form name=value."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_PATH</option> (string)"
 msgstr "CHFN_RESTRICT (sträng)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, it will be used to define the PATH environment variable when a "
 "regular user login. The value can be preceded by <replaceable>PATH=</"
@@ -2096,12 +2308,12 @@
 "usr/bin</replaceable>."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_SUPATH</option> (string)"
 msgstr "CHFN_RESTRICT (sträng)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, it will be used to define the PATH environment variable when the "
 "superuser login. The value can be preceded by <replaceable>PATH=</"
@@ -2110,12 +2322,12 @@
 "<replaceable>PATH=/bin:/usr/bin</replaceable>."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ENV_TZ</option> (string)"
 msgstr "CHFN_RESTRICT (sträng)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, it will be used to define the TZ environment variable when a user "
 "login. The value can be the name of a timezone preceded by <replaceable>TZ=</"
@@ -2125,72 +2337,72 @@
 msgstr ""
 
 #. TODO: it can in fact be used to set any other variable
-#: su.1.xml:13(para) login.defs.5.xml:13(para) login.1.xml:13(para)
+#: su.1.xml:43(para) login.defs.5.xml:43(para) login.1.xml:43(para)
 msgid ""
 "If a full path is specified but the file does not exist or cannot be read, "
 "the default is to use <replaceable>TZ=CST6CDT</replaceable>."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
-#: chsh.1.xml:2(term) chfn.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
+#: chsh.1.xml:32(term) chfn.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOGIN_STRING</option> (string)"
 msgstr "CHFN_RESTRICT (sträng)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
-#: chsh.1.xml:4(para) chfn.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
+#: chsh.1.xml:34(para) chfn.1.xml:34(para)
 msgid ""
 "The string used for prompting a password. The default is to use \"Password: "
 "\", or a translation of that string. If you set this variable, the prompt "
 "will no be translated."
 msgstr ""
 
-#: su.1.xml:9(para) login.defs.5.xml:9(para) login.1.xml:9(para)
-#: chsh.1.xml:9(para) chfn.1.xml:9(para)
+#: su.1.xml:39(para) login.defs.5.xml:39(para) login.1.xml:39(para)
+#: chsh.1.xml:39(para) chfn.1.xml:39(para)
 msgid ""
 "If the string contains <replaceable>%s</replaceable>, this will be replaced "
 "by the user's name."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>MAIL_CHECK_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (boolesk)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable checking and display of mailbox status upon login."
 msgstr ""
 
-#: su.1.xml:7(para) login.defs.5.xml:7(para) login.1.xml:7(para)
+#: su.1.xml:37(para) login.defs.5.xml:37(para) login.1.xml:37(para)
 msgid ""
 "You should disable it if the shell startup files already check for mail "
 "(\"mailx -e\" or equivalent)."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term) login.1.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>QUOTAS_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (boolesk)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para) login.1.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable setting of ulimit, umask, and niceness from passwd gecos field."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SULOG_FILE</option> (string)"
 msgstr "CHFN_RESTRICT (sträng)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "If defined, all su activity is logged to this file."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SU_NAME</option> (string)"
 msgstr "MAIL_DIR (sträng)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "If defined, the command name to display when running \"su -\". For example, "
 "if this is defined as \"su\" then a \"ps\" will display the command is \"-su"
@@ -2198,12 +2410,12 @@
 "being run, e.g. something like \"-sh\"."
 msgstr ""
 
-#: su.1.xml:3(term) login.defs.5.xml:3(term)
+#: su.1.xml:33(term) login.defs.5.xml:33(term)
 #, fuzzy
 msgid "<option>SU_WHEEL_ONLY</option> (boolean)"
 msgstr "CHFN_AUTH (boolesk)"
 
-#: su.1.xml:5(para) login.defs.5.xml:5(para)
+#: su.1.xml:35(para) login.defs.5.xml:35(para)
 msgid ""
 "If <replaceable>yes</replaceable>, the user must be listed as a member of "
 "the first gid 0 group in <filename>/etc/group</filename> (called "
@@ -2212,18 +2424,18 @@
 "empty, no one will be able to <command>su</command> to uid 0."
 msgstr ""
 
-#: su.1.xml:2(term) login.defs.5.xml:2(term)
+#: su.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SYSLOG_SU_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (boolesk)"
 
-#: su.1.xml:4(para) login.defs.5.xml:4(para)
+#: su.1.xml:34(para) login.defs.5.xml:34(para)
 msgid ""
 "Enable \"syslog\" logging of <command>su</command> activity - in addition to "
 "sulog file logging."
 msgstr ""
 
-#: su.1.xml:243(para)
+#: su.1.xml:272(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -2239,27 +2451,27 @@
 "citerefentry>, <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</"
 "manvolnum></citerefentry>"
 
-#: sg.1.xml:9(refentrytitle) sg.1.xml:14(refname) sg.1.xml:20(command)
+#: sg.1.xml:38(refentrytitle) sg.1.xml:43(refname) sg.1.xml:49(command)
 msgid "sg"
 msgstr "sg"
 
-#: sg.1.xml:15(refpurpose)
+#: sg.1.xml:44(refpurpose)
 msgid "execute command as different group ID"
 msgstr "kör kommando med annat grupp-id"
 
-#: sg.1.xml:21(arg) newgrp.1.xml:20(arg)
+#: sg.1.xml:50(arg) newgrp.1.xml:49(arg)
 msgid "-"
 msgstr "-"
 
-#: sg.1.xml:23(arg) expiry.1.xml:23(arg)
+#: sg.1.xml:52(arg) expiry.1.xml:53(arg)
 msgid "-c"
 msgstr "-c"
 
-#: sg.1.xml:22(arg)
+#: sg.1.xml:51(arg)
 msgid "group <placeholder-1/> command"
 msgstr "grupp <placeholder-1/> kommando"
 
-#: sg.1.xml:31(para)
+#: sg.1.xml:60(para)
 msgid ""
 "The <command>sg</command> command works similar to <command>newgrp</command> "
 "but accepts a command. The command will be executed with the <filename>/bin/"
@@ -2272,16 +2484,16 @@
 "command> command you are returned to your previous group ID."
 msgstr ""
 
-#: sg.1.xml:2(term) newgrp.1.xml:2(term) login.defs.5.xml:2(term)
+#: sg.1.xml:32(term) newgrp.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>SYSLOG_SG_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (boolesk)"
 
-#: sg.1.xml:4(para) newgrp.1.xml:4(para) login.defs.5.xml:4(para)
+#: sg.1.xml:34(para) newgrp.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Enable \"syslog\" logging of <command>sg</command> activity."
 msgstr ""
 
-#: sg.1.xml:90(para)
+#: sg.1.xml:119(para)
 #, fuzzy
 #| msgid ""
 #| "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -2318,235 +2530,384 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
-#: shadow.5.xml:5(refentrytitle) shadow.5.xml:10(refname)
-#: shadow.3.xml:5(refentrytitle) shadow.3.xml:10(refname)
-#: pwck.8.xml:31(replaceable) pwck.8.xml:45(replaceable)
-#: grpck.8.xml:24(replaceable) grpck.8.xml:33(replaceable)
+#: shadow.5.xml:34(refentrytitle) shadow.5.xml:39(refname)
+#: shadow.3.xml:34(refentrytitle) shadow.3.xml:39(refname)
+#: pwck.8.xml:60(replaceable) pwck.8.xml:74(replaceable)
+#: grpck.8.xml:53(replaceable) grpck.8.xml:62(replaceable)
 msgid "shadow"
 msgstr "shadow"
 
-#: shadow.5.xml:11(refpurpose)
+#: shadow.5.xml:40(refpurpose)
 msgid "encrypted password file"
 msgstr "krypterad lösenordsfil"
 
-#: shadow.5.xml:16(para)
+#: shadow.5.xml:45(para)
+#, fuzzy
+#| msgid ""
+#| "<filename>/etc/gshadow</filename> contains the shadowed information for "
+#| "group accounts. It contains lines with the following colon-separated "
+#| "fields:"
 msgid ""
-"<emphasis remap=\"I\">shadow</emphasis> contains the encrypted password "
-"information for user's accounts and optional the password aging information. "
-"Included is:"
+"<filename>shadow</filename> is a file which contains the password "
+"information for the system's accounts and optional aging information."
 msgstr ""
+"<filename>/etc/gshadow</filename> innehåller skuggad gruppkontoinformation. "
+"Den innehåller rader med följande kolonseparerade fält:"
 
-#: shadow.5.xml:23(para) passwd.5.xml:24(para)
+#: shadow.5.xml:51(para) gshadow.5.xml:82(para)
+msgid ""
+"This file must not be readable by regular users if password security is to "
+"be maintained."
+msgstr ""
+"Denna fil får inte vara läsbar av vanliga användare om lösenordssäkerheten "
+"ska upprätthållas."
+
+#: shadow.5.xml:56(para)
+msgid ""
+"Each line of this file contains 9 fields, separated by colons (<quote>:</"
+"quote>), in the following order:"
+msgstr ""
+
+#: shadow.5.xml:63(emphasis) passwd.5.xml:53(para)
 msgid "login name"
 msgstr "inloggningsnamn"
 
-#: shadow.5.xml:26(para) gshadow.5.xml:26(para)
+#: shadow.5.xml:65(para)
+msgid "It must be a valid account name, which exist on the system."
+msgstr ""
+
+#: shadow.5.xml:71(emphasis) gshadow.5.xml:54(para)
 msgid "encrypted password"
 msgstr "krypterat lösenord"
 
-#: shadow.5.xml:29(para)
-msgid "days since Jan 1, 1970 that password was last changed"
-msgstr "dagar sedan 1:a januari, 1970 som lösenordet senast ändrades"
+#: shadow.5.xml:73(para)
+msgid ""
+"Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+"manvolnum></citerefentry> for details on how this string is interpreted."
+msgstr ""
+"Referera till <citerefentry><refentrytitle>crypt</"
+"refentrytitle><manvolnum>3</manvolnum></citerefentry> för detaljer om hur "
+"denna sträng tolkas."
 
-#: shadow.5.xml:32(para)
-msgid "days before password may be changed"
+#: shadow.5.xml:78(para)
+#, fuzzy
+msgid ""
+"If the password field contains some string that is not a valid result of "
+"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
+"citerefentry>, for instance ! or *, the user will not be able to use a unix "
+"password to log in (but the user may log in the system by other means)."
+msgstr ""
+"Referera till <citerefentry><refentrytitle>crypt</"
+"refentrytitle><manvolnum>3</manvolnum></citerefentry> för detaljer om hur "
+"denna sträng tolkas."
+
+#: shadow.5.xml:85(para)
+msgid ""
+"This field may be empty, in which case no passwords are required to "
+"authenticate as the specified login name. However, some applications which "
+"read the <filename>/etc/shadow</filename> file may decide not to permit any "
+"access at all if the password field is empty."
+msgstr ""
+
+#: shadow.5.xml:92(para)
+msgid ""
+"A password field which starts with a exclamation mark means that the "
+"password is locked. The remaining characters on the line represent the "
+"password field before the password was locked."
+msgstr ""
+
+#: shadow.5.xml:102(emphasis)
+#, fuzzy
+#| msgid "days before password may be changed"
+msgid "date of last password change"
 msgstr "dagar innan lösenordet får ändras"
 
-#: shadow.5.xml:35(para)
-msgid "days after which password must be changed"
-msgstr "dagar efter vilket lösenordet måste ändras"
+#: shadow.5.xml:105(para)
+msgid ""
+"The date of the last password change, expressed as the number of days since "
+"Jan 1, 1970."
+msgstr ""
 
-#: shadow.5.xml:38(para)
-msgid "days before password is to expire that user is warned"
-msgstr "dagar innan lösenordet går ut som användaren varnas"
+#: shadow.5.xml:109(para)
+msgid ""
+"The value 0 has a special meaning, which is that the user should change her "
+"pasword the next time she will log in the system."
+msgstr ""
 
-#: shadow.5.xml:41(para)
-msgid "days after password expires that account is disabled"
-msgstr "dagar efter att lösenordet gått ut och kontot inaktiveras"
+#: shadow.5.xml:114(para)
+msgid "An empty field means that password aging features are disabled."
+msgstr ""
 
-#: shadow.5.xml:44(para)
-msgid "days since Jan 1, 1970 that account is disabled"
-msgstr "dagar sedan 1:a januari 1970 som kontot är inaktiverat"
+#: shadow.5.xml:121(emphasis)
+#, fuzzy
+#| msgid "Password Changes"
+msgid "minimum password age"
+msgstr "Lösenordsändringar"
 
-#: shadow.5.xml:47(para)
-msgid "a reserved field"
-msgstr "ett reserverat fält"
+#: shadow.5.xml:123(para)
+msgid ""
+"The minimum password age is the number of days the user will have to wait "
+"before she will be allowed to change her password again."
+msgstr ""
 
-#: shadow.5.xml:51(para)
+#: shadow.5.xml:128(para)
+msgid "An empty field and value 0 mean that there are no minimum password age."
+msgstr ""
+
+#: shadow.5.xml:135(emphasis)
+#, fuzzy
+#| msgid "Password Changes"
+msgid "maximum password age"
+msgstr "Lösenordsändringar"
+
+#: shadow.5.xml:137(para)
 msgid ""
-"The password field must be filled. The encrypted password consists of 13 to "
-"24 characters from the 64 character alphabet a thru z, A thru Z, 0 thru 9, "
-"\\. and /. Optionally it can start with a \"$\" character. This means the "
-"encrypted password was generated using another (not DES) algorithm. For "
-"example if it starts with \"$1$\" it means the MD5-based algorithm was used."
+"The maximum password age is the number of days after which the user will "
+"have to change her password."
 msgstr ""
 
-#: shadow.5.xml:60(para)
+#: shadow.5.xml:141(para)
 msgid ""
-"Refer to <citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry> for details on how this string is interpreted."
+"After this number of days is elapsed, the password may still be valid. The "
+"user should be asked to change her password the next time she will log in."
 msgstr ""
-"Referera till <citerefentry><refentrytitle>crypt</"
-"refentrytitle><manvolnum>3</manvolnum></citerefentry> för detaljer om hur "
-"denna sträng tolkas."
 
-#: shadow.5.xml:68(para)
+#: shadow.5.xml:146(para)
 msgid ""
-"If the password field contains some string that is not valid result of "
-"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
-"citerefentry>, for instance ! or *, the user will not be able to use a unix "
-"password to log in, subject to <citerefentry><refentrytitle>pam</"
-"refentrytitle><manvolnum>7</manvolnum></citerefentry>."
+"An empty field means that there are no maximum password age, no password "
+"warning period, and no password inactivity period (see below)."
 msgstr ""
 
-#: shadow.5.xml:77(para)
+#: shadow.5.xml:151(para)
 msgid ""
-"The date of the last password change is given as the number of days since "
-"Jan 1, 1970. The password may not be changed again until the proper number "
-"of days have passed, and must be changed after the maximum number of days. "
-"If the minimum number of days required is greater than the maximum number of "
-"day allowed, this password may not be changed by the user."
+"If the maximum password age is lower than the minimum password age, the user "
+"cannot change her password."
 msgstr ""
 
-#: shadow.5.xml:86(para)
+#: shadow.5.xml:159(emphasis)
+#, fuzzy
+#| msgid "Password Changes"
+msgid "password warning period"
+msgstr "Lösenordsändringar"
+
+#: shadow.5.xml:162(para)
+#, fuzzy
+#| msgid ""
+#| "The number of days after a password has expired before the account will "
+#| "be disabled."
 msgid ""
-"An account is considered to be inactive and is disabled if the password is "
-"not changed within the specified number of days after the password expires. "
-"An account will also be disabled on the specified day regardless of other "
-"password expiration information."
+"The number of days before a password is going to expire (see the maximum "
+"password age above) during which the user should be warned."
 msgstr ""
+"Antalet dagar efter att ett lösenord har gått ut innan kontot kommer att "
+"inaktiveras."
 
-#: shadow.5.xml:93(para)
+#: shadow.5.xml:167(para)
 msgid ""
-"This information supersedes any password or password age information present "
-"in <filename>/etc/passwd</filename>."
+"An empty field and value 0 mean that there are no password warning period."
 msgstr ""
 
-#: shadow.5.xml:98(para) gshadow.5.xml:54(para)
+#: shadow.5.xml:175(emphasis)
+msgid "password inactivity period"
+msgstr ""
+
+#: shadow.5.xml:178(para)
 msgid ""
-"This file must not be readable by regular users if password security is to "
-"be maintained."
+"The number of days after a password has expired (see the maximum password "
+"age above) during which the password should still be accepted (and the user "
+"should update her password during the next login)."
 msgstr ""
-"Denna fil får inte vara läsbar av vanliga användare om lösenordssäkerheten "
-"ska upprätthållas."
 
-#: shadow.5.xml:124(para)
+#: shadow.5.xml:184(para)
 msgid ""
+"After expiration of the password and this expiration period is elapsed, no "
+"login is possible using the current user's password. The user should contact "
+"her administrator."
+msgstr ""
+
+#: shadow.5.xml:189(para)
+msgid ""
+"An empty field means that there are no enforcement of an inactivity period."
+msgstr ""
+
+#: shadow.5.xml:197(emphasis)
+#, fuzzy
+#| msgid "User account information."
+msgid "account expiration date"
+msgstr "Användarkontoinformation."
+
+#: shadow.5.xml:200(para)
+msgid ""
+"The date of expiration of the account, expressed as the number of days since "
+"Jan 1, 1970."
+msgstr ""
+
+#: shadow.5.xml:204(para)
+msgid ""
+"Note that an account expiration differs from a password expiration. In case "
+"of an acount expiration, the user shall not be allowed to login. In case of "
+"a password expiration, the user is not allowed to login using her password."
+msgstr ""
+
+#: shadow.5.xml:210(para)
+msgid "An empty field means that the account will never expire."
+msgstr ""
+
+#: shadow.5.xml:213(para)
+msgid ""
+"The value 0 should not be used as it is interpreted as either an account "
+"with no expiration, or as an expiration on Jan 1, 1970."
+msgstr ""
+
+#: shadow.5.xml:221(emphasis)
+#, fuzzy
+#| msgid "a reserved field"
+msgid "reserved field"
+msgstr "ett reserverat fält"
+
+#: shadow.5.xml:223(para)
+#, fuzzy
+#| msgid "sp_flag - reserved for future use"
+msgid "This field is reserved for future use."
+msgstr "sp_flag - reserverat för framtida användning"
+
+#: shadow.5.xml:249(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>"
+msgid ""
 "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>pwconv</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>login</"
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>pwconv</"
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>groupadd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>userdel</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>"
 
-#: shadow.3.xml:7(refmiscinfo)
+#: shadow.3.xml:36(refmiscinfo)
 msgid "Library Calls"
 msgstr "Biblioteksanrop"
 
-#: shadow.3.xml:11(refname)
+#: shadow.3.xml:40(refname)
 msgid "getspnam"
 msgstr "getspnam"
 
-#: shadow.3.xml:12(refpurpose)
+#: shadow.3.xml:41(refpurpose)
 msgid "encrypted password file routines"
 msgstr ""
 
-#: shadow.3.xml:16(title)
+#: shadow.3.xml:45(title)
 msgid "SYNTAX"
 msgstr "SYNTAX"
 
-#: shadow.3.xml:18(emphasis)
+#: shadow.3.xml:47(emphasis)
 msgid "#include &lt;shadow.h&gt;"
 msgstr "#include &lt;shadow.h&gt;"
 
-#: shadow.3.xml:22(emphasis)
+#: shadow.3.xml:51(emphasis)
 msgid "struct spwd *getspent();"
 msgstr "struct spwd *getspent();"
 
-#: shadow.3.xml:26(emphasis)
+#: shadow.3.xml:55(emphasis)
 msgid "struct spwd *getspnam(char"
 msgstr "struct spwd *getspnam(char"
 
-#: shadow.3.xml:27(emphasis)
+#: shadow.3.xml:56(emphasis)
 msgid "*name"
 msgstr "*name"
 
-#: shadow.3.xml:27(emphasis) shadow.3.xml:40(emphasis)
-#: shadow.3.xml:45(emphasis) shadow.3.xml:51(emphasis)
+#: shadow.3.xml:56(emphasis) shadow.3.xml:69(emphasis)
+#: shadow.3.xml:74(emphasis) shadow.3.xml:80(emphasis)
 msgid ");"
 msgstr ");"
 
-#: shadow.3.xml:31(emphasis)
+#: shadow.3.xml:60(emphasis)
 msgid "void setspent();"
 msgstr "void setspent();"
 
-#: shadow.3.xml:35(emphasis)
+#: shadow.3.xml:64(emphasis)
 msgid "void endspent();"
 msgstr "void endspent();"
 
-#: shadow.3.xml:39(emphasis)
+#: shadow.3.xml:68(emphasis)
 msgid "struct spwd *fgetspent(FILE"
 msgstr "struct spwd *fgetspent(FILE"
 
-#: shadow.3.xml:40(emphasis) shadow.3.xml:51(emphasis)
+#: shadow.3.xml:69(emphasis) shadow.3.xml:80(emphasis)
 msgid "*fp"
 msgstr "*fp"
 
-#: shadow.3.xml:44(emphasis)
+#: shadow.3.xml:73(emphasis)
 msgid "struct spwd *sgetspent(char"
 msgstr "struct spwd *sgetspent(char"
 
-#: shadow.3.xml:45(emphasis)
+#: shadow.3.xml:74(emphasis)
 msgid "*cp"
 msgstr "*cp"
 
-#: shadow.3.xml:49(emphasis)
+#: shadow.3.xml:78(emphasis)
 msgid "int putspent(struct spwd"
 msgstr "int putspent(struct spwd"
 
-#: shadow.3.xml:50(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "*p,"
 msgstr "*p,"
 
-#: shadow.3.xml:50(emphasis)
+#: shadow.3.xml:79(emphasis)
 msgid "FILE"
 msgstr "FIL"
 
-#: shadow.3.xml:55(emphasis)
+#: shadow.3.xml:84(emphasis)
 msgid "int lckpwdf();"
 msgstr "int lckpwdf();"
 
-#: shadow.3.xml:59(emphasis)
+#: shadow.3.xml:88(emphasis)
 msgid "int ulckpwdf();"
 msgstr "int ulckpwdf();"
 
-#: shadow.3.xml:65(para)
+#: shadow.3.xml:94(para)
 msgid ""
 "<emphasis remap=\"I\">shadow</emphasis> manipulates the contents of the "
 "shadow password file, <filename>/etc/shadow</filename>. The structure in the "
 "<emphasis remap=\"I\">#include</emphasis> file is:"
 msgstr ""
 
-#: shadow.3.xml:70(programlisting)
+#: shadow.3.xml:99(programlisting)
 #, no-wrap
 msgid ""
 "struct spwd {\n"
@@ -2563,51 +2924,51 @@
 "    "
 msgstr ""
 
-#: shadow.3.xml:82(para)
+#: shadow.3.xml:111(para)
 msgid "The meanings of each field are:"
 msgstr "Betydelsen av varje fält är:"
 
-#: shadow.3.xml:85(para)
+#: shadow.3.xml:114(para)
 msgid "sp_namp - pointer to null-terminated user name"
 msgstr ""
 
-#: shadow.3.xml:88(para)
+#: shadow.3.xml:117(para)
 msgid "sp_pwdp - pointer to null-terminated password"
 msgstr ""
 
-#: shadow.3.xml:91(para)
+#: shadow.3.xml:120(para)
 msgid "sp_lstchg - days since Jan 1, 1970 password was last changed"
 msgstr ""
 
-#: shadow.3.xml:94(para)
+#: shadow.3.xml:123(para)
 msgid "sp_min - days before which password may not be changed"
 msgstr ""
 
-#: shadow.3.xml:97(para)
+#: shadow.3.xml:126(para)
 msgid "sp_max - days after which password must be changed"
 msgstr ""
 
-#: shadow.3.xml:100(para)
+#: shadow.3.xml:129(para)
 msgid ""
 "sp_warn - days before password is to expire that user is warned of pending "
 "password expiration"
 msgstr ""
 
-#: shadow.3.xml:105(para)
+#: shadow.3.xml:134(para)
 msgid ""
 "sp_inact - days after password expires that account is considered inactive "
 "and disabled"
 msgstr ""
 
-#: shadow.3.xml:110(para)
+#: shadow.3.xml:139(para)
 msgid "sp_expire - days since Jan 1, 1970 when account will be disabled"
 msgstr ""
 
-#: shadow.3.xml:113(para)
+#: shadow.3.xml:142(para)
 msgid "sp_flag - reserved for future use"
 msgstr "sp_flag - reserverat för framtida användning"
 
-#: shadow.3.xml:121(para)
+#: shadow.3.xml:150(para)
 msgid ""
 "<emphasis>getspent</emphasis>, <emphasis>getspname</emphasis>, "
 "<emphasis>fgetspent</emphasis>, and <emphasis>sgetspent</emphasis> each "
@@ -2620,13 +2981,13 @@
 "the file for an entry matching <emphasis>name</emphasis>."
 msgstr ""
 
-#: shadow.3.xml:134(para)
+#: shadow.3.xml:163(para)
 msgid ""
 "<emphasis>setspent</emphasis> and <emphasis>endspent</emphasis> may be used "
 "to begin and end, respectively, access to the shadow password file."
 msgstr ""
 
-#: shadow.3.xml:140(para)
+#: shadow.3.xml:169(para)
 msgid ""
 "The <emphasis>lckpwdf</emphasis> and <emphasis>ulckpwdf</emphasis> routines "
 "should be used to insure exclusive access to the <filename>/etc/shadow</"
@@ -2638,20 +2999,20 @@
 "locks are acquired 0 is returned."
 msgstr ""
 
-#: shadow.3.xml:155(para)
+#: shadow.3.xml:184(para)
 msgid ""
 "Routines return NULL if no more entries are available or if an error occurs "
 "during processing. Routines which have <emphasis>int</emphasis> as the "
 "return value return 0 for success and -1 for failure."
 msgstr ""
 
-#: shadow.3.xml:165(para)
+#: shadow.3.xml:194(para)
 msgid ""
 "These routines may only be used by the superuser as access to the shadow "
 "password file is restricted."
 msgstr ""
 
-#: shadow.3.xml:185(para)
+#: shadow.3.xml:214(para)
 msgid ""
 "<citerefentry><refentrytitle>getpwent</refentrytitle><manvolnum>3</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -2661,37 +3022,37 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: pwconv.8.xml:12(refentrytitle) pwconv.8.xml:17(refname)
-#: pwconv.8.xml:26(command) login.defs.5.xml:356(term)
+#: pwconv.8.xml:42(refentrytitle) pwconv.8.xml:47(refname)
+#: pwconv.8.xml:56(command) login.defs.5.xml:388(term)
 msgid "pwconv"
 msgstr "pwconv"
 
-#: pwconv.8.xml:18(refname) pwconv.8.xml:29(command)
+#: pwconv.8.xml:48(refname) pwconv.8.xml:59(command)
 msgid "pwunconv"
 msgstr "pwunconv"
 
-#: pwconv.8.xml:19(refname) pwconv.8.xml:32(command)
-#: login.defs.5.xml:270(term)
+#: pwconv.8.xml:49(refname) pwconv.8.xml:62(command)
+#: login.defs.5.xml:302(term)
 msgid "grpconv"
 msgstr "grpconv"
 
-#: pwconv.8.xml:20(refname) pwconv.8.xml:35(command)
-#: login.defs.5.xml:276(term)
+#: pwconv.8.xml:50(refname) pwconv.8.xml:65(command)
+#: login.defs.5.xml:308(term)
 msgid "grpunconv"
 msgstr "grpunconv"
 
-#: pwconv.8.xml:21(refpurpose)
+#: pwconv.8.xml:51(refpurpose)
 msgid "convert to and from shadow passwords and groups"
 msgstr "konvertera till och från skugglösenord och grupper"
 
-#: pwconv.8.xml:41(para)
+#: pwconv.8.xml:71(para)
 msgid ""
 "The <command>pwconv</command> command creates <emphasis remap=\"I\">shadow</"
 "emphasis> from <emphasis remap=\"I\">passwd</emphasis> and an optionally "
 "existing <emphasis remap=\"I\">shadow</emphasis>."
 msgstr ""
 
-#: pwconv.8.xml:47(para)
+#: pwconv.8.xml:77(para)
 msgid ""
 "The <command>pwunconv</command> command creates <emphasis remap=\"I"
 "\">passwd</emphasis> from <emphasis remap=\"I\">passwd</emphasis> and "
@@ -2699,14 +3060,14 @@
 "\">shadow</emphasis>."
 msgstr ""
 
-#: pwconv.8.xml:54(para)
+#: pwconv.8.xml:84(para)
 msgid ""
 "The <command>grpconv</command> command creates <emphasis remap=\"I"
 "\">gshadow</emphasis> from <emphasis remap=\"I\">group</emphasis> and an "
 "optionally existing <emphasis remap=\"I\">gshadow</emphasis>."
 msgstr ""
 
-#: pwconv.8.xml:60(para)
+#: pwconv.8.xml:90(para)
 msgid ""
 "The <command>grpunconv</command> command creates <emphasis remap=\"I"
 "\">group</emphasis> from <emphasis remap=\"I\">group</emphasis> and "
@@ -2714,14 +3075,14 @@
 "\">gshadow</emphasis>."
 msgstr ""
 
-#: pwconv.8.xml:67(para)
+#: pwconv.8.xml:97(para)
 msgid ""
 "These four programs all operate on the normal and shadow password and group "
 "files: <filename>/etc/passwd</filename>, <filename>/etc/group</filename>, "
 "<filename>/etc/shadow</filename>, and <filename>/etc/gshadow</filename>."
 msgstr ""
 
-#: pwconv.8.xml:74(para)
+#: pwconv.8.xml:104(para)
 msgid ""
 "Each program acquires the necessary locks before conversion. "
 "<command>pwconv</command> and <command>grpconv</command> are similar. First, "
@@ -2733,7 +3094,7 @@
 "hand."
 msgstr ""
 
-#: pwconv.8.xml:85(para)
+#: pwconv.8.xml:115(para)
 msgid ""
 "<command>pwconv</command> will use the values of <emphasis remap=\"I"
 "\">PASS_MIN_DAYS</emphasis>, <emphasis remap=\"I\">PASS_MAX_DAYS</emphasis>, "
@@ -2741,7 +3102,7 @@
 "defs</filename> when adding new entries to <filename>/etc/shadow</filename>."
 msgstr ""
 
-#: pwconv.8.xml:94(para)
+#: pwconv.8.xml:124(para)
 msgid ""
 "Likewise <command>pwunconv</command> and <command>grpunconv</command> are "
 "similar. Passwords in the main file are updated from the shadowed file. "
@@ -2751,7 +3112,7 @@
 "can."
 msgstr ""
 
-#: pwconv.8.xml:106(para)
+#: pwconv.8.xml:136(para)
 msgid ""
 "Errors in the password or group files (such as invalid or duplicate entries) "
 "may cause these programs to loop forever or fail in other strange ways. "
@@ -2759,20 +3120,20 @@
 "any such errors before converting to or from shadow passwords or groups."
 msgstr ""
 
-#: pwconv.8.xml:117(para)
+#: pwconv.8.xml:147(para)
 msgid ""
 "The following configuration variable in <filename>/etc/login.defs</filename> "
 "changes the behavior of <command>grpconv</command> and <command>grpunconv</"
 "command>:"
 msgstr ""
 
-#: pwconv.8.xml:125(para)
+#: pwconv.8.xml:155(para)
 msgid ""
 "The following configuration variables in <filename>/etc/login.defs</"
 "filename> change the behavior of <command>pwconv</command>:"
 msgstr ""
 
-#: pwconv.8.xml:151(para)
+#: pwconv.8.xml:181(para)
 msgid ""
 "<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -2786,37 +3147,37 @@
 "<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>."
 
-#: pwck.8.xml:11(refentrytitle) pwck.8.xml:16(refname) pwck.8.xml:22(command)
-#: pwck.8.xml:37(command) login.defs.5.xml:348(term)
+#: pwck.8.xml:40(refentrytitle) pwck.8.xml:45(refname) pwck.8.xml:51(command)
+#: pwck.8.xml:66(command) login.defs.5.xml:380(term)
 msgid "pwck"
 msgstr "pwck"
 
-#: pwck.8.xml:17(refpurpose)
+#: pwck.8.xml:46(refpurpose)
 msgid "verify integrity of password files"
 msgstr "validera integriteten för lösenordsfiler"
 
-#: pwck.8.xml:23(arg) pwck.8.xml:38(arg) pwck.8.xml:111(option)
+#: pwck.8.xml:52(arg) pwck.8.xml:67(arg) pwck.8.xml:140(option)
 msgid "-q"
 msgstr "-q"
 
-#: pwck.8.xml:24(arg) pwck.8.xml:132(option) grpck.8.xml:29(arg)
-#: grpck.8.xml:101(option)
+#: pwck.8.xml:53(arg) pwck.8.xml:161(option) grpck.8.xml:58(arg)
+#: grpck.8.xml:130(option)
 msgid "-s"
 msgstr "-s"
 
-#: pwck.8.xml:27(replaceable) pwck.8.xml:42(replaceable)
-#: passwd.5.xml:5(refentrytitle) passwd.5.xml:10(refname)
-#: passwd.1.xml:15(refentrytitle) passwd.1.xml:20(refname)
-#: passwd.1.xml:26(command) login.defs.5.xml:337(term)
+#: pwck.8.xml:56(replaceable) pwck.8.xml:71(replaceable)
+#: passwd.5.xml:34(refentrytitle) passwd.5.xml:39(refname)
+#: passwd.1.xml:44(refentrytitle) passwd.1.xml:49(refname)
+#: passwd.1.xml:55(command) login.defs.5.xml:369(term)
 msgid "passwd"
 msgstr "passwd"
 
-#: pwck.8.xml:39(arg) pwck.8.xml:122(option) login.1.xml:186(option)
-#: grpck.8.xml:20(arg) grpck.8.xml:91(option) gpasswd.1.xml:120(option)
+#: pwck.8.xml:68(arg) pwck.8.xml:151(option) login.1.xml:222(option)
+#: grpck.8.xml:49(arg) grpck.8.xml:120(option)
 msgid "-r"
 msgstr "-r"
 
-#: pwck.8.xml:53(para)
+#: pwck.8.xml:82(para)
 msgid ""
 "The <command>pwck</command> command verifies the integrity of the system "
 "authentication information. All entries in the <filename>/etc/passwd</"
@@ -2826,35 +3187,35 @@
 "uncorrectable errors."
 msgstr ""
 
-#: pwck.8.xml:62(para) grpck.8.xml:51(para)
+#: pwck.8.xml:91(para) grpck.8.xml:80(para)
 msgid "Checks are made to verify that each entry has:"
 msgstr "Kontroller görs för att validera att varje post har:"
 
-#: pwck.8.xml:65(para) grpck.8.xml:55(para)
+#: pwck.8.xml:94(para) grpck.8.xml:84(para)
 msgid "the correct number of fields"
 msgstr "korrekt antal fält"
 
-#: pwck.8.xml:68(para)
+#: pwck.8.xml:97(para)
 msgid "a unique user name"
 msgstr "ett unikt användarnamn"
 
-#: pwck.8.xml:71(para)
+#: pwck.8.xml:100(para)
 msgid "a valid user and group identifier"
 msgstr "en giltig identifierare för användare och grupp"
 
-#: pwck.8.xml:74(para)
+#: pwck.8.xml:103(para)
 msgid "a valid primary group"
 msgstr "en giltig primär grupp"
 
-#: pwck.8.xml:77(para)
+#: pwck.8.xml:106(para)
 msgid "a valid home directory"
 msgstr "en giltig hemkatalog"
 
-#: pwck.8.xml:80(para)
+#: pwck.8.xml:109(para)
 msgid "a valid login shell"
 msgstr "ett giltigt inloggningsskal"
 
-#: pwck.8.xml:84(para)
+#: pwck.8.xml:113(para)
 msgid ""
 "The checks for correct number of fields and unique user name are fatal. If "
 "the entry has the wrong number of fields, the user will be prompted to "
@@ -2865,28 +3226,28 @@
 "<command>usermod</command> command to correct the error."
 msgstr ""
 
-#: pwck.8.xml:95(para)
+#: pwck.8.xml:124(para)
 msgid ""
 "The commands which operate on the <filename>/etc/passwd</filename> file are "
 "not able to alter corrupted or duplicated entries. <command>pwck</command> "
 "should be used in those circumstances to remove the offending entry."
 msgstr ""
 
-#: pwck.8.xml:105(para)
+#: pwck.8.xml:134(para)
 msgid "The options which apply to the <command>pwck</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>pwck</command> är:"
 
-#: pwck.8.xml:114(para)
+#: pwck.8.xml:143(para)
 msgid ""
 "Report errors only. The warnings which do not require any action from the "
 "user won't be displayed."
 msgstr ""
 
-#: pwck.8.xml:125(para)
+#: pwck.8.xml:154(para)
 msgid "Execute the <command>pwck</command> command in read-only mode."
 msgstr "Starta kommandot <command>pwck</command> i skrivskyddat läge."
 
-#: pwck.8.xml:135(para)
+#: pwck.8.xml:164(para)
 msgid ""
 "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/shadow</"
 "filename> by UID."
@@ -2894,7 +3255,7 @@
 "Sorterar poster i <filename>/etc/passwd</filename> och <filename>/etc/"
 "shadow</filename> efter UID."
 
-#: pwck.8.xml:143(para)
+#: pwck.8.xml:172(para)
 msgid ""
 "By default, <command>pwck</command> operates on the files <filename>/etc/"
 "passwd</filename> and <filename>/etc/shadow</filename>. The user may select "
@@ -2902,39 +3263,59 @@
 "<emphasis remap=\"I\">shadow</emphasis> parameters."
 msgstr ""
 
-#: pwck.8.xml:192(para)
+#: pwck.8.xml:221(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>group</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"citerefentry>, <citerefentry><refentrytitle>grpck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>usermod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>usermod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"citerefentry>."
 
-#: pwck.8.xml:227(para)
+#: pwck.8.xml:260(para)
 msgid "one or more bad password entries"
 msgstr "en eller flera felaktiga lösenordsposter"
 
-#: pwck.8.xml:233(para)
+#: pwck.8.xml:266(para)
 msgid "can't open password files"
 msgstr "kan inte öppna lösenordsfiler"
 
-#: pwck.8.xml:239(para)
+#: pwck.8.xml:272(para)
 msgid "can't lock password files"
 msgstr "kan inte låsa lösenordsfiler"
 
-#: pwck.8.xml:245(para)
+#: pwck.8.xml:278(para)
 msgid "can't update password files"
 msgstr "kan inte uppdatera lösenordsfiler"
 
-#: pwck.8.xml:209(para)
+#: pwck.8.xml:284(para)
+#, fuzzy
+#| msgid "can't open password files"
+msgid "can't sort password files"
+msgstr "kan inte öppna lösenordsfiler"
+
+#: pwck.8.xml:242(para)
 msgid ""
 "The <command>pwck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -2942,15 +3323,15 @@
 "Kommandot <command>pwck</command> avslutas med följande värden: <placeholder-"
 "1/>"
 
-#: porttime.5.xml:5(refentrytitle) porttime.5.xml:10(refname)
+#: porttime.5.xml:34(refentrytitle) porttime.5.xml:39(refname)
 msgid "porttime"
 msgstr "porttime"
 
-#: porttime.5.xml:11(refpurpose)
+#: porttime.5.xml:40(refpurpose)
 msgid "port access time file"
 msgstr ""
 
-#: porttime.5.xml:16(para)
+#: porttime.5.xml:45(para)
 msgid ""
 "<emphasis remap=\"I\">porttime</emphasis> contains a list of tty devices, "
 "user names, and permitted login times."
@@ -2958,7 +3339,7 @@
 "<emphasis remap=\"I\">porttime</emphasis> innehåller en lista av tty-"
 "enheter, användarnamn och tillåtna inloggningstider."
 
-#: porttime.5.xml:21(para)
+#: porttime.5.xml:50(para)
 msgid ""
 "Each entry consists of three colon separated fields. The first field is a "
 "comma separated list of tty devices, or an asterisk to indicate that all tty "
@@ -2968,7 +3349,7 @@
 "permitted access times."
 msgstr ""
 
-#: porttime.5.xml:30(para)
+#: porttime.5.xml:59(para)
 msgid ""
 "Each access time entry consists of zero or more days of the week, "
 "abbreviated <emphasis>Su</emphasis>, <emphasis>Mo</emphasis>, <emphasis>Tu</"
@@ -2979,11 +3360,11 @@
 "indicate every day. If no days are given, <emphasis>Al</emphasis> is assumed."
 msgstr ""
 
-#: porttime.5.xml:44(title)
+#: porttime.5.xml:73(title)
 msgid "EXAMPLES"
 msgstr "EXEMPEL"
 
-#: porttime.5.xml:45(para)
+#: porttime.5.xml:74(para)
 msgid ""
 "The following entry allows access to user <emphasis remap=\"B\">jfh</"
 "emphasis> on every port during weekdays from 9am to 5pm."
@@ -2991,11 +3372,11 @@
 "Följande post tillåter åtkomst för användaren <emphasis remap=\"B\">jfh</"
 "emphasis> på varje port under veckodagar från 09.00 till 17.00."
 
-#: porttime.5.xml:51(para)
+#: porttime.5.xml:80(para)
 msgid "*:jfh:Wk0900-1700"
 msgstr "*:jfh:Wk0900-1700"
 
-#: porttime.5.xml:53(para)
+#: porttime.5.xml:82(para)
 msgid ""
 "The following entries allow access only to the users <emphasis>root</"
 "emphasis> and <emphasis>oper</emphasis> on <filename>/dev/console</filename> "
@@ -3009,7 +3390,7 @@
 "filename> är en ordnad lista för åtkomsttider. Alla andra användare skulle "
 "matcha den andra poster, vilken inte tillåter någon åtkomst oavsett tid."
 
-#: porttime.5.xml:62(programlisting)
+#: porttime.5.xml:91(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3022,7 +3403,7 @@
 "      console:*:\n"
 "    "
 
-#: porttime.5.xml:67(para)
+#: porttime.5.xml:96(para)
 msgid ""
 "The following entry allows access for the user <emphasis>games</emphasis> on "
 "any port during non-working hours."
@@ -3030,19 +3411,19 @@
 "Fölajnde post tillåter åtkomst för användaren <emphasis>games</emphasis> på "
 "valfri port men inte under arbetstid."
 
-#: porttime.5.xml:72(para)
+#: porttime.5.xml:101(para)
 msgid "*:games:Wk1700-0900,SaSu0000-2400"
 msgstr "*:games:Wk1700-0900,SaSu0000-2400"
 
-#: porttime.5.xml:79(filename) logoutd.8.xml:38(filename)
+#: porttime.5.xml:108(filename) logoutd.8.xml:67(filename)
 msgid "/etc/porttime"
 msgstr "/etc/porttime"
 
-#: porttime.5.xml:81(para) logoutd.8.xml:40(para)
+#: porttime.5.xml:110(para) logoutd.8.xml:69(para)
 msgid "File containing port access."
 msgstr "Fil som innehåller portåtkomst"
 
-#: porttime.5.xml:89(para) login.access.5.xml:79(para)
+#: porttime.5.xml:118(para) login.access.5.xml:109(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
@@ -3050,11 +3431,11 @@
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 
-#: passwd.5.xml:11(refpurpose)
+#: passwd.5.xml:40(refpurpose)
 msgid "the password file"
 msgstr "lösenordsfilen"
 
-#: passwd.5.xml:16(para)
+#: passwd.5.xml:45(para)
 msgid ""
 "<filename>/etc/passwd</filename> contains one line for each user account, "
 "with seven fields delimited by colons (<quote>:</quote>). These fields are:"
@@ -3062,31 +3443,31 @@
 "<filename>/etc/passwd</filename> innehåller en rad för varje användarkonto "
 "men sju fält separerade med kolontecken (<quote>:</quote>). Dessa fält är:"
 
-#: passwd.5.xml:27(para)
+#: passwd.5.xml:56(para)
 msgid "optional encrypted password"
 msgstr "valfritt krypterat lösenord"
 
-#: passwd.5.xml:30(para)
+#: passwd.5.xml:59(para)
 msgid "numerical user ID"
 msgstr "numeriskt användar-id"
 
-#: passwd.5.xml:33(para)
+#: passwd.5.xml:62(para)
 msgid "numerical group ID"
 msgstr "numeriskt grupp-id"
 
-#: passwd.5.xml:36(para)
+#: passwd.5.xml:65(para)
 msgid "user name or comment field"
 msgstr "användarnamn eller kommentarsfält"
 
-#: passwd.5.xml:39(para)
+#: passwd.5.xml:68(para)
 msgid "user home directory"
 msgstr "användarens hemkatalog"
 
-#: passwd.5.xml:42(para)
+#: passwd.5.xml:71(para)
 msgid "optional user command interpreter"
 msgstr ""
 
-#: passwd.5.xml:46(para)
+#: passwd.5.xml:75(para)
 msgid ""
 "The encrypted password field may be blank, in which case no password is "
 "required to authenticate as the specified login name. However, some "
@@ -3104,21 +3485,21 @@
 "citerefentry>."
 msgstr ""
 
-#: passwd.5.xml:65(para)
+#: passwd.5.xml:94(para)
 msgid ""
 "The comment field is used by various system utilities, such as "
 "<citerefentry><refentrytitle>finger</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 msgstr ""
 
-#: passwd.5.xml:71(para)
+#: passwd.5.xml:100(para)
 msgid ""
 "The home directory field provides the name of the initial working directory. "
 "The <command>login</command> program uses this information to set the value "
 "of the <envar>$HOME</envar> environmental variable."
 msgstr ""
 
-#: passwd.5.xml:77(para)
+#: passwd.5.xml:106(para)
 msgid ""
 "The command interpreter field provides the name of the user's command "
 "language interpreter, or the name of the initial program to execute. The "
@@ -3127,56 +3508,77 @@
 "defaults to the value <filename>/bin/sh</filename>."
 msgstr ""
 
-#: passwd.5.xml:98(para)
+#: passwd.5.xml:127(para)
 msgid "optional encrypted password file"
 msgstr ""
 
-#: passwd.5.xml:106(para)
+#: passwd.5.xml:135(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>chsh</"
+#| "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
+#| "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>login</"
+"<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>getent</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
-"refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"citerefentry>, <citerefentry><refentrytitle>pwck</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>pwconv</refentrytitle><manvolnum>8</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>pwunconv</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
-"manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>login</"
+"<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>chsh</"
 "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>crypt</"
+"citerefentry>, <citerefentry><refentrytitle>crypt</"
 "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>getpwnam</refentrytitle><manvolnum>3</"
-"manvolnum></citerefentry>, <citerefentry><refentrytitle>shadow</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>pwconv</refentrytitle><manvolnum>8</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>pwunconv</"
+"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupadd</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>sulogin</refentrytitle><manvolnum>8</"
+"<citerefentry><refentrytitle>groupdel</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>useradd</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>userdel</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: passwd.1.xml:21(refpurpose)
+#: passwd.1.xml:50(refpurpose)
 msgid "change user password"
 msgstr "ändra användarlösenord"
 
-#: passwd.1.xml:38(para)
+#: passwd.1.xml:67(para)
 #, fuzzy
 msgid ""
 "The <command>passwd</command> command changes passwords for user accounts. A "
 "normal user may only change the password for his/her own account, while the "
 "superuser may change the password for any account. <command>passwd</command> "
-"also changes account information, such as the full name of the user, the "
-"user's login shell, or his/her password expiry date and interval."
+"also changes the account or associated password validity period."
 msgstr ""
 "<command>passwd</command> ändrar lösenord för användarkonton. En vanlig "
 "användare kan endast ändra lösenordet för sitt egna konto men "
@@ -3185,11 +3587,11 @@
 "användaren, användarens inloggningsskal eller hans/hennes utgångsdatum för "
 "lösenordet och intervall."
 
-#: passwd.1.xml:48(title)
+#: passwd.1.xml:76(title)
 msgid "Password Changes"
 msgstr "Lösenordsändringar"
 
-#: passwd.1.xml:49(para)
+#: passwd.1.xml:77(para)
 #, fuzzy
 msgid ""
 "The user is first prompted for his/her old password, if one is present. This "
@@ -3203,7 +3605,7 @@
 "Superanvändaren tillåts kringgå detta steg så att bortglömda lösenord kan "
 "ändras."
 
-#: passwd.1.xml:57(para)
+#: passwd.1.xml:85(para)
 msgid ""
 "After the password has been entered, password aging information is checked "
 "to see if the user is permitted to change the password at this time. If not, "
@@ -3214,7 +3616,7 @@
 "tillfället. Om inte, nekar <command>passwd</command> att ändra lösenordet "
 "och avslutas."
 
-#: passwd.1.xml:64(para)
+#: passwd.1.xml:92(para)
 msgid ""
 "The user is then prompted twice for a replacement password. The second entry "
 "is compared against the first and both are required to match in order for "
@@ -3224,7 +3626,7 @@
 "inmatningen jämförs mot den första och båda måste stämma överens för att "
 "lösenordet ska ändras."
 
-#: passwd.1.xml:70(para)
+#: passwd.1.xml:98(para)
 msgid ""
 "Then, the password is tested for complexity. As a general guideline, "
 "passwords should consist of 6 to 8 characters including one or more "
@@ -3234,19 +3636,19 @@
 "lösenord innehålla 6 till 8 tecken och inkluderas ett eller flera tecken "
 "från var och en av följande punkter:"
 
-#: passwd.1.xml:78(para)
+#: passwd.1.xml:106(para)
 msgid "lower case alphabetics"
 msgstr "gemena bokstäver ur alfabetet"
 
-#: passwd.1.xml:81(para)
+#: passwd.1.xml:109(para)
 msgid "digits 0 thru 9"
 msgstr "siffrorna 0 till 9"
 
-#: passwd.1.xml:84(para)
+#: passwd.1.xml:112(para)
 msgid "punctuation marks"
 msgstr "skiljetecken"
 
-#: passwd.1.xml:88(para)
+#: passwd.1.xml:116(para)
 msgid ""
 "Care must be taken not to include the system default erase or kill "
 "characters. <command>passwd</command> will reject any password which is not "
@@ -3256,11 +3658,11 @@
 "<command>passwd</command> kommer att neka alla lösenord som inte har lämplig "
 "komplexitet."
 
-#: passwd.1.xml:97(title)
+#: passwd.1.xml:125(title)
 msgid "Hints for user passwords"
 msgstr "Tips för användarlösenord"
 
-#: passwd.1.xml:98(para)
+#: passwd.1.xml:126(para)
 msgid ""
 "The security of a password depends upon the strength of the encryption "
 "algorithm and the size of the key space. The <emphasis>UNIX</emphasis> "
@@ -3273,7 +3675,7 @@
 "baserad på NBS DES-algoritmen och är mycket säker. Längden på nyckeln är "
 "beroende på slumpmässigheten för det valda lösenordet."
 
-#: passwd.1.xml:106(para)
+#: passwd.1.xml:134(para)
 msgid ""
 "Compromises in password security normally result from careless password "
 "selection or handling. For this reason, you should not select a password "
@@ -3287,21 +3689,21 @@
 "inte vara ett korrekt namn, ditt personnummer, födelsedatum eller "
 "gatuadress. Dessa kan användas som gissningar för att ta sig in i systemet."
 
-#: passwd.1.xml:115(para)
+#: passwd.1.xml:143(para)
 msgid ""
 "You can find advices on how to choose a strong password on http://en."
 "wikipedia.org/wiki/Password_strength"
 msgstr ""
 
-#: passwd.1.xml:124(para)
+#: passwd.1.xml:152(para)
 msgid "The options which apply to the <command>passwd</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>passwd</command> är:"
 
-#: passwd.1.xml:129(term) faillog.8.xml:42(term)
+#: passwd.1.xml:157(term) faillog.8.xml:71(term)
 msgid "<option>-a</option>, <option>--all</option>"
 msgstr "<option>-a</option>, <option>--all</option>"
 
-#: passwd.1.xml:133(para)
+#: passwd.1.xml:161(para)
 msgid ""
 "This option can be used only with <option>-S</option> and causes show status "
 "for all users."
@@ -3309,11 +3711,11 @@
 "Denna flagga kan endast användas med <option>-S</option> och gör att status "
 "visas för alla användare."
 
-#: passwd.1.xml:140(term)
+#: passwd.1.xml:168(term)
 msgid "<option>-d</option>, <option>--delete</option>"
 msgstr "<option>-d</option>, <option>--delete</option>"
 
-#: passwd.1.xml:144(para)
+#: passwd.1.xml:172(para)
 msgid ""
 "Delete a user's password (make it empty). This is a quick way to disable a "
 "password for an account. It will set the named account passwordless."
@@ -3322,11 +3724,11 @@
 "att inaktivera ett lösenord för ett konto. Det kommer att ta bort det "
 "angivna kontots lösenord."
 
-#: passwd.1.xml:152(term)
+#: passwd.1.xml:180(term)
 msgid "<option>-e</option>, <option>--expire</option>"
 msgstr "<option>-e</option>, <option>--expire</option>"
 
-#: passwd.1.xml:156(para)
+#: passwd.1.xml:184(para)
 msgid ""
 "Immediately expire an account's password. This in effect can force a user to "
 "change his/her password at the user's next login."
@@ -3334,7 +3736,7 @@
 "Lösenordet för ett konto sätts omedelbart som utgånget. Detta kan tvinga en "
 "användare att ändra sitt lösenord vid nästa inloggningsförsök."
 
-#: passwd.1.xml:169(term)
+#: passwd.1.xml:197(term)
 msgid ""
 "<option>-i</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -3342,7 +3744,7 @@
 "<option>-i</option>, <option>--inactive</option><replaceable>INAKTIV</"
 "replaceable>"
 
-#: passwd.1.xml:173(para)
+#: passwd.1.xml:201(para)
 msgid ""
 "This option is used to disable an account after the password has been "
 "expired for a number of days. After a user account has had an expired "
@@ -3354,11 +3756,11 @@
 "utgånget lösenord i <replaceable>INAKTIV</replaceable> dagar får användaren "
 "inte längre logga in med detta konto."
 
-#: passwd.1.xml:182(term)
+#: passwd.1.xml:210(term)
 msgid "<option>-k</option>, <option>--keep-tokens</option>"
 msgstr "<option>-k</option>, <option>--keep-tokens</option>"
 
-#: passwd.1.xml:186(para)
+#: passwd.1.xml:214(para)
 #, fuzzy
 msgid ""
 "Indicate password change should be performed only for expired authentication "
@@ -3369,29 +3771,41 @@
 "autentiseringslösenord. Användaren önskar behålla sitt icke-utgångna "
 "lösenord som tidigare."
 
-#: passwd.1.xml:194(term)
+#: passwd.1.xml:222(term)
 msgid "<option>-l</option>, <option>--lock</option>"
 msgstr "<option>-l</option>, <option>--lock</option>"
 
-#: passwd.1.xml:198(para)
+#: passwd.1.xml:226(para)
 #, fuzzy
 msgid ""
-"Lock the named account. This option disables an account by changing the "
-"password to a value which matches no possible encrypted value, and by "
-"setting the account expiry field to 1."
+"Lock the password of the named account. This option disables a password by "
+"changing it to a value which matches no possible encrypted value (it adds a "
+"´!´ at the beginning of the password)."
 msgstr ""
 "Lås angivet konto. Denna flagga inaktiverar ett konto genom att ändra "
 "lösenordet till ett värde som inte matchar något möjligt krypterat värde."
 
-#: passwd.1.xml:206(term) chage.1.xml:109(term)
+#: passwd.1.xml:232(para)
 msgid ""
+"Note that this does not disable the account. The user may still be able to "
+"login using another authentication token (e.g. an SSH key). To disable the "
+"account, administrators should use <command>usermod --expiredate 1</command> "
+"(this set the account's expire date to Jan 2, 1970)."
+msgstr ""
+
+#: passwd.1.xml:239(para)
+msgid "Users with a locked password are not allowed to change their password."
+msgstr ""
+
+#: passwd.1.xml:246(term) chage.1.xml:138(term)
+msgid ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
 "replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAGAR</"
 "replaceable>"
 
-#: passwd.1.xml:210(para) chage.1.xml:113(para)
+#: passwd.1.xml:250(para) chage.1.xml:142(para)
 msgid ""
 "Set the minimum number of days between password changes to "
 "<replaceable>MIN_DAYS</replaceable>. A value of zero for this field "
@@ -3401,7 +3815,7 @@
 "<replaceable>MIN_DAGAR</replaceable>. Ett nollvärde för detta fält betyder "
 "att användaren kan ändra sitt lösenord när som helst."
 
-#: passwd.1.xml:228(term)
+#: passwd.1.xml:268(term)
 msgid ""
 "<option>-r</option>, <option>--repository</option><replaceable>REPOSITORY</"
 "replaceable>"
@@ -3409,23 +3823,33 @@
 "<option>-r</option>, <option>--repository</option><replaceable>FÖRRÅD</"
 "replaceable>"
 
-#: passwd.1.xml:232(para)
+#: passwd.1.xml:272(para)
 #, fuzzy
 msgid "change password in <replaceable>REPOSITORY</replaceable> repository"
 msgstr "ändra lösenord i förrådet <replaceable>FÖRRÅD</replaceable>"
 
-#: passwd.1.xml:238(term)
+#: passwd.1.xml:278(term)
 msgid "<option>-S</option>, <option>--status</option>"
 msgstr "<option>-S</option>, <option>--status</option>"
 
-#: passwd.1.xml:242(para)
+#: passwd.1.xml:282(para)
+#, fuzzy
+#| msgid ""
+#| "Display account status information. The status information consists of 7 "
+#| "fields. The first field is the user's login name. The second field "
+#| "indicates if the user account is locked (L), has no password (NP), or has "
+#| "a usable password (P). The third field gives the date of the last "
+#| "password change. The next four fields are the minimum age, maximum age, "
+#| "warning period, and inactivity period for the password. These ages are "
+#| "expressed in days."
 msgid ""
 "Display account status information. The status information consists of 7 "
 "fields. The first field is the user's login name. The second field indicates "
-"if the user account is locked (L), has no password (NP), or has a usable "
-"password (P). The third field gives the date of the last password change. "
-"The next four fields are the minimum age, maximum age, warning period, and "
-"inactivity period for the password. These ages are expressed in days."
+"if the user account has a locked password (L), has no password (NP), or has "
+"a usable password (P). The third field gives the date of the last password "
+"change. The next four fields are the minimum age, maximum age, warning "
+"period, and inactivity period for the password. These ages are expressed in "
+"days."
 msgstr ""
 "Visa statusinformation för konto. Statusinformationen innehåller 7 fält. "
 "Första fältet är användarens inloggningsnamn. Det andra fältet indikerar om "
@@ -3435,22 +3859,23 @@
 "varningsperiod och inaktivitetsperiod för lösenordet. Dessa åldrar anges i "
 "dagar."
 
-#: passwd.1.xml:255(term)
+#: passwd.1.xml:296(term)
 msgid "<option>-u</option>, <option>--unlock</option>"
 msgstr "<option>-u</option>, <option>--unlock</option>"
 
-#: passwd.1.xml:259(para)
+#: passwd.1.xml:300(para)
 #, fuzzy
 msgid ""
-"Unlock the named account. This option re-enables an account by changing the "
-"password back to its previous value (to value before using <option>-l</"
-"option> option), and by resetting the account expiry field."
+"Unlock the password of the named account. This option re-enables a password "
+"by changing the password back to its previous value (to the value before "
+"using the <option>-l</option> option), and by resetting the account expiry "
+"field."
 msgstr ""
 "Lås upp angivet konto. Denna flagga återaktiverar ett konto genom att ändra "
 "tillbaka lösenordet till dess tidigare värde (till värdet före användning av "
 "flaggan <option>-l</option>)."
 
-#: passwd.1.xml:268(term)
+#: passwd.1.xml:310(term)
 msgid ""
 "<option>-w</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -3458,7 +3883,7 @@
 "<option>-w</option>, <option>--warndays</option><replaceable>VARN_DAGAR</"
 "replaceable>"
 
-#: passwd.1.xml:272(para)
+#: passwd.1.xml:314(para)
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
@@ -3469,7 +3894,7 @@
 "<replaceable>VARN_DAGAR</replaceable> är antalet dagar före användaren "
 "varnas om att lösenordet är på väg att bli utgånget."
 
-#: passwd.1.xml:281(term)
+#: passwd.1.xml:323(term)
 msgid ""
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -3477,7 +3902,7 @@
 "<option>-x</option>, <option>--maxdays</option><replaceable>MAX_DAGAR</"
 "replaceable>"
 
-#: passwd.1.xml:285(para)
+#: passwd.1.xml:327(para)
 msgid ""
 "Set the maximum number of days a password remains valid. After "
 "<replaceable>MAX_DAYS</replaceable>, the password is required to be changed."
@@ -3485,7 +3910,7 @@
 "Sätter maximalt antal dagar som ett lösenord ska vara giltigt. Efter "
 "<replaceable>MAX_DAGAR</replaceable> krävs det att lösenordet ändras."
 
-#: passwd.1.xml:297(para)
+#: passwd.1.xml:339(para)
 msgid ""
 "Not all options may be supported. Password complexity checking may vary from "
 "site to site. The user is urged to select a password as complex as he or she "
@@ -3498,68 +3923,68 @@
 "kanske inte kan ändra sina lösenord på ett system om NIS är aktiverat och de "
 "inte är inloggade mot NIS-servern."
 
-#: passwd.1.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: gpasswd.1.xml:2(term) chpasswd.8.xml:2(term) chgpasswd.8.xml:2(term)
+#: passwd.1.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: gpasswd.1.xml:30(term) chpasswd.8.xml:30(term) chgpasswd.8.xml:30(term)
 msgid "<option>ENCRYPT_METHOD</option> (string)"
 msgstr ""
 
-#: passwd.1.xml:4(para) newusers.8.xml:4(para) login.defs.5.xml:4(para)
-#: gpasswd.1.xml:4(para) chpasswd.8.xml:4(para) chgpasswd.8.xml:4(para)
+#: passwd.1.xml:32(para) newusers.8.xml:32(para) login.defs.5.xml:32(para)
+#: gpasswd.1.xml:32(para) chpasswd.8.xml:32(para) chgpasswd.8.xml:32(para)
 msgid ""
 "This defines the system default encryption algorithm for encrypting "
 "passwords (if no algorithm are specified on the command line)."
 msgstr ""
 
-#: passwd.1.xml:12(para) newusers.8.xml:12(para) login.defs.5.xml:12(para)
-#: gpasswd.1.xml:12(para) chpasswd.8.xml:12(para) chgpasswd.8.xml:12(para)
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
 msgid "<replaceable>DES</replaceable> (default)"
 msgstr ""
 
-#: passwd.1.xml:15(replaceable) newusers.8.xml:15(replaceable)
-#: login.defs.5.xml:15(replaceable) gpasswd.1.xml:15(replaceable)
-#: chpasswd.8.xml:15(replaceable) chgpasswd.8.xml:15(replaceable)
+#: passwd.1.xml:43(replaceable) newusers.8.xml:43(replaceable)
+#: login.defs.5.xml:43(replaceable) gpasswd.1.xml:43(replaceable)
+#: chpasswd.8.xml:43(replaceable) chgpasswd.8.xml:43(replaceable)
 msgid "MD5"
 msgstr ""
 
-#: passwd.1.xml:18(replaceable) newusers.8.xml:18(replaceable)
-#: login.defs.5.xml:18(replaceable) gpasswd.1.xml:18(replaceable)
-#: chpasswd.8.xml:18(replaceable) chgpasswd.8.xml:18(replaceable)
+#: passwd.1.xml:46(replaceable) newusers.8.xml:46(replaceable)
+#: login.defs.5.xml:46(replaceable) gpasswd.1.xml:46(replaceable)
+#: chpasswd.8.xml:46(replaceable) chgpasswd.8.xml:46(replaceable)
 msgid "SHA256"
 msgstr ""
 
-#: passwd.1.xml:21(replaceable) newusers.8.xml:21(replaceable)
-#: login.defs.5.xml:21(replaceable) gpasswd.1.xml:21(replaceable)
-#: chpasswd.8.xml:21(replaceable) chgpasswd.8.xml:21(replaceable)
+#: passwd.1.xml:49(replaceable) newusers.8.xml:49(replaceable)
+#: login.defs.5.xml:49(replaceable) gpasswd.1.xml:49(replaceable)
+#: chpasswd.8.xml:49(replaceable) chgpasswd.8.xml:49(replaceable)
 msgid "SHA512"
 msgstr ""
 
-#: passwd.1.xml:8(para) newusers.8.xml:8(para) login.defs.5.xml:8(para)
-#: gpasswd.1.xml:8(para) chpasswd.8.xml:8(para) chgpasswd.8.xml:8(para)
+#: passwd.1.xml:36(para) newusers.8.xml:36(para) login.defs.5.xml:36(para)
+#: gpasswd.1.xml:36(para) chpasswd.8.xml:36(para) chgpasswd.8.xml:36(para)
 msgid "It can take one of these values: <placeholder-1/>"
 msgstr ""
 
-#: passwd.1.xml:25(para) newusers.8.xml:25(para) login.defs.5.xml:25(para)
-#: gpasswd.1.xml:25(para) chpasswd.8.xml:25(para) chgpasswd.8.xml:25(para)
+#: passwd.1.xml:53(para) newusers.8.xml:53(para) login.defs.5.xml:53(para)
+#: gpasswd.1.xml:53(para) chpasswd.8.xml:53(para) chgpasswd.8.xml:53(para)
 msgid ""
 "Note: this parameter overrides the <option>MD5_CRYPT_ENAB</option> variable."
 msgstr ""
 
-#: passwd.1.xml:29(para) passwd.1.xml:23(para) newusers.8.xml:29(para)
-#: newusers.8.xml:23(para) login.defs.5.xml:29(para) login.defs.5.xml:23(para)
-#: gpasswd.1.xml:29(para) gpasswd.1.xml:23(para) chpasswd.8.xml:29(para)
-#: chpasswd.8.xml:23(para) chgpasswd.8.xml:29(para) chgpasswd.8.xml:23(para)
+#: passwd.1.xml:57(para) passwd.1.xml:53(para) newusers.8.xml:57(para)
+#: newusers.8.xml:53(para) login.defs.5.xml:57(para) login.defs.5.xml:53(para)
+#: gpasswd.1.xml:57(para) gpasswd.1.xml:53(para) chpasswd.8.xml:57(para)
+#: chpasswd.8.xml:53(para) chgpasswd.8.xml:57(para) chgpasswd.8.xml:53(para)
 msgid ""
 "Note: if you use PAM, it is recommended to set this variable consistently "
 "with the PAM modules configuration."
 msgstr ""
 
-#: passwd.1.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: gpasswd.1.xml:2(term) chpasswd.8.xml:2(term) chgpasswd.8.xml:2(term)
+#: passwd.1.xml:32(term) newusers.8.xml:32(term) login.defs.5.xml:32(term)
+#: gpasswd.1.xml:32(term) chpasswd.8.xml:32(term) chgpasswd.8.xml:32(term)
 msgid "<option>MD5_CRYPT_ENAB</option> (boolean)"
 msgstr ""
 
-#: passwd.1.xml:4(para) newusers.8.xml:4(para) login.defs.5.xml:4(para)
-#: gpasswd.1.xml:4(para) chpasswd.8.xml:4(para) chgpasswd.8.xml:4(para)
+#: passwd.1.xml:34(para) newusers.8.xml:34(para) login.defs.5.xml:34(para)
+#: gpasswd.1.xml:34(para) chpasswd.8.xml:34(para) chgpasswd.8.xml:34(para)
 msgid ""
 "Indicate if passwords must be encrypted using the MD5-based algorithm. If "
 "set to <replaceable>yes</replaceable>, new passwords will be encrypted using "
@@ -3570,57 +3995,57 @@
 "<replaceable>no</replaceable>."
 msgstr ""
 
-#: passwd.1.xml:14(para) newusers.8.xml:14(para) login.defs.5.xml:14(para)
-#: gpasswd.1.xml:14(para) chpasswd.8.xml:14(para) chgpasswd.8.xml:14(para)
+#: passwd.1.xml:44(para) newusers.8.xml:44(para) login.defs.5.xml:44(para)
+#: gpasswd.1.xml:44(para) chpasswd.8.xml:44(para) chgpasswd.8.xml:44(para)
 msgid ""
 "This variable is superceded by the <option>ENCRYPT_METHOD</option> variable "
 "or by any command line option used to configure the encryption algorithm."
 msgstr ""
 
-#: passwd.1.xml:19(para) newusers.8.xml:19(para) login.defs.5.xml:19(para)
-#: gpasswd.1.xml:19(para) chpasswd.8.xml:19(para) chgpasswd.8.xml:19(para)
+#: passwd.1.xml:49(para) newusers.8.xml:49(para) login.defs.5.xml:49(para)
+#: gpasswd.1.xml:49(para) chpasswd.8.xml:49(para) chgpasswd.8.xml:49(para)
 msgid ""
 "This variable is deprecated. You should use <option>ENCRYPT_METHOD</option>."
 msgstr ""
 
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>OBSCURE_CHECKS_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (boolesk)"
 
-#: passwd.1.xml:4(para) login.defs.5.xml:4(para)
+#: passwd.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Enable additional checks upon password changes."
 msgstr ""
 
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_ALWAYS_WARN</option> (boolean)"
 msgstr "CHFN_AUTH (boolesk)"
 
-#: passwd.1.xml:4(para) login.defs.5.xml:4(para)
+#: passwd.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Warn about weak passwords (but still allow them) if you are root."
 msgstr ""
 
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_CHANGE_TRIES</option> (number)"
 msgstr "PASS_WARN_AGE (nummer)"
 
-#: passwd.1.xml:4(para) login.defs.5.xml:4(para)
+#: passwd.1.xml:34(para) login.defs.5.xml:34(para)
 msgid "Maximum number of attempts to change password if rejected (too easy)."
 msgstr ""
 
-#: passwd.1.xml:2(term) login.defs.5.xml:2(term)
+#: passwd.1.xml:32(term) login.defs.5.xml:32(term)
 #, fuzzy
 msgid "<option>PASS_MAX_LEN</option> (number)"
 msgstr "PASS_MAX_DAYS (nummer)"
 
-#: passwd.1.xml:3(term) login.defs.5.xml:3(term)
+#: passwd.1.xml:33(term) login.defs.5.xml:33(term)
 #, fuzzy
 msgid "<option>PASS_MIN_LEN</option> (number)"
 msgstr "PASS_MIN_DAYS (nummer)"
 
-#: passwd.1.xml:5(para) login.defs.5.xml:5(para)
+#: passwd.1.xml:35(para) login.defs.5.xml:35(para)
 msgid ""
 "Number of significant characters in the password for crypt(). "
 "<option>PASS_MAX_LEN</option> is 8 by default. Don't change unless your crypt"
@@ -3628,18 +4053,18 @@
 "<replaceable>yes</replaceable>."
 msgstr ""
 
-#: passwd.1.xml:2(term) newusers.8.xml:2(term) login.defs.5.xml:2(term)
-#: gpasswd.1.xml:2(term) chpasswd.8.xml:2(term) chgpasswd.8.xml:2(term)
+#: passwd.1.xml:30(term) newusers.8.xml:30(term) login.defs.5.xml:30(term)
+#: gpasswd.1.xml:30(term) chpasswd.8.xml:30(term) chgpasswd.8.xml:30(term)
 msgid "<option>SHA_CRYPT_MIN_ROUNDS</option> (number)"
 msgstr ""
 
-#: passwd.1.xml:3(term) newusers.8.xml:3(term) login.defs.5.xml:3(term)
-#: gpasswd.1.xml:3(term) chpasswd.8.xml:3(term) chgpasswd.8.xml:3(term)
+#: passwd.1.xml:31(term) newusers.8.xml:31(term) login.defs.5.xml:31(term)
+#: gpasswd.1.xml:31(term) chpasswd.8.xml:31(term) chgpasswd.8.xml:31(term)
 msgid "<option>SHA_CRYPT_MAX_ROUNDS</option> (number)"
 msgstr ""
 
-#: passwd.1.xml:5(para) newusers.8.xml:5(para) login.defs.5.xml:5(para)
-#: gpasswd.1.xml:5(para) chpasswd.8.xml:5(para) chgpasswd.8.xml:5(para)
+#: passwd.1.xml:33(para) newusers.8.xml:33(para) login.defs.5.xml:33(para)
+#: gpasswd.1.xml:33(para) chpasswd.8.xml:33(para) chgpasswd.8.xml:33(para)
 msgid ""
 "When <option>ENCRYPT_METHOD</option> is set to <replaceable>SHA256</"
 "replaceable> or <replaceable>SHA512</replaceable>, this defines the number "
@@ -3647,60 +4072,60 @@
 "of rounds is not specified on the command line)."
 msgstr ""
 
-#: passwd.1.xml:12(para) newusers.8.xml:12(para) login.defs.5.xml:12(para)
-#: gpasswd.1.xml:12(para) chpasswd.8.xml:12(para) chgpasswd.8.xml:12(para)
+#: passwd.1.xml:40(para) newusers.8.xml:40(para) login.defs.5.xml:40(para)
+#: gpasswd.1.xml:40(para) chpasswd.8.xml:40(para) chgpasswd.8.xml:40(para)
 msgid ""
 "With a lot of rounds, it is more difficult to brute forcing the password. "
 "But note also that more CPU resources will be needed to authenticate users."
 msgstr ""
 
-#: passwd.1.xml:17(para) newusers.8.xml:17(para) login.defs.5.xml:17(para)
-#: gpasswd.1.xml:17(para) chpasswd.8.xml:17(para) chgpasswd.8.xml:17(para)
+#: passwd.1.xml:45(para) newusers.8.xml:45(para) login.defs.5.xml:45(para)
+#: gpasswd.1.xml:45(para) chpasswd.8.xml:45(para) chgpasswd.8.xml:45(para)
 msgid ""
 "If not specified, the libc will choose the default number of rounds (5000)."
 msgstr ""
 
-#: passwd.1.xml:21(para) newusers.8.xml:21(para) login.defs.5.xml:21(para)
-#: gpasswd.1.xml:21(para) chpasswd.8.xml:21(para) chgpasswd.8.xml:21(para)
+#: passwd.1.xml:49(para) newusers.8.xml:49(para) login.defs.5.xml:49(para)
+#: gpasswd.1.xml:49(para) chpasswd.8.xml:49(para) chgpasswd.8.xml:49(para)
 msgid "The values must be inside the 1000-999999999 range."
 msgstr ""
 
-#: passwd.1.xml:24(para) newusers.8.xml:24(para) login.defs.5.xml:24(para)
-#: gpasswd.1.xml:24(para) chpasswd.8.xml:24(para) chgpasswd.8.xml:24(para)
+#: passwd.1.xml:52(para) newusers.8.xml:52(para) login.defs.5.xml:52(para)
+#: gpasswd.1.xml:52(para) chpasswd.8.xml:52(para) chgpasswd.8.xml:52(para)
 msgid ""
 "If only one of the <option>SHA_CRYPT_MIN_ROUNDS</option> or "
 "<option>SHA_CRYPT_MAX_ROUNDS</option> values is set, then this value will be "
 "used."
 msgstr ""
 
-#: passwd.1.xml:29(para) newusers.8.xml:29(para) login.defs.5.xml:29(para)
-#: gpasswd.1.xml:29(para) chpasswd.8.xml:29(para) chgpasswd.8.xml:29(para)
+#: passwd.1.xml:57(para) newusers.8.xml:57(para) login.defs.5.xml:57(para)
+#: gpasswd.1.xml:57(para) chpasswd.8.xml:57(para) chgpasswd.8.xml:57(para)
 msgid ""
 "If <option>SHA_CRYPT_MIN_ROUNDS</option> &gt; <option>SHA_CRYPT_MAX_ROUNDS</"
 "option>, the highest value will be used."
 msgstr ""
 
-#: passwd.1.xml:356(para) chage.1.xml:212(para)
+#: passwd.1.xml:398(para) chage.1.xml:241(para)
 msgid "permission denied"
 msgstr "åtkomst nekad"
 
-#: passwd.1.xml:362(para)
+#: passwd.1.xml:404(para)
 msgid "invalid combination of options"
 msgstr "ogiltig kombination av flaggor"
 
-#: passwd.1.xml:368(para)
+#: passwd.1.xml:410(para)
 msgid "unexpected failure, nothing done"
 msgstr "oväntat fel, ingenting har genomförts"
 
-#: passwd.1.xml:374(para)
+#: passwd.1.xml:416(para)
 msgid "unexpected failure, <filename>passwd</filename> file missing"
 msgstr "oväntat fel, filen <filename>passwd</filename> saknas"
 
-#: passwd.1.xml:380(para)
+#: passwd.1.xml:422(para)
 msgid "<filename>passwd</filename> file busy, try again"
 msgstr "Filen <filename>passwd</filename> är upptagen, försök igen"
 
-#: passwd.1.xml:344(para)
+#: passwd.1.xml:386(para)
 msgid ""
 "The <command>passwd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -3708,30 +4133,40 @@
 "Kommandot <command>passwd</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: passwd.1.xml:395(para)
+#: passwd.1.xml:437(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
+"citerefentry>. <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgstr ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
+"citerefentry>, <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: nologin.8.xml:5(refentrytitle) nologin.8.xml:10(refname)
-#: nologin.8.xml:16(command)
+#: nologin.8.xml:34(refentrytitle) nologin.8.xml:39(refname)
+#: nologin.8.xml:45(command)
 msgid "nologin"
 msgstr "nologin"
 
-#: nologin.8.xml:11(refpurpose)
+#: nologin.8.xml:40(refpurpose)
 msgid "politely refuse a login"
 msgstr "vägra snällt en inloggning"
 
-#: nologin.8.xml:22(para)
+#: nologin.8.xml:51(para)
 #, fuzzy
 msgid ""
 "The <command>nologin</command> command displays a message that an account is "
@@ -3742,7 +4177,7 @@
 "tillgängligt och avslutas med icke-noll-status. Det är tänkt som ett "
 "ersättande skalfält för konton som har inaktiverats."
 
-#: nologin.8.xml:27(para)
+#: nologin.8.xml:56(para)
 msgid ""
 "To disable all logins, investigate <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
@@ -3751,7 +4186,7 @@
 "<citerefentry><refentrytitle>nologin</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>."
 
-#: nologin.8.xml:36(para)
+#: nologin.8.xml:65(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
@@ -3761,42 +4196,67 @@
 "citerefentry>, <citerefentry><refentrytitle>nologin</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: nologin.8.xml:47(title)
-msgid "HYSTORY"
+#: nologin.8.xml:76(title)
+#, fuzzy
+#| msgid "HYSTORY"
+msgid "HISTORY"
 msgstr "HISTORIK"
 
-#: nologin.8.xml:48(para)
-msgid "The <command>nologin</command> command appeared in BSD 4.4."
+#: nologin.8.xml:77(para)
+#, fuzzy
+#| msgid "The <command>nologin</command> command appeared in BSD 4.4."
+msgid "The <command>nologin</command> command appearred in BSD 4.4."
 msgstr "Kommandot <command>nologin</command> dök upp i BSD 4.4."
 
-#: newusers.8.xml:21(refentrytitle) newusers.8.xml:26(refname)
-#: newusers.8.xml:32(command) login.defs.5.xml:321(term)
+#: newusers.8.xml:50(refentrytitle) newusers.8.xml:55(refname)
+#: newusers.8.xml:61(command) login.defs.5.xml:353(term)
 msgid "newusers"
 msgstr "newusers"
 
-#: newusers.8.xml:27(refpurpose)
+#: newusers.8.xml:56(refpurpose)
 msgid "update and create new users in batch"
 msgstr "uppdatera och skapa nya användare satsvis"
 
-#: newusers.8.xml:34(replaceable)
+#: newusers.8.xml:63(replaceable)
 msgid "new_users"
 msgstr "nya_användare"
 
-#: newusers.8.xml:41(para)
+#: newusers.8.xml:70(para)
 msgid ""
 "The <command>newusers</command> command reads a file of user name and clear-"
 "text password pairs and uses this information to update a group of existing "
 "users or to create new users. Each line is in the same format as the "
 "standard password file (see <citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the following "
-"exceptions:"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>) with the exceptions "
+"explained below:"
 msgstr ""
 
-#: newusers.8.xml:53(emphasis)
+#: newusers.8.xml:78(para)
+msgid "pw_name:pw_passwd:pw_uid:pw_gid:pw_gecos:pw_dir:pw_shell"
+msgstr ""
+
+#: newusers.8.xml:83(emphasis)
+#, fuzzy
+#| msgid "group_name"
+msgid "pw_name"
+msgstr "gruppnamn"
+
+#: newusers.8.xml:86(para)
+msgid "This is the name of the user."
+msgstr ""
+
+#: newusers.8.xml:89(para)
+msgid ""
+"It can be the name of a new user or the name of an existing user (or an user "
+"created before by <command>newusers</command>). In case of an existing user, "
+"the user's information will be changed, otherwise a new user will be created."
+msgstr ""
+
+#: newusers.8.xml:100(emphasis)
 msgid "pw_passwd"
 msgstr "pw_passwd"
 
-#: newusers.8.xml:56(para)
+#: newusers.8.xml:103(para)
 msgid ""
 "This field will be encrypted and used as the new value of the encrypted "
 "password."
@@ -3804,103 +4264,197 @@
 "Detta fält kommer att krypteras och användas som det nya värdet för det "
 "krypterade lösenordet."
 
-#: newusers.8.xml:64(emphasis)
+#: newusers.8.xml:111(emphasis)
+#, fuzzy
+#| msgid "pw_gid"
+msgid "pw_uid"
+msgstr "pw_gid"
+
+#: newusers.8.xml:114(para)
+msgid "This field is used to define the UID of the user."
+msgstr ""
+
+#: newusers.8.xml:117(para)
+msgid ""
+"If the field is empty, an new (unused) UID will be defined automatically by "
+"<command>newusers</command>."
+msgstr ""
+
+#: newusers.8.xml:121(para)
+msgid "If this field contains a number, this number will be used as the UID."
+msgstr ""
+
+#: newusers.8.xml:125(para)
+msgid ""
+"If this field contains the name of an existing user (or the name of an user "
+"created before by <command>newusers</command>), the UID of the specified "
+"user will be used."
+msgstr ""
+
+#: newusers.8.xml:135(emphasis)
 msgid "pw_gid"
 msgstr "pw_gid"
 
-#: newusers.8.xml:67(para)
+#: newusers.8.xml:138(para)
+msgid "This field is used to define the primary group ID for the user."
+msgstr ""
+
+#: newusers.8.xml:141(para)
 msgid ""
-"This field must contain the name (or number) of a group. The user will be "
-"added as a member to this group. When a non-existent group name or number is "
-"specified, a new group will be created. In the case of a non-existent group "
-"number, both the name and the number of the new group will be this number."
+"If this field contains the name of an existing group (or a group created "
+"before by <command>newusers</command>), the GID of this group will be used "
+"as the primary group ID for the user."
 msgstr ""
 
-#: newusers.8.xml:78(emphasis)
+#: newusers.8.xml:147(para)
+msgid ""
+"If this field is a number, this number will be used as the primary group ID "
+"of the user. If no groups exist with this GID, a new group will be created "
+"with this GID, and the name of the user."
+msgstr ""
+
+#: newusers.8.xml:153(para)
+msgid ""
+"If this field is empty, a new group will be created with the name of the "
+"user and a GID will be automatically defined by <command>newusers</command> "
+"to be used as the primary group ID for the user and as the GID for the new "
+"group."
+msgstr ""
+
+#: newusers.8.xml:159(para)
+msgid ""
+"If this field contains the name of a group which does not exist (and was not "
+"created earlier wbefore by <command>newusers</command>), a new group will be "
+"created with the specified name and a GID will be automatically defined by "
+"<command>newusers</command> to be used as the primary group ID for the user "
+"and Gs the ID for the new group."
+msgstr ""
+
+#: newusers.8.xml:171(emphasis)
+msgid "pw_gecos"
+msgstr ""
+
+#: newusers.8.xml:174(para)
+msgid "This field is copied in the GECOS field of the user."
+msgstr ""
+
+#: newusers.8.xml:181(emphasis)
 msgid "pw_dir"
 msgstr "pw_dir"
 
-#: newusers.8.xml:81(para)
+#: newusers.8.xml:184(para)
+msgid "This field is used to define the home directory of the user."
+msgstr ""
+
+#: newusers.8.xml:187(para)
 msgid ""
-"This field will be checked for existence as a directory, and a new directory "
-"with this name will be created if it does not already exist. The ownership "
-"of the directory will be set to be that of the user being created or updated."
+"If this field does not specify an existing directory, the specified "
+"directory is created, with ownership set to the user being created or "
+"updated and its primary group."
 msgstr ""
 
-#: newusers.8.xml:91(para)
+#: newusers.8.xml:196(emphasis)
+msgid "pw_shell"
+msgstr ""
+
+#: newusers.8.xml:199(para)
 msgid ""
+"This field defines the shell of the user. No checks are performed on this "
+"field."
+msgstr ""
+
+#: newusers.8.xml:207(para)
+msgid ""
+"<command>newusers</command> first tries to create or change all the "
+"specified users, and then write these changes to the user or group "
+"databases. If an error occurs (except in the final writes to the databases), "
+"no changes are committed to the databases."
+msgstr ""
+
+#: newusers.8.xml:214(para)
+msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are updated at a single time."
 msgstr ""
 "Detta kommando är tänkt att användas i större systemmiljöer där många konton "
 "uppdateras på samma gång."
 
-#: newusers.8.xml:99(para)
+#: newusers.8.xml:222(para)
 #, fuzzy
 #| msgid ""
 #| "The options which apply to the <command>usermod</command> command are:"
 msgid "The options which apply to the <command>newusers</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>usermod</command> är:"
 
-#: newusers.8.xml:103(term) chpasswd.8.xml:66(term) chgpasswd.8.xml:66(term)
+#: newusers.8.xml:226(term) chpasswd.8.xml:95(term) chgpasswd.8.xml:95(term)
 #, fuzzy
 msgid "<option>-c</option>, <option>--crypt-method</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: newusers.8.xml:105(para) chpasswd.8.xml:68(para) chgpasswd.8.xml:68(para)
+#: newusers.8.xml:228(para) chpasswd.8.xml:97(para) chgpasswd.8.xml:97(para)
 msgid "Use the specified method to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:106(para) chpasswd.8.xml:69(para) chgpasswd.8.xml:69(para)
+#: newusers.8.xml:229(para) chpasswd.8.xml:101(para) chgpasswd.8.xml:101(para)
 msgid ""
 "The available methods are DES, MD5, NONE, and SHA256 or SHA512 if your libc "
 "support these methods."
 msgstr ""
 
-#: newusers.8.xml:132(term) chpasswd.8.xml:97(term) chgpasswd.8.xml:97(term)
+#: newusers.8.xml:243(para)
+msgid ""
+"System users will be created with no aging information in <filename>/etc/"
+"shadow</filename>, and their numeric identifiers are choosen in the "
+"<option>SYS_UID_MIN</option>-<option>SYS_UID_MAX</option> range, defined in "
+"<filename>login.defs</filename>, instead of <option>UID_MIN</option>-"
+"<option>UID_MAX</option> (and their <option>GID</option> counterparts for "
+"the creation of groups)."
+msgstr ""
+
+#: newusers.8.xml:255(term) chpasswd.8.xml:129(term) chgpasswd.8.xml:129(term)
 #, fuzzy
 msgid "<option>-s</option>, <option>--sha-rounds</option>"
 msgstr "<option>-s</option>, <option>--shadow</option>"
 
-#: newusers.8.xml:134(para) chpasswd.8.xml:99(para) chgpasswd.8.xml:99(para)
+#: newusers.8.xml:257(para) chpasswd.8.xml:131(para) chgpasswd.8.xml:131(para)
 msgid "Use the specified number of rounds to encrypt the passwords."
 msgstr ""
 
-#: newusers.8.xml:137(para) chpasswd.8.xml:102(para) chgpasswd.8.xml:102(para)
+#: newusers.8.xml:260(para) chpasswd.8.xml:134(para) chgpasswd.8.xml:134(para)
 msgid ""
 "The value 0 means that the system will choose the default number of rounds "
 "for the crypt method (5000)."
 msgstr ""
 
-#: newusers.8.xml:141(para) chpasswd.8.xml:106(para) chgpasswd.8.xml:106(para)
+#: newusers.8.xml:264(para) chpasswd.8.xml:138(para) chgpasswd.8.xml:138(para)
 msgid ""
 "A minimal value of 1000 and a maximal value of 999,999,999 will be enforced."
 msgstr ""
 
-#: newusers.8.xml:145(para) chpasswd.8.xml:110(para) chgpasswd.8.xml:110(para)
+#: newusers.8.xml:268(para) chpasswd.8.xml:142(para) chgpasswd.8.xml:142(para)
 msgid "You can only use this option with the SHA256 or SHA512 crypt method."
 msgstr ""
 
-#: newusers.8.xml:149(para) chpasswd.8.xml:114(para) chgpasswd.8.xml:114(para)
+#: newusers.8.xml:272(para) chpasswd.8.xml:146(para) chgpasswd.8.xml:146(para)
 msgid ""
 "By default, the number of rounds is defined by the SHA_CRYPT_MIN_ROUNDS and "
 "SHA_CRYPT_MAX_ROUNDS variables in <filename>/etc/login.defs</filename>."
 msgstr ""
 
-#: newusers.8.xml:161(para)
+#: newusers.8.xml:284(para)
 msgid ""
 "The input file must be protected since it contains unencrypted passwords."
 msgstr ""
 "Inmatningsfilen måste skyddas eftersom den innehåller okrypterade lösenord."
 
-#: newusers.8.xml:165(para) chpasswd.8.xml:130(para)
+#: newusers.8.xml:288(para) chpasswd.8.xml:162(para)
 msgid ""
 "PAM is not used to update the passwords. Only <filename>/etc/passwd</"
 "filename> and <filename>/etc/shadow</filename> are updated, and the various "
 "checks or options provided by PAM modules are not used."
 msgstr ""
 
-#: newusers.8.xml:234(para)
+#: newusers.8.xml:357(para)
 msgid ""
 "<citerefentry><refentrytitle>login.defs</refentrytitle><manvolnum>5</"
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -3914,22 +4468,22 @@
 "<citerefentry><refentrytitle>useradd</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: newgrp.1.xml:9(refentrytitle) newgrp.1.xml:14(refname)
-#: newgrp.1.xml:20(command) login.defs.5.xml:313(term)
+#: newgrp.1.xml:38(refentrytitle) newgrp.1.xml:43(refname)
+#: newgrp.1.xml:49(command)
 msgid "newgrp"
 msgstr "newgrp"
 
-#: newgrp.1.xml:15(refpurpose)
+#: newgrp.1.xml:44(refpurpose)
 msgid "log in to a new group"
 msgstr "logga in i en ny grupp"
 
-#: newgrp.1.xml:21(replaceable) grpck.8.xml:22(replaceable)
-#: grpck.8.xml:31(replaceable) groupdel.8.xml:22(replaceable)
-#: groupadd.8.xml:30(replaceable) gpasswd.1.xml:34(replaceable)
+#: newgrp.1.xml:50(replaceable) grpck.8.xml:51(replaceable)
+#: grpck.8.xml:60(replaceable) groupdel.8.xml:51(replaceable)
+#: groupadd.8.xml:56(replaceable) gpasswd.1.xml:63(replaceable)
 msgid "group"
 msgstr "grupp"
 
-#: newgrp.1.xml:27(para)
+#: newgrp.1.xml:56(para)
 msgid ""
 "The <command>newgrp</command> command is used to change the current group ID "
 "during a login session. If the optional <option>-</option> flag is given, "
@@ -3938,7 +4492,7 @@
 "remains unchanged."
 msgstr ""
 
-#: newgrp.1.xml:35(para)
+#: newgrp.1.xml:64(para)
 msgid ""
 "<command>newgrp</command> changes the current real group ID to the named "
 "group, or to the default group listed in <filename>/etc/passwd</filename> if "
@@ -3952,7 +4506,7 @@
 "as a member."
 msgstr ""
 
-#: newgrp.1.xml:49(para)
+#: newgrp.1.xml:78(para)
 msgid ""
 "If there is an entry for this group in <filename>/etc/gshadow</filename>, "
 "then the list of members and the password of this group will be taken from "
@@ -3960,7 +4514,7 @@
 "considered."
 msgstr ""
 
-#: newgrp.1.xml:101(para)
+#: newgrp.1.xml:130(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
@@ -3985,16 +4539,16 @@
 "citerefentry>, <citerefentry><refentrytitle>gshadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>"
 
-#: logoutd.8.xml:5(refentrytitle) logoutd.8.xml:10(refname)
-#: logoutd.8.xml:16(command)
+#: logoutd.8.xml:34(refentrytitle) logoutd.8.xml:39(refname)
+#: logoutd.8.xml:45(command)
 msgid "logoutd"
 msgstr "logoutd"
 
-#: logoutd.8.xml:11(refpurpose)
+#: logoutd.8.xml:40(refpurpose)
 msgid "Enforce login time restrictions"
 msgstr "Upprätthåll tidsbegränsningar för inloggningar"
 
-#: logoutd.8.xml:22(para)
+#: logoutd.8.xml:51(para)
 msgid ""
 "<command>logoutd</command> enforces the login time and port restrictions "
 "specified in <filename>/etc/porttime</filename>. <command>logoutd</command> "
@@ -4005,23 +4559,23 @@
 "porttime</filename> is terminated."
 msgstr ""
 
-#: logoutd.8.xml:44(filename) login.1.xml:283(filename)
+#: logoutd.8.xml:73(filename) login.1.xml:319(filename)
 msgid "/var/run/utmp"
 msgstr "/var/run/utmp"
 
-#: logoutd.8.xml:46(para) login.1.xml:285(para)
+#: logoutd.8.xml:75(para) login.1.xml:321(para)
 msgid "List of current login sessions."
 msgstr "Lista på aktuella inloggningssessioner."
 
-#: login.defs.5.xml:66(refentrytitle) login.defs.5.xml:71(refname)
+#: login.defs.5.xml:97(refentrytitle) login.defs.5.xml:102(refname)
 msgid "login.defs"
 msgstr "login.defs"
 
-#: login.defs.5.xml:72(refpurpose)
+#: login.defs.5.xml:103(refpurpose)
 msgid "shadow password suite configuration"
 msgstr ""
 
-#: login.defs.5.xml:77(para)
+#: login.defs.5.xml:108(para)
 msgid ""
 "The <filename>/etc/login.defs</filename> file defines the site-specific "
 "configuration for the shadow password suite. This file is required. Absence "
@@ -4029,7 +4583,7 @@
 "undesirable operation."
 msgstr ""
 
-#: login.defs.5.xml:84(para)
+#: login.defs.5.xml:115(para)
 msgid ""
 "This file is a readable text file, each line of the file describing one "
 "configuration parameter. The lines consist of a configuration name and "
@@ -4038,7 +4592,7 @@
 "the first non-white character of the line."
 msgstr ""
 
-#: login.defs.5.xml:92(para)
+#: login.defs.5.xml:123(para)
 msgid ""
 "Parameter values may be of four types: strings, booleans, numbers, and long "
 "numbers. A string is comprised of any printable characters. A boolean should "
@@ -4051,28 +4605,28 @@
 "and long numeric parameters is machine-dependent."
 msgstr ""
 
-#: login.defs.5.xml:107(para)
+#: login.defs.5.xml:138(para)
 msgid "The following configuration items are provided:"
 msgstr "Följande konfigurationsposter tillhandahålls:"
 
-#: login.defs.5.xml:2(term) chfn.1.xml:2(term)
+#: login.defs.5.xml:32(term) chfn.1.xml:32(term)
 #, fuzzy
 msgid "<option>CHFN_AUTH</option> (boolean)"
 msgstr "CHFN_AUTH (boolesk)"
 
-#: login.defs.5.xml:4(para) chfn.1.xml:4(para)
+#: login.defs.5.xml:34(para) chfn.1.xml:34(para)
 msgid ""
 "If <replaceable>yes</replaceable>, the <command>chfn</command> program will "
 "require authentication before making any changes, unless run by the "
 "superuser."
 msgstr ""
 
-#: login.defs.5.xml:2(term) chfn.1.xml:2(term)
+#: login.defs.5.xml:32(term) chfn.1.xml:32(term)
 #, fuzzy
 msgid "<option>CHFN_RESTRICT</option> (string)"
 msgstr "CHFN_RESTRICT (sträng)"
 
-#: login.defs.5.xml:4(para) chfn.1.xml:4(para)
+#: login.defs.5.xml:34(para) chfn.1.xml:34(para)
 msgid ""
 "This parameter specifies which values in the <emphasis remap=\"I\">gecos</"
 "emphasis> field of the <filename>/etc/passwd</filename> file may be changed "
@@ -4087,84 +4641,84 @@
 "achieved by not installing <command>chfn</command> SUID."
 msgstr ""
 
-#: login.defs.5.xml:2(term) chsh.1.xml:2(term)
+#: login.defs.5.xml:32(term) chsh.1.xml:32(term)
 #, fuzzy
 msgid "<option>CHSH_AUTH</option> (boolean)"
 msgstr "CHFN_AUTH (boolesk)"
 
-#: login.defs.5.xml:4(para) chsh.1.xml:4(para)
+#: login.defs.5.xml:34(para) chsh.1.xml:34(para)
 msgid ""
 "If <replaceable>yes</replaceable>, the <command>chsh</command> program will "
 "require authentication before making any changes, unless run by the "
 "superuser."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ERASECHAR</option> (number)"
 msgstr "UMASK (nummer)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Terminal ERASE character (<replaceable>010</replaceable> = backspace, "
 "<replaceable>0177</replaceable> = DEL)."
 msgstr ""
 
-#: login.defs.5.xml:8(para) login.defs.5.xml:7(para) login.1.xml:8(para)
-#: login.1.xml:7(para)
+#: login.defs.5.xml:38(para) login.defs.5.xml:37(para) login.1.xml:38(para)
+#: login.1.xml:37(para)
 msgid ""
 "The value can be prefixed \"0\" for an octal value, or \"0x\" for an "
 "hexadecimal value."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FAIL_DELAY</option> (number)"
 msgstr "PASS_MIN_DAYS (nummer)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Delay in seconds before being allowed another attempt after a login failure."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FAILLOG_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (boolesk)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "Enable logging and display of <filename>/var/log/faillog</filename> login "
 "failure info."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FAKE_SHELL</option> (string)"
 msgstr "MAIL_DIR (sträng)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If set, <command>login</command> will execute this shell instead of the "
 "users' shell specified in <filename>/etc/passwd</filename>."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>FTMP_FILE</option> (string)"
 msgstr "MAIL_DIR (sträng)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, login failures will be logged in this file in a utmp format."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>HUSHLOGIN_FILE</option> (string)"
 msgstr "CHFN_RESTRICT (sträng)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, this file can inhibit all the usual chatter during the login "
 "sequence. If a full pathname is specified, then hushed mode will be enabled "
@@ -4173,106 +4727,106 @@
 "directory."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ISSUE_FILE</option> (string)"
 msgstr "MAIL_DIR (sträng)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "If defined, this file will be displayed before each login prompt."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>KILLCHAR</option> (number)"
 msgstr "GID_MAX (nummer)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Terminal KILL character (<replaceable>025</replaceable> = CTRL/U)."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LASTLOG_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (boolesk)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable logging and display of /var/log/lastlog login time info."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOG_OK_LOGINS</option> (boolean)"
 msgstr "CHFN_AUTH (boolesk)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable logging of successful logins."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOG_UNKFAIL_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (boolesk)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable display of unknown usernames when login failures are recorded."
 msgstr ""
 
-#: login.defs.5.xml:8(para) login.1.xml:8(para)
+#: login.defs.5.xml:38(para) login.1.xml:38(para)
 msgid ""
 "Note: logging unknown usernames may be a security issue if an user enter her "
 "password instead of her login name."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOGIN_RETRIES</option> (number)"
 msgstr "GID_MIN (nummer)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Maximum number of login retries in case of bad password."
 msgstr ""
 
-#: login.defs.5.xml:7(para) login.1.xml:7(para)
+#: login.defs.5.xml:37(para) login.1.xml:37(para)
 msgid ""
 "This will most likely be overriden by PAM, since the default pam_unix module "
 "has it's own built in of 3 retries. However, this is a safe fallback in case "
 "you are using an authentication module that does not enforce PAM_MAXTRIES."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>LOGIN_TIMEOUT</option> (number)"
 msgstr "GID_MAX (nummer)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Max time in seconds for login."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>MOTD_FILE</option> (string)"
 msgstr "MAIL_DIR (sträng)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, \":\" delimited list of \"message of the day\" files to be "
 "displayed upon login."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>NOLOGINS_FILE</option> (string)"
 msgstr "CHFN_RESTRICT (sträng)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, name of file whose presence will inhibit non-root logins. The "
 "contents of this file should be a message indicating why logins are "
 "inhibited."
 msgstr ""
 
-#: login.defs.5.xml:149(para)
+#: login.defs.5.xml:181(para)
 #, fuzzy
 msgid ""
 "<option>PASS_MAX_DAYS</option>, <option>PASS_MIN_DAYS</option> and "
@@ -4283,45 +4837,45 @@
 "skapas. Alla ändringar av dessa inställningar påverkar inte existerande "
 "konton."
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>PORTTIME_CHECKS_ENAB</option> (boolean)"
 msgstr "CHFN_AUTH (boolesk)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Enable checking of time restrictions specified in /etc/porttime."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>TTYGROUP</option> (string)"
 msgstr "MAIL_DIR (sträng)"
 
-#: login.defs.5.xml:3(term) login.1.xml:3(term)
+#: login.defs.5.xml:33(term) login.1.xml:33(term)
 #, fuzzy
 msgid "<option>TTYPERM</option> (string)"
 msgstr "USERDEL_CMD (sträng)"
 
-#: login.defs.5.xml:5(para) login.1.xml:5(para)
+#: login.defs.5.xml:35(para) login.1.xml:35(para)
 msgid ""
 "The terminal permissions: the login tty will be owned by the "
 "<option>TTYGROUP</option> group, and the permissions will be set to "
 "<option>TTYPERM</option>."
 msgstr ""
 
-#: login.defs.5.xml:10(para) login.1.xml:10(para)
+#: login.defs.5.xml:40(para) login.1.xml:40(para)
 msgid ""
 "By default, the ownership of the terminal is set to the user's primary group "
 "and the permissions are set to <replaceable>0600</replaceable>."
 msgstr ""
 
-#: login.defs.5.xml:15(para) login.1.xml:15(para)
+#: login.defs.5.xml:45(para) login.1.xml:45(para)
 msgid ""
 "<option>TTYGROUP</option> can be either the name of a group or a numeric "
 "group identifier."
 msgstr ""
 
-#: login.defs.5.xml:19(para) login.1.xml:19(para)
+#: login.defs.5.xml:49(para) login.1.xml:49(para)
 msgid ""
 "If you have a <command>write</command> program which is \"setgid\" to a "
 "special group which owns the terminals, define TTYGROUP to the group number "
@@ -4329,130 +4883,129 @@
 "TTYPERM to either 622 or 600."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>TTYTYPE_FILE</option> (string)"
 msgstr "MAIL_DIR (sträng)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid ""
 "If defined, file which maps tty line to TERM environment parameter. Each "
 "line of the file is in a format something like \"vt100 tty01\"."
 msgstr ""
 
-#: login.defs.5.xml:2(term) login.1.xml:2(term)
+#: login.defs.5.xml:32(term) login.1.xml:32(term)
 #, fuzzy
 msgid "<option>ULIMIT</option> (number)"
 msgstr "UID_MIN (nummer)"
 
-#: login.defs.5.xml:4(para) login.1.xml:4(para)
+#: login.defs.5.xml:34(para) login.1.xml:34(para)
 msgid "Default <command>ulimit</command> value."
 msgstr ""
 
-#: login.defs.5.xml:177(title)
+#: login.defs.5.xml:209(title)
 msgid "CROSS REFERENCES"
 msgstr ""
 
-#: login.defs.5.xml:178(para)
+#: login.defs.5.xml:210(para)
 msgid ""
 "The following cross references show which programs in the shadow password "
 "suite use which parameters."
 msgstr ""
 
-#: login.defs.5.xml:186(term) chfn.1.xml:12(refentrytitle)
-#: chfn.1.xml:17(refname) chfn.1.xml:23(command)
+#: login.defs.5.xml:218(term) chfn.1.xml:41(refentrytitle)
+#: chfn.1.xml:46(refname) chfn.1.xml:52(command)
 msgid "chfn"
 msgstr "chfn"
 
-#: login.defs.5.xml:188(para)
+#: login.defs.5.xml:220(para)
 msgid ""
 "<phrase condition=\"no_pam\">CHFN_AUTH</phrase> CHFN_RESTRICT <phrase "
 "condition=\"no_pam\">LOGIN_STRING</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:196(term) chgpasswd.8.xml:13(refentrytitle)
-#: chgpasswd.8.xml:18(refname) chgpasswd.8.xml:24(command)
+#: login.defs.5.xml:228(term) chgpasswd.8.xml:42(refentrytitle)
+#: chgpasswd.8.xml:47(refname) chgpasswd.8.xml:53(command)
 msgid "chgpasswd"
 msgstr "chgpasswd"
 
-#: login.defs.5.xml:198(para) login.defs.5.xml:228(para)
+#: login.defs.5.xml:230(para) login.defs.5.xml:260(para)
 msgid ""
 "ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB <phrase condition="
 "\"sha_crypt\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:206(term) chpasswd.8.xml:12(refentrytitle)
-#: chpasswd.8.xml:17(refname) chpasswd.8.xml:23(command)
+#: login.defs.5.xml:238(term) chpasswd.8.xml:41(refentrytitle)
+#: chpasswd.8.xml:46(refname) chpasswd.8.xml:52(command)
 msgid "chpasswd"
 msgstr "chpasswd"
 
-#: login.defs.5.xml:208(para)
+#: login.defs.5.xml:240(para)
 msgid ""
 "ENCRYPT_METHOD MD5_CRYPT_ENAB <phrase condition=\"sha_crypt"
 "\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:216(term) chsh.1.xml:11(refentrytitle)
-#: chsh.1.xml:16(refname) chsh.1.xml:22(command)
+#: login.defs.5.xml:248(term) chsh.1.xml:40(refentrytitle)
+#: chsh.1.xml:45(refname) chsh.1.xml:51(command)
 msgid "chsh"
 msgstr "chsh"
 
-#: login.defs.5.xml:218(para)
+#: login.defs.5.xml:250(para)
 #, fuzzy
 msgid "CHSH_AUTH LOGIN_STRING"
 msgstr "CHFN_AUTH CHFN_RESTRICT"
 
-#: login.defs.5.xml:226(term) gpasswd.1.xml:13(refentrytitle)
-#: gpasswd.1.xml:18(refname) gpasswd.1.xml:29(command)
+#: login.defs.5.xml:258(term) gpasswd.1.xml:42(refentrytitle)
+#: gpasswd.1.xml:47(refname) gpasswd.1.xml:58(command)
 msgid "gpasswd"
 msgstr "gpasswd"
 
-#: login.defs.5.xml:236(term) groupadd.8.xml:11(refentrytitle)
-#: groupadd.8.xml:16(refname) groupadd.8.xml:22(command)
+#: login.defs.5.xml:268(term) groupadd.8.xml:42(refentrytitle)
+#: groupadd.8.xml:47(refname) groupadd.8.xml:53(command)
 msgid "groupadd"
 msgstr "groupadd"
 
-#: login.defs.5.xml:238(para)
+#: login.defs.5.xml:270(para)
 #, fuzzy
 msgid "GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP SYS_GID_MAX SYS_GID_MIN"
 msgstr ""
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:245(term) groupdel.8.xml:9(refentrytitle)
-#: groupdel.8.xml:14(refname) groupdel.8.xml:20(command)
+#: login.defs.5.xml:277(term) groupdel.8.xml:38(refentrytitle)
+#: groupdel.8.xml:43(refname) groupdel.8.xml:49(command)
 msgid "groupdel"
 msgstr "groupdel"
 
-#: login.defs.5.xml:247(para) login.defs.5.xml:253(para)
-#: login.defs.5.xml:259(para) login.defs.5.xml:266(para)
-#: login.defs.5.xml:272(para) login.defs.5.xml:278(para)
-#: login.defs.5.xml:421(para)
+#: login.defs.5.xml:279(para) login.defs.5.xml:285(para)
+#: login.defs.5.xml:291(para) login.defs.5.xml:298(para)
+#: login.defs.5.xml:304(para) login.defs.5.xml:310(para)
 msgid "MAX_MEMBERS_PER_GROUP"
 msgstr ""
 
-#: login.defs.5.xml:251(term) groupmems.8.xml:9(refentrytitle)
-#: groupmems.8.xml:14(refname) groupmems.8.xml:20(command)
+#: login.defs.5.xml:283(term) groupmems.8.xml:38(refentrytitle)
+#: groupmems.8.xml:43(refname) groupmems.8.xml:49(command)
 msgid "groupmems"
 msgstr "groupmems"
 
-#: login.defs.5.xml:257(term) groupmod.8.xml:9(refentrytitle)
-#: groupmod.8.xml:14(refname) groupmod.8.xml:20(command)
+#: login.defs.5.xml:289(term) groupmod.8.xml:38(refentrytitle)
+#: groupmod.8.xml:43(refname) groupmod.8.xml:49(command)
 msgid "groupmod"
 msgstr "groupmod"
 
-#: login.defs.5.xml:264(term) grpck.8.xml:9(refentrytitle)
-#: grpck.8.xml:14(refname) grpck.8.xml:20(command) grpck.8.xml:29(command)
+#: login.defs.5.xml:296(term) grpck.8.xml:38(refentrytitle)
+#: grpck.8.xml:43(refname) grpck.8.xml:49(command) grpck.8.xml:58(command)
 msgid "grpck"
 msgstr "grpck"
 
-#: login.defs.5.xml:284(term) login.1.xml:41(refentrytitle)
-#: login.1.xml:46(refname) login.1.xml:52(command) login.1.xml:59(command)
-#: login.1.xml:65(command)
+#: login.defs.5.xml:316(term) login.1.xml:70(refentrytitle)
+#: login.1.xml:75(refname) login.1.xml:81(command) login.1.xml:89(command)
+#: login.1.xml:96(command)
 msgid "login"
 msgstr "login"
 
-#: login.defs.5.xml:286(para)
+#: login.defs.5.xml:318(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENV_PATH ENV_SUPATH ENV_TZ ENVIRON_FILE</"
@@ -4467,11 +5020,17 @@
 "phrase> USERGROUPS_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:315(para)
+#: login.defs.5.xml:345(term)
+#, fuzzy
+#| msgid "newgrp"
+msgid "newgrp / sg"
+msgstr "newgrp"
+
+#: login.defs.5.xml:347(para)
 msgid "SYSLOG_SG_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:323(para)
+#: login.defs.5.xml:355(para)
 #, fuzzy
 msgid ""
 "ENCRYPT_METHOD GID_MAX GID_MIN MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB "
@@ -4482,18 +5041,18 @@
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:339(para)
+#: login.defs.5.xml:371(para)
 msgid ""
 "ENCRYPT_METHOD MD5_CRYPT_ENAB OBSCURE_CHECKS_ENAB PASS_ALWAYS_WARN "
 "PASS_CHANGE_TRIES PASS_MAX_LEN PASS_MIN_LEN <phrase condition=\"sha_crypt"
 "\">SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:350(para) login.defs.5.xml:358(para)
+#: login.defs.5.xml:382(para) login.defs.5.xml:390(para)
 msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE"
 
-#: login.defs.5.xml:365(para)
+#: login.defs.5.xml:397(para)
 msgid ""
 "<phrase condition=\"no_pam\">CONSOLE</phrase> CONSOLE_GROUPS DEFAULT_HOME "
 "<phrase condition=\"no_pam\">ENV_HZ ENVIRON_FILE</phrase> ENV_PATH "
@@ -4503,46 +5062,60 @@
 "\">USERGROUPS_ENAB</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:380(term)
+#: login.defs.5.xml:412(term)
 #, fuzzy
 msgid "sulogin"
 msgstr "login"
 
-#: login.defs.5.xml:382(para)
+#: login.defs.5.xml:414(para)
 msgid "ENV_HZ <phrase condition=\"no_pam\">ENV_TZ</phrase>"
 msgstr ""
 
-#: login.defs.5.xml:391(para)
+#: login.defs.5.xml:423(para)
 #, fuzzy
 msgid ""
-"GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS PASS_MIN_DAYS "
-"PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN UID_MAX "
-"UID_MIN UMASK"
+"CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS "
+"PASS_MIN_DAYS PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN "
+"UID_MAX UID_MIN UMASK"
 msgstr ""
 "GID_MAX GID_MIN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UID_MAX UID_MIN "
 "UMASK"
 
-#: login.defs.5.xml:404(para)
+#: login.defs.5.xml:436(para)
 msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP USERDEL_CMD USERGROUPS_ENAB"
 msgstr ""
 
-#: login.defs.5.xml:413(para)
+#: login.defs.5.xml:445(para)
 msgid "MAIL_DIR MAIL_FILE MAX_MEMBERS_PER_GROUP"
 msgstr ""
 
-#: login.defs.5.xml:429(para)
+#: login.defs.5.xml:456(para)
+#, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
+#| "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 msgid ""
 "Much of the functionality that used to be provided by the shadow password "
 "suite is now handled by PAM. Thus, <filename>/etc/login.defs</filename> is "
-"no longer used by programs such as: <citerefentry><refentrytitle>login</"
-"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</"
-"manvolnum></citerefentry>. Please refer to the corresponding PAM "
-"configuration files instead."
+"no longer used by <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, or less used by "
+"<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, and <citerefentry><refentrytitle>su</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>. Please refer to the "
+"corresponding PAM configuration files instead."
 msgstr ""
+"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>usermod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: login.defs.5.xml:446(para)
+#: login.defs.5.xml:472(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -4564,22 +5137,22 @@
 "citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: login.access.5.xml:5(refentrytitle) login.access.5.xml:10(refname)
+#: login.access.5.xml:35(refentrytitle) login.access.5.xml:40(refname)
 msgid "login.access"
 msgstr "login.access"
 
-#: login.access.5.xml:11(refpurpose)
+#: login.access.5.xml:41(refpurpose)
 msgid "login access control table"
 msgstr ""
 
-#: login.access.5.xml:16(para)
+#: login.access.5.xml:46(para)
 msgid ""
 "The <emphasis remap=\"I\">login.access</emphasis> file specifies (user, "
 "host) combinations and/or (user, tty) combinations for which a login will be "
 "either accepted or refused."
 msgstr ""
 
-#: login.access.5.xml:22(para)
+#: login.access.5.xml:52(para)
 msgid ""
 "When someone logs in, the <emphasis remap=\"I\">login.access</emphasis> is "
 "scanned for the first entry that matches the (user, host) combination, or, "
@@ -4588,19 +5161,19 @@
 "whether the login will be accepted or refused."
 msgstr ""
 
-#: login.access.5.xml:30(para)
+#: login.access.5.xml:60(para)
 msgid ""
 "Each line of the login access control table has three fields separated by a "
 "\":\" character:"
 msgstr ""
 
-#: login.access.5.xml:35(para)
+#: login.access.5.xml:65(para)
 msgid ""
 "<emphasis remap=\"I\">permission</emphasis>:<emphasis remap=\"I\">users</"
 "emphasis>:<emphasis remap=\"I\">origins</emphasis>"
 msgstr ""
 
-#: login.access.5.xml:39(para)
+#: login.access.5.xml:69(para)
 msgid ""
 "The first field should be a \"<emphasis>+</emphasis>\" (access granted) or "
 "\"<emphasis>-</emphasis>\" (access denied) character. The second field "
@@ -4614,53 +5187,50 @@
 "@netgroupname in host or user patterns."
 msgstr ""
 
-#: login.access.5.xml:53(para)
+#: login.access.5.xml:83(para)
 msgid ""
 "The <emphasis>EXCEPT</emphasis> operator makes it possible to write very "
 "compact rules."
 msgstr ""
 
-#: login.access.5.xml:58(para)
+#: login.access.5.xml:88(para)
 msgid ""
 "The group file is searched only when a name does not match that of the "
 "logged-in user. Only groups are matched in which users are explicitly "
 "listed: the program does not look at a user's primary group id value."
 msgstr ""
 
-#: login.1.xml:47(refpurpose)
+#: login.1.xml:76(refpurpose)
 msgid "begin session on the system"
 msgstr ""
 
-#: login.1.xml:53(arg) login.1.xml:60(arg) login.1.xml:66(arg)
-#: login.1.xml:178(option) groupmems.8.xml:24(arg) groupmems.8.xml:65(option)
+#: login.1.xml:82(arg) login.1.xml:90(arg) login.1.xml:97(arg)
+#: login.1.xml:214(option) groupmems.8.xml:54(arg)
 msgid "-p"
 msgstr "-p"
 
-#: login.1.xml:55(replaceable) login.1.xml:62(replaceable)
-msgid "username"
-msgstr "användarnamn"
-
-#: login.1.xml:56(replaceable)
-msgid "ENV=VAR"
-msgstr ""
-
-#: login.1.xml:61(replaceable) login.1.xml:67(replaceable)
+#: login.1.xml:83(replaceable) login.1.xml:91(replaceable)
+#: login.1.xml:98(replaceable)
 msgid "host"
 msgstr "värd"
 
-#: login.1.xml:61(arg) chfn.1.xml:27(arg)
+#: login.1.xml:83(arg) login.1.xml:91(arg) chfn.1.xml:56(arg)
 msgid "-h <placeholder-1/>"
 msgstr "-h <placeholder-1/>"
 
-#: login.1.xml:62(arg) chfn.1.xml:24(arg)
-msgid "-f <placeholder-1/>"
-msgstr "-f <placeholder-1/>"
+#: login.1.xml:86(replaceable)
+msgid "ENV=VAR"
+msgstr ""
 
-#: login.1.xml:67(arg) chfn.1.xml:25(arg)
+#: login.1.xml:92(arg) login.1.xml:192(option) expiry.1.xml:54(arg)
+msgid "-f"
+msgstr "-f"
+
+#: login.1.xml:98(arg) chfn.1.xml:54(arg)
 msgid "-r <placeholder-1/>"
 msgstr "-r <placeholder-1/>"
 
-#: login.1.xml:73(para)
+#: login.1.xml:104(para)
 msgid ""
 "The <command>login</command> program is used to establish a new session with "
 "the system. It is normally invoked automatically by responding to the "
@@ -4674,7 +5244,7 @@
 "produce an error message."
 msgstr ""
 
-#: login.1.xml:87(para)
+#: login.1.xml:118(para)
 msgid ""
 "The user is then prompted for a password, where appropriate. Echoing is "
 "disabled to prevent revealing the password. Only a small number of password "
@@ -4682,7 +5252,7 @@
 "communications link is severed."
 msgstr ""
 
-#: login.1.xml:94(para)
+#: login.1.xml:125(para)
 msgid ""
 "If password aging has been enabled for your account, you may be prompted for "
 "a new password before proceeding. You will be forced to provide your old "
@@ -4691,7 +5261,7 @@
 "citerefentry> for more information."
 msgstr ""
 
-#: login.1.xml:103(para)
+#: login.1.xml:134(para)
 msgid ""
 "After a successful login, you will be informed of any system messages and "
 "the presence of mail. You may turn off the printing of the system message "
@@ -4702,7 +5272,7 @@
 "the condition of your mailbox."
 msgstr ""
 
-#: login.1.xml:114(para)
+#: login.1.xml:145(para)
 msgid ""
 "Your user and group ID will be set according to their values in the "
 "<filename>/etc/passwd</filename> file. The value for <envar>$HOME</envar>, "
@@ -4712,21 +5282,21 @@
 "entries in the GECOS field."
 msgstr ""
 
-#: login.1.xml:123(para)
+#: login.1.xml:154(para)
 msgid ""
 "On some installations, the environmental variable <envar>$TERM</envar> will "
 "be initialized to the terminal type on your tty line, as specified in "
 "<filename>/etc/ttytype</filename>."
 msgstr ""
 
-#: login.1.xml:129(para)
+#: login.1.xml:160(para)
 msgid ""
 "An initialization script for your command interpreter may also be executed. "
 "Please see the appropriate manual section for more information on this "
 "function."
 msgstr ""
 
-#: login.1.xml:141(para) login.1.xml:212(para)
+#: login.1.xml:172(para) login.1.xml:248(para)
 msgid ""
 "The <command>login</command> program is NOT responsible for removing users "
 "from the utmp file. It is the responsibility of "
@@ -4739,31 +5309,31 @@
 "\"."
 msgstr ""
 
-#: login.1.xml:161(option) groupadd.8.xml:27(arg) expiry.1.xml:24(arg)
-msgid "-f"
-msgstr "-f"
-
-#: login.1.xml:164(para)
+#: login.1.xml:195(para)
 msgid "Do not perform authentication, user is preauthenticated."
 msgstr "Genomför inte autentisering, användaren är förautentiserad."
 
-#: login.1.xml:170(option)
+#: login.1.xml:198(para)
+msgid "Note: In that case, <replaceable>username</replaceable> is mandatory."
+msgstr ""
+
+#: login.1.xml:206(option)
 msgid "-h"
 msgstr "-h"
 
-#: login.1.xml:173(para)
+#: login.1.xml:209(para)
 msgid "Name of the remote host for this login."
 msgstr "Namnet på fjärrvärden för denna inloggning."
 
-#: login.1.xml:181(para)
+#: login.1.xml:217(para)
 msgid "Preserve environment."
 msgstr "Behåll miljö."
 
-#: login.1.xml:189(para)
+#: login.1.xml:225(para)
 msgid "Perform autologin protocol for rlogin."
 msgstr "Genomför automatiskt inloggningsprotokoll för rlogin."
 
-#: login.1.xml:194(para)
+#: login.1.xml:230(para)
 msgid ""
 "The <option>-r</option>, <option>-h</option> and <option>-f</option> options "
 "are only used when <command>login</command> is invoked by root."
@@ -4771,18 +5341,18 @@
 "Flaggorna <option>-r</option>, <option>-h</option> och <option>-f</option> "
 "används endast när <command>login</command> har startats av root."
 
-#: login.1.xml:203(para)
+#: login.1.xml:239(para)
 msgid ""
 "This version of <command>login</command> has many compilation options, only "
 "some of which may be in use at any particular site."
 msgstr ""
 
-#: login.1.xml:208(para)
+#: login.1.xml:244(para)
 msgid ""
 "The location of files is subject to differences in system configuration."
 msgstr ""
 
-#: login.1.xml:224(para)
+#: login.1.xml:260(para)
 msgid ""
 "As with any program, <command>login</command>'s appearance can be faked. If "
 "non-trusted users have physical access to a machine, an attacker could use "
@@ -4791,47 +5361,47 @@
 "trusted path and prevent this kind of attack."
 msgstr ""
 
-#: login.1.xml:289(filename)
+#: login.1.xml:325(filename)
 msgid "/var/log/wtmp"
 msgstr "/var/log/wtmp"
 
-#: login.1.xml:291(para)
+#: login.1.xml:327(para)
 msgid "List of previous login sessions."
 msgstr "Lista på tidigare inloggningssessioner."
 
-#: login.1.xml:307(filename)
+#: login.1.xml:343(filename)
 msgid "/etc/motd"
 msgstr "/etc/motd"
 
-#: login.1.xml:309(para)
+#: login.1.xml:345(para)
 msgid "System message of the day file."
 msgstr "Fil för dagens systemmeddelande."
 
-#: login.1.xml:313(filename)
+#: login.1.xml:349(filename)
 msgid "/etc/nologin"
 msgstr "/etc/nologin"
 
-#: login.1.xml:315(para)
+#: login.1.xml:351(para)
 msgid "Prevent non-root users from logging in."
 msgstr "Förhindra icke-rootanvändare från att logga in."
 
-#: login.1.xml:319(filename)
+#: login.1.xml:355(filename)
 msgid "/etc/ttytype"
 msgstr "/etc/ttytype"
 
-#: login.1.xml:321(para)
+#: login.1.xml:357(para)
 msgid "List of terminal types."
 msgstr "Lista på terminaltyper."
 
-#: login.1.xml:325(filename)
+#: login.1.xml:361(filename)
 msgid "$HOME/.hushlogin"
 msgstr "$HOME/.hushlogin"
 
-#: login.1.xml:327(para)
+#: login.1.xml:363(para)
 msgid "Suppress printing of system messages."
 msgstr "Tysta ner utskrift av systemmeddelanden."
 
-#: login.1.xml:335(para)
+#: login.1.xml:371(para)
 msgid ""
 "<citerefentry><refentrytitle>mail</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>passwd</"
@@ -4861,15 +5431,15 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getty</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: limits.5.xml:5(refentrytitle) limits.5.xml:10(refname)
+#: limits.5.xml:35(refentrytitle) limits.5.xml:40(refname)
 msgid "limits"
 msgstr "limits"
 
-#: limits.5.xml:11(refpurpose)
+#: limits.5.xml:41(refpurpose)
 msgid "resource limits definition"
 msgstr "definition av resursbegränsningar"
 
-#: limits.5.xml:17(para)
+#: limits.5.xml:47(para)
 msgid ""
 "The <emphasis remap=\"I\">limits</emphasis> file (<filename>/etc/limits</"
 "filename> by default or LIMITS_FILE defined <filename>config.h</filename>) "
@@ -4877,82 +5447,82 @@
 "and readable by root account only."
 msgstr ""
 
-#: limits.5.xml:25(para)
+#: limits.5.xml:55(para)
 msgid ""
 "By default no quota is imposed on 'root'. In fact, there is no way to impose "
 "limits via this procedure to root-equiv accounts (accounts with UID 0)."
 msgstr ""
 
-#: limits.5.xml:31(para)
+#: limits.5.xml:61(para)
 msgid "Each line describes a limit for a user in the form:"
 msgstr "Varje rad beskriver en begränsning för användaren i formatet:"
 
-#: limits.5.xml:34(emphasis)
+#: limits.5.xml:64(emphasis)
 msgid "user LIMITS_STRING"
 msgstr "user LIMITS_STRING"
 
-#: limits.5.xml:37(para)
+#: limits.5.xml:67(para)
 msgid ""
 "The <emphasis>LIMITS_STRING</emphasis> is a string of a concatenated list of "
 "resource limits. Each limit consists of a letter identifier followed by a "
 "numerical limit."
 msgstr ""
 
-#: limits.5.xml:43(para)
+#: limits.5.xml:73(para)
 msgid "The valid identifiers are:"
 msgstr "De giltiga identifierarna är:"
 
-#: limits.5.xml:46(para)
+#: limits.5.xml:76(para)
 msgid "A: max address space (KB)"
 msgstr "A: maximal adressrymd (KB)"
 
-#: limits.5.xml:47(para)
+#: limits.5.xml:77(para)
 msgid "C: max core file size (KB)"
 msgstr ""
 
-#: limits.5.xml:48(para)
+#: limits.5.xml:78(para)
 msgid "D: max data size (KB)"
 msgstr "D: maximal datastorlek (KB)"
 
-#: limits.5.xml:49(para)
+#: limits.5.xml:79(para)
 msgid "F: maximum filesize (KB)"
 msgstr "F: maximal filstorlek (KB)"
 
-#: limits.5.xml:50(para)
+#: limits.5.xml:80(para)
 msgid "M: max locked-in-memory address space (KB)"
 msgstr ""
 
-#: limits.5.xml:51(para)
+#: limits.5.xml:81(para)
 msgid "N: max number of open files"
 msgstr "N: maximalt antal öppna filer"
 
-#: limits.5.xml:52(para)
+#: limits.5.xml:82(para)
 msgid "R: max resident set size (KB)"
 msgstr ""
 
-#: limits.5.xml:53(para)
+#: limits.5.xml:83(para)
 msgid "S: max stack size (KB)"
 msgstr "S: maximal stackstorlek (KB)"
 
-#: limits.5.xml:54(para)
+#: limits.5.xml:84(para)
 msgid "T: max CPU time (MIN)"
 msgstr "T: maximal processortid (MIN)"
 
-#: limits.5.xml:55(para)
+#: limits.5.xml:85(para)
 msgid "U: max number of processes"
 msgstr "U: maximalt antal processer"
 
-#: limits.5.xml:56(para)
+#: limits.5.xml:86(para)
 msgid ""
 "K: file creation mask, set by <citerefentry><refentrytitle>umask</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 msgstr ""
 
-#: limits.5.xml:61(para)
+#: limits.5.xml:91(para)
 msgid "L: max number of logins for this user"
 msgstr "L: maximalt antal inloggningar för denna användare"
 
-#: limits.5.xml:62(para)
+#: limits.5.xml:92(para)
 msgid ""
 "P: process priority, set by <citerefentry><refentrytitle>setpriority</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
@@ -4960,22 +5530,22 @@
 "P: processprioritet, inställd av <citerefentry><refentrytitle>setpriority</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 
-#: limits.5.xml:67(para)
+#: limits.5.xml:97(para)
 msgid "I: max nice value (0..39 which translates to 20..-19)"
 msgstr ""
 
-#: limits.5.xml:69(para)
+#: limits.5.xml:99(para)
 msgid "O: max real time priority"
 msgstr ""
 
-#: limits.5.xml:72(para)
+#: limits.5.xml:102(para)
 msgid ""
 "For example, <emphasis remap=\"I\">L2D2048N5</emphasis> is a valid "
-"<emphasis>LIMITS_STRING </emphasis>. For reading convenience, the following "
+"<emphasis>LIMITS_STRING</emphasis>. For reading convenience, the following "
 "entries are equivalent:"
 msgstr ""
 
-#: limits.5.xml:78(programlisting)
+#: limits.5.xml:108(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -4988,7 +5558,7 @@
 "      username L2 D2048 N5\n"
 "    "
 
-#: limits.5.xml:83(para)
+#: limits.5.xml:113(para)
 msgid ""
 "Be aware that after <emphasis remap=\"I\">username</emphasis> the rest of "
 "the line is considered a limit string, thus comments are not allowed. A "
@@ -4996,7 +5566,7 @@
 "<command>login</command> program."
 msgstr ""
 
-#: limits.5.xml:90(para)
+#: limits.5.xml:120(para)
 msgid ""
 "The default entry is denoted by username \"<emphasis>*</emphasis>\". If you "
 "have multiple <emphasis remap=\"I\">default</emphasis> entries in your "
@@ -5004,24 +5574,24 @@
 "default entry."
 msgstr ""
 
-#: limits.5.xml:97(para)
+#: limits.5.xml:127(para)
 msgid ""
 "To completely disable limits for a user, a single dash \"<emphasis>-</"
 "emphasis>\" will do."
 msgstr ""
 
-#: limits.5.xml:102(para)
+#: limits.5.xml:132(para)
 msgid ""
 "Also, please note that all limit settings are set PER LOGIN. They are not "
 "global, nor are they permanent. Perhaps global limits will come, but for now "
 "this will have to do ;)"
 msgstr ""
 
-#: limits.5.xml:113(filename)
+#: limits.5.xml:143(filename)
 msgid "/etc/limits"
 msgstr "/etc/limits"
 
-#: limits.5.xml:121(para)
+#: limits.5.xml:151(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>setpriority</"
@@ -5035,16 +5605,16 @@
 "<citerefentry><refentrytitle>setrlimit</refentrytitle><manvolnum>2</"
 "manvolnum></citerefentry>."
 
-#: lastlog.8.xml:5(refentrytitle) lastlog.8.xml:10(refname)
-#: lastlog.8.xml:16(command)
+#: lastlog.8.xml:35(refentrytitle) lastlog.8.xml:40(refname)
+#: lastlog.8.xml:46(command)
 msgid "lastlog"
 msgstr "lastlog"
 
-#: lastlog.8.xml:11(refpurpose)
+#: lastlog.8.xml:41(refpurpose)
 msgid "reports the most recent login of all users or of a given user"
 msgstr ""
 
-#: lastlog.8.xml:25(para)
+#: lastlog.8.xml:55(para)
 msgid ""
 "<command>lastlog</command> formats and prints the contents of the last login "
 "log <filename>/var/log/lastlog</filename> file. The <emphasis>login-name</"
@@ -5053,35 +5623,35 @@
 "be printed, sorted by their order in <filename>/etc/passwd</filename>."
 msgstr ""
 
-#: lastlog.8.xml:37(para)
+#: lastlog.8.xml:67(para)
 msgid "The options which apply to the <command>lastlog</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>lastlog</command> är:"
 
-#: lastlog.8.xml:42(term)
+#: lastlog.8.xml:72(term)
 msgid ""
 "<option>-b</option>, <option>--before</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-b</option>, <option>--before</option><replaceable>DAGAR</"
 "replaceable>"
 
-#: lastlog.8.xml:46(para)
+#: lastlog.8.xml:76(para)
 msgid ""
 "Print only lastlog records older than <emphasis remap=\"I\">DAYS</emphasis>."
 msgstr ""
 
-#: lastlog.8.xml:60(term) faillog.8.xml:93(term)
+#: lastlog.8.xml:90(term) faillog.8.xml:142(term)
 msgid ""
 "<option>-t</option>, <option>--time</option><replaceable>DAYS</replaceable>"
 msgstr ""
 "<option>-t</option>, <option>--time</option><replaceable>DAGAR</replaceable>"
 
-#: lastlog.8.xml:65(para)
+#: lastlog.8.xml:95(para)
 msgid ""
 "Print the lastlog records more recent than <emphasis remap=\"I\">DAYS</"
 "emphasis>."
 msgstr ""
 
-#: lastlog.8.xml:72(term)
+#: lastlog.8.xml:102(term) faillog.8.xml:153(term)
 #, fuzzy
 #| msgid ""
 #| "<option>-K</option>, <option>--key</option><replaceable>KEY</"
@@ -5093,11 +5663,11 @@
 "<option>-K</option>, <option>--key</option><replaceable>NYCKEL</"
 "replaceable>=<replaceable>VÄRDE</replaceable>"
 
-#: lastlog.8.xml:77(para)
+#: lastlog.8.xml:107(para)
 msgid "Print the lastlog record of the specified user(s)."
 msgstr ""
 
-#: lastlog.8.xml:80(para)
+#: lastlog.8.xml:110(para) faillog.8.xml:163(para)
 msgid ""
 "The users can be specified by a login name, a numerical user ID, or a "
 "<replaceable>RANGE</replaceable> of users. This <replaceable>RANGE</"
@@ -5106,18 +5676,24 @@
 "UID_MAX</replaceable>), or a min value (<replaceable>UID_MIN-</replaceable>)."
 msgstr ""
 
-#: lastlog.8.xml:92(para)
+#: lastlog.8.xml:122(para)
 msgid ""
 "If the user has never logged in the message <emphasis>** Never logged in**</"
 "emphasis> will be displayed instead of the port and time."
 msgstr ""
 
-#: lastlog.8.xml:99(title) groups.1.xml:36(title) chsh.1.xml:77(title)
-#: chage.1.xml:164(title)
+#: lastlog.8.xml:127(para)
+msgid ""
+"Only the entries for the current users of the system will be displayed. "
+"Other entries may exist for users that were deleted previously."
+msgstr ""
+
+#: lastlog.8.xml:135(title) groups.1.xml:65(title) chsh.1.xml:106(title)
+#: chage.1.xml:193(title)
 msgid "NOTE"
 msgstr "NOTERA"
 
-#: lastlog.8.xml:100(para)
+#: lastlog.8.xml:136(para)
 msgid ""
 "The <filename>lastlog</filename> file is a database which contains info on "
 "the last login of each user. You should not rotate it. It is a sparse file, "
@@ -5127,15 +5703,15 @@
 "its real size with \"<command>ls -s</command>\"."
 msgstr ""
 
-#: lastlog.8.xml:114(filename)
+#: lastlog.8.xml:150(filename)
 msgid "/var/log/lastlog"
 msgstr "/var/log/lastlog"
 
-#: lastlog.8.xml:116(para)
+#: lastlog.8.xml:152(para)
 msgid "Database times of previous user logins."
 msgstr "Databastider för tidigare användarinloggningar."
 
-#: lastlog.8.xml:124(para)
+#: lastlog.8.xml:160(para)
 msgid ""
 "Large gaps in UID numbers will cause the lastlog program to run longer with "
 "no output to the screen (i.e. if in lastlog database there is no entries for "
@@ -5143,15 +5719,15 @@
 "processes entries with UIDs 171-799)."
 msgstr ""
 
-#: gshadow.5.xml:5(refentrytitle) gshadow.5.xml:10(refname)
+#: gshadow.5.xml:33(refentrytitle) gshadow.5.xml:38(refname)
 msgid "gshadow"
 msgstr "gshadow"
 
-#: gshadow.5.xml:11(refpurpose)
+#: gshadow.5.xml:39(refpurpose)
 msgid "shadowed group file"
 msgstr "skuggad gruppfil"
 
-#: gshadow.5.xml:16(para)
+#: gshadow.5.xml:44(para)
 msgid ""
 "<filename>/etc/gshadow</filename> contains the shadowed information for "
 "group accounts. It contains lines with the following colon-separated fields:"
@@ -5159,19 +5735,19 @@
 "<filename>/etc/gshadow</filename> innehåller skuggad gruppkontoinformation. "
 "Den innehåller rader med följande kolonseparerade fält:"
 
-#: gshadow.5.xml:23(para)
+#: gshadow.5.xml:51(para)
 msgid "group name"
 msgstr "gruppnamn"
 
-#: gshadow.5.xml:29(para)
+#: gshadow.5.xml:57(para)
 msgid "comma-separated list of group administrators"
 msgstr "kommaseparerad lista med gruppadministratörer"
 
-#: gshadow.5.xml:32(para)
+#: gshadow.5.xml:60(para)
 msgid "comma-separated list of group members"
 msgstr "kommaseparerad lista med gruppmedlemmar"
 
-#: gshadow.5.xml:36(para)
+#: gshadow.5.xml:64(para)
 msgid ""
 "The group name and password fields must be filled. The encrypted password "
 "consists of characters from the 64-character alphabet a thru z, A thru Z, 0 "
@@ -5185,32 +5761,47 @@
 "citerefentry>."
 msgstr ""
 
-#: gshadow.5.xml:49(para)
+#: gshadow.5.xml:77(para)
 msgid ""
 "This information supersedes any password present in <filename>/etc/group</"
 "filename>."
 msgstr ""
 
-#: gshadow.5.xml:80(para)
+#: gshadow.5.xml:108(para)
 #, fuzzy
+#| msgid ""
+#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+#| "citerefentry>, <citerefentry><refentrytitle>group</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#| "manvolnum></citerefentry>."
 msgid ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry>, <citerefentry><refentrytitle>group</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>grpck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>grpconv</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>group</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</manvolnum></"
+"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: grpck.8.xml:15(refpurpose)
+#: grpck.8.xml:44(refpurpose)
 msgid "verify integrity of group files"
 msgstr "validera integriteten för gruppfiler"
 
-#: grpck.8.xml:41(para)
+#: grpck.8.xml:70(para)
 msgid ""
 "The <command>grpck</command> command verifies the integrity of the system "
 "authentication information. All entries in <filename>/etc/group</"
@@ -5220,15 +5811,15 @@
 "are improperly formatted or which have other uncorrectable errors."
 msgstr ""
 
-#: grpck.8.xml:58(para)
+#: grpck.8.xml:87(para)
 msgid "a unique group name"
 msgstr "ett unikt gruppnamn"
 
-#: grpck.8.xml:61(para)
+#: grpck.8.xml:90(para)
 msgid "a valid list of members and administrators"
 msgstr "en giltig lista med medlemmar och administratörer"
 
-#: grpck.8.xml:65(para)
+#: grpck.8.xml:94(para)
 msgid ""
 "The checks for correct number of fields and unique group name are fatal. If "
 "the entry has the wrong number of fields, the user will be prompted to "
@@ -5239,27 +5830,27 @@
 "<command>groupmod</command> command to correct the error."
 msgstr ""
 
-#: grpck.8.xml:76(para)
+#: grpck.8.xml:105(para)
 msgid ""
 "The commands which operate on the <filename>/etc/group</filename> file are "
 "not able to alter corrupted or duplicated entries. <command>grpck</command> "
 "should be used in those circumstances to remove the offending entry."
 msgstr ""
 
-#: grpck.8.xml:86(para)
+#: grpck.8.xml:115(para)
 #, fuzzy
 #| msgid "The options which apply to the <command>pwck</command> command are:"
 msgid "The options which apply to the <command>grpck</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>pwck</command> är:"
 
-#: grpck.8.xml:93(para)
+#: grpck.8.xml:122(para)
 msgid ""
 "Execute the <command>grpck</command> command in read-only mode. This causes "
 "all questions regarding changes to be answered <emphasis>no</emphasis> "
 "without user intervention."
 msgstr ""
 
-#: grpck.8.xml:103(para)
+#: grpck.8.xml:132(para)
 #, fuzzy
 #| msgid ""
 #| "Sort entries in <filename>/etc/passwd</filename> and <filename>/etc/"
@@ -5271,7 +5862,7 @@
 "Sorterar poster i <filename>/etc/passwd</filename> och <filename>/etc/"
 "shadow</filename> efter UID."
 
-#: grpck.8.xml:112(para)
+#: grpck.8.xml:141(para)
 msgid ""
 "By default, <command>grpck</command> operates on <filename>/etc/group</"
 "filename><phrase condition=\"gshadow\"> and <filename>/etc/gshadow</"
@@ -5281,53 +5872,46 @@
 "emphasis> parameters.</phrase>"
 msgstr ""
 
-#: grpck.8.xml:162(para)
+#: grpck.8.xml:191(para)
 #, fuzzy
-#| msgid ""
-#| "<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
-#| "citerefentry>, <citerefentry><refentrytitle>group</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
-#| "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#| "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
-#| "manvolnum></citerefentry>."
 msgid ""
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry condition=\"gshadow\"><refentrytitle>gshadow</"
-"refentrytitle><manvolnum>5</manvolnum>, </"
-"citerefentry><citerefentry><refentrytitle>passwd</"
+"citerefentry>, <citerefentry><refentrytitle>groupmod</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry "
+"condition=\"gshadow\"><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
+"manvolnum>, </citerefentry><citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>groupmod</"
-"refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+"<citerefentry><refentrytitle>pwck</refentrytitle><manvolnum>8</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>shadow</"
+"refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 msgstr ""
-"<citerefentry><refentrytitle>vi</refentrytitle><manvolnum>1</manvolnum></"
-"citerefentry>, <citerefentry><refentrytitle>group</"
+"<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>passwd</"
+"refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+"<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+"citerefentry>, <citerefentry><refentrytitle>passwd</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-"<citerefentry><refentrytitle>gshadow</refentrytitle><manvolnum>5</"
-"manvolnum></citerefentry><citerefentry><refentrytitle>passwd</"
-"refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
 "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</manvolnum></"
-"citerefentry>."
+"citerefentry>, <citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>."
 
-#: grpck.8.xml:201(para)
+#: grpck.8.xml:233(para)
 msgid "one or more bad group entries"
 msgstr "en eller flera felaktiga grupposter"
 
-#: grpck.8.xml:207(para)
+#: grpck.8.xml:239(para)
 msgid "can't open group files"
 msgstr "kan inte öppna gruppfiler"
 
-#: grpck.8.xml:213(para)
+#: grpck.8.xml:245(para)
 msgid "can't lock group files"
 msgstr "kan inte låsa gruppfiler"
 
-#: grpck.8.xml:219(para)
+#: grpck.8.xml:251(para)
 msgid "can't update group files"
 msgstr "kan inte uppdatera gruppfiler"
 
-#: grpck.8.xml:183(para)
+#: grpck.8.xml:215(para)
 msgid ""
 "The <command>grpck</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -5335,21 +5919,20 @@
 "Kommandot <command>grpck</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: groups.1.xml:5(refentrytitle) groups.1.xml:10(refname)
-#: groups.1.xml:16(command)
+#: groups.1.xml:34(refentrytitle) groups.1.xml:39(refname)
+#: groups.1.xml:45(command)
 msgid "groups"
 msgstr "groups"
 
-#: groups.1.xml:11(refpurpose)
+#: groups.1.xml:40(refpurpose)
 msgid "display current group names"
 msgstr "visa aktuella gruppnamn"
 
-#: groups.1.xml:18(replaceable) gpasswd.1.xml:94(replaceable)
-#: gpasswd.1.xml:107(replaceable) chfn.1.xml:29(replaceable)
+#: groups.1.xml:47(replaceable) chfn.1.xml:58(replaceable)
 msgid "user"
 msgstr "användare"
 
-#: groups.1.xml:25(para)
+#: groups.1.xml:54(para)
 msgid ""
 "The <command>groups</command> command displays the current group names or ID "
 "values. If the value does not have a corresponding entry in <filename>/etc/"
@@ -5358,7 +5941,7 @@
 "the groups for the named <emphasis remap=\"I\">user</emphasis>."
 msgstr ""
 
-#: groups.1.xml:37(para)
+#: groups.1.xml:66(para)
 msgid ""
 "Systems which do not support concurrent group sets will have the information "
 "from <filename>/etc/group</filename> reported. The user must use "
@@ -5366,7 +5949,7 @@
 "real and effective group ID."
 msgstr ""
 
-#: groups.1.xml:59(para)
+#: groups.1.xml:88(para)
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>getgid</"
@@ -5382,32 +5965,32 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>getuid</"
 "refentrytitle><manvolnum>2</manvolnum></citerefentry>."
 
-#: groupmod.8.xml:15(refpurpose)
+#: groupmod.8.xml:44(refpurpose)
 msgid "modify a group definition on the system"
 msgstr "ändra en gruppdefinition på systemet"
 
-#: groupmod.8.xml:24(replaceable)
+#: groupmod.8.xml:53(replaceable)
 msgid "GROUP"
 msgstr "GRUPP"
 
-#: groupmod.8.xml:30(para)
+#: groupmod.8.xml:59(para)
 msgid ""
 "The <command>groupmod</command> command modifies the definition of the "
 "specified <replaceable>GROUP</replaceable> by modifying the appropriate "
 "entry in the group database."
 msgstr ""
 
-#: groupmod.8.xml:39(para)
+#: groupmod.8.xml:68(para)
 msgid "The options which apply to the <command>groupmod</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>groupmod</command> är:"
 
-#: groupmod.8.xml:45(term) groupadd.8.xml:66(term)
+#: groupmod.8.xml:74(term) groupadd.8.xml:92(term)
 msgid ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 
-#: groupmod.8.xml:49(para)
+#: groupmod.8.xml:78(para)
 msgid ""
 "The group ID of the given <replaceable>GROUP</replaceable> will be changed "
 "to <replaceable>GID</replaceable>. The value of <replaceable>GID</"
@@ -5418,7 +6001,7 @@
 "must have their group ID changed manually."
 msgstr ""
 
-#: groupmod.8.xml:70(term)
+#: groupmod.8.xml:99(term)
 msgid ""
 "<option>-n</option>, <option>--new-name</option><replaceable>NEW_GROUP</"
 "replaceable>"
@@ -5426,13 +6009,13 @@
 "<option>-n</option>, <option>--new-name</option><replaceable>NY_GRUPP</"
 "replaceable>"
 
-#: groupmod.8.xml:75(para)
+#: groupmod.8.xml:104(para)
 msgid ""
 "The name of the group will be changed from <replaceable>GROUP</replaceable> "
 "to <replaceable>NEW_GROUP</replaceable> name."
 msgstr ""
 
-#: groupmod.8.xml:86(para)
+#: groupmod.8.xml:115(para)
 #, fuzzy
 msgid ""
 "When used with the <option>-g</option> option, allow to change the group "
@@ -5440,7 +6023,7 @@
 msgstr ""
 "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 
-#: groupmod.8.xml:98(para) groupadd.8.xml:122(para)
+#: groupmod.8.xml:127(para) groupadd.8.xml:148(para)
 #, fuzzy
 #| msgid ""
 #| "The encrypted password, as returned by "
@@ -5455,11 +6038,11 @@
 "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum></"
 "citerefentry>."
 
-#: groupmod.8.xml:176(para)
+#: groupmod.8.xml:205(para)
 msgid "group name already in use"
 msgstr "gruppnamnet används redan"
 
-#: groupmod.8.xml:140(para)
+#: groupmod.8.xml:169(para)
 msgid ""
 "The <command>groupmod</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -5467,7 +6050,7 @@
 "Kommandot <command>groupmod</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: groupmod.8.xml:191(para)
+#: groupmod.8.xml:220(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -5499,32 +6082,35 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>."
 
-#: groupmems.8.xml:15(refpurpose)
+#: groupmems.8.xml:44(refpurpose)
 msgid "administer members of a user's primary group"
 msgstr "administrera medlemmar av en användares primära grupp"
 
-#: groupmems.8.xml:22(replaceable) groupmems.8.xml:23(replaceable)
-#: groupmems.8.xml:53(replaceable) groupmems.8.xml:59(replaceable)
+#: groupmems.8.xml:51(replaceable) groupmems.8.xml:52(replaceable)
 msgid "user_name"
 msgstr "användarnamn"
 
-#: groupmems.8.xml:22(arg)
+#: groupmems.8.xml:51(arg)
 msgid "-a <placeholder-1/>"
 msgstr "-a <placeholder-1/>"
 
-#: groupmems.8.xml:23(arg)
+#: groupmems.8.xml:52(arg)
 msgid "-d <placeholder-1/>"
 msgstr "-d <placeholder-1/>"
 
-#: groupmems.8.xml:25(replaceable) groupmems.8.xml:71(replaceable)
+#: groupmems.8.xml:53(replaceable)
 msgid "group_name"
 msgstr "gruppnamn"
 
-#: groupmems.8.xml:25(arg) groupadd.8.xml:24(arg)
+#: groupmems.8.xml:53(arg)
 msgid "-g <placeholder-1/>"
 msgstr "-g <placeholder-1/>"
 
-#: groupmems.8.xml:32(para)
+#: groupmems.8.xml:54(arg)
+msgid "-l"
+msgstr "-l"
+
+#: groupmems.8.xml:61(para)
 msgid ""
 "The <command>groupmems</command> command allows a user to administer his/her "
 "own group membership list without the requirement of superuser privileges. "
@@ -5532,7 +6118,7 @@
 "users to be in their own name sake primary group (i.e., guest / guest)."
 msgstr ""
 
-#: groupmems.8.xml:40(para)
+#: groupmems.8.xml:69(para)
 #, fuzzy
 msgid ""
 "Only the superuser, as administrator, can use <command>groupmems</command> "
@@ -5541,49 +6127,94 @@
 "Endast superanvändaren, som administratör, kan använda <command>groupmems</"
 "command> för att göra ändringar i medlemskap för andra grupper."
 
-#: groupmems.8.xml:47(para)
+#: groupmems.8.xml:76(para)
 msgid ""
 "The options which apply to the <command>groupmems</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>groupmems</command> är:"
 
-#: groupmems.8.xml:53(option) gpasswd.1.xml:94(option)
-msgid "-a"
-msgstr "-a"
+#: groupmems.8.xml:82(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+msgid ""
+"<option>-a</option>, <option>--add</option><replaceable>user_name</"
+"replaceable>"
+msgstr ""
+"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 
-#: groupmems.8.xml:55(para)
-msgid "Add a new user to the group membership list."
+#: groupmems.8.xml:84(para)
+#, fuzzy
+#| msgid "Add a new user to the group membership list."
+msgid "Add an user to the group membership list."
 msgstr "Lägg till en ny användare till gruppens medlemslista."
 
-#: groupmems.8.xml:59(option) gpasswd.1.xml:107(option)
-msgid "-d"
-msgstr "-d"
+#: groupmems.8.xml:85(para) groupmems.8.xml:101(para)
+#: groupmems.8.xml:126(para)
+msgid ""
+"If the <filename>/etc/gshadow</filename> file exist, and the group has no "
+"entry in the <filename>/etc/gshadow</filename> file, a new entry will be "
+"created."
+msgstr ""
 
-#: groupmems.8.xml:61(para)
+#: groupmems.8.xml:93(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-d</option>, <option>--delete</option><replaceable>user_name</"
+"replaceable>"
+msgstr ""
+"<option>-t</option>, <option>--time</option><replaceable>DAGAR</replaceable>"
+
+#: groupmems.8.xml:95(para)
 msgid "Delete a user from the group membership list."
 msgstr "Ta bort en användare från gruppen medlemslista."
 
-#: groupmems.8.xml:67(para)
-msgid "Purge all users from the group membership list."
-msgstr "Rensa alla användare från gruppens medlemslista."
+#: groupmems.8.xml:96(para)
+msgid ""
+"If the <filename>/etc/gshadow</filename> file exist, the user will be "
+"removed from the list of members and administrators of the group."
+msgstr ""
 
-#: groupmems.8.xml:71(option)
-msgid "-g"
-msgstr "-g"
+#: groupmems.8.xml:109(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
+msgid ""
+"<option>-g</option>, <option>--group</option><replaceable>group_name</"
+"replaceable>"
+msgstr ""
+"<option>-g</option>, <option>--gid</option><replaceable>GID</replaceable>"
 
-#: groupmems.8.xml:73(para)
+#: groupmems.8.xml:111(para)
 #, fuzzy
 msgid "The superuser can specify which group membership list to modify."
 msgstr "Superanvändaren kan ange vilken grupps medlemslista som ska ändras."
 
-#: groupmems.8.xml:81(para)
+#: groupmems.8.xml:117(term) chage.1.xml:128(term)
+msgid "<option>-l</option>, <option>--list</option>"
+msgstr "<option>-l</option>, <option>--list</option>"
+
+#: groupmems.8.xml:119(para)
 msgid "List the group membership list."
 msgstr "Lista gruppens medlemslista."
 
-#: groupmems.8.xml:88(title)
+#: groupmems.8.xml:123(term)
+#, fuzzy
+#| msgid "<option>-e</option>, <option>--expire</option>"
+msgid "<option>-p</option>, <option>--purge</option>"
+msgstr "<option>-e</option>, <option>--expire</option>"
+
+#: groupmems.8.xml:125(para)
+msgid "Purge all users from the group membership list."
+msgstr "Rensa alla användare från gruppens medlemslista."
+
+#: groupmems.8.xml:137(title)
 msgid "SETUP"
 msgstr ""
 
-#: groupmems.8.xml:89(para)
+#: groupmems.8.xml:138(para)
 msgid ""
 "The <command>groupmems</command> executable should be in mode <literal>2770</"
 "literal> as user <emphasis>root</emphasis> and in group <emphasis>groups</"
@@ -5592,7 +6223,7 @@
 "utility to manage their own group membership list."
 msgstr ""
 
-#: groupmems.8.xml:98(programlisting)
+#: groupmems.8.xml:147(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -5609,11 +6240,11 @@
 "\t$ groupmems -g groups -a gk4\n"
 "    "
 
-#: groupmems.8.xml:130(para)
+#: groupmems.8.xml:179(para)
 msgid "secure group account information"
 msgstr "säker gruppkontoinformation"
 
-#: groupmems.8.xml:138(para)
+#: groupmems.8.xml:187(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -5641,24 +6272,24 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: groupdel.8.xml:15(refpurpose)
+#: groupdel.8.xml:44(refpurpose)
 msgid "delete a group"
 msgstr "ta bort en grupp"
 
-#: groupdel.8.xml:29(para)
+#: groupdel.8.xml:58(para)
 msgid ""
 "The <command>groupdel</command> command modifies the system account files, "
 "deleting all entries that refer to <emphasis remap=\"I\">group</emphasis>. "
 "The named group must exist."
 msgstr ""
 
-#: groupdel.8.xml:34(para)
+#: groupdel.8.xml:63(para)
 msgid ""
 "You must manually check all file systems to insure that no files remain with "
 "the named group as the file group ID."
 msgstr ""
 
-#: groupdel.8.xml:41(para)
+#: groupdel.8.xml:70(para)
 msgid ""
 "You may not remove the primary group of any existing user. You must remove "
 "the user before you remove the group."
@@ -5666,11 +6297,11 @@
 "Du får inte ta bort den primära gruppen för någon existerande användare. Du "
 "måste ta bort användaren innan du tar bort gruppen."
 
-#: groupdel.8.xml:102(para)
+#: groupdel.8.xml:131(para)
 msgid "can't remove user's primary group"
 msgstr "kan inte ta bort användarens primära grupp"
 
-#: groupdel.8.xml:78(para)
+#: groupdel.8.xml:107(para)
 msgid ""
 "The <command>groupdel</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -5678,7 +6309,7 @@
 "Kommandot <command>groupdel</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: groupdel.8.xml:117(para)
+#: groupdel.8.xml:146(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -5710,42 +6341,22 @@
 "<citerefentry><refentrytitle>usermod</refentrytitle><manvolnum>8</"
 "manvolnum></citerefentry>"
 
-#: groupadd.8.xml:17(refpurpose)
+#: groupadd.8.xml:48(refpurpose)
 msgid "create a new group"
 msgstr "skapa en ny grupp"
 
-#: groupadd.8.xml:24(replaceable)
-msgid "GID"
-msgstr "GID"
-
-#: groupadd.8.xml:25(arg)
-msgid "-o"
-msgstr "-o"
-
-#: groupadd.8.xml:28(replaceable)
-msgid "KEY"
-msgstr "NYCKEL"
-
-#: groupadd.8.xml:28(replaceable)
-msgid "VALUE"
-msgstr "VÄRDE"
-
-#: groupadd.8.xml:28(arg)
-msgid "-K <placeholder-1/>=<placeholder-2/>"
-msgstr "-K <placeholder-1/>=<placeholder-2/>"
-
-#: groupadd.8.xml:37(para)
+#: groupadd.8.xml:63(para)
 msgid ""
 "The <command>groupadd</command> command creates a new group account using "
 "the values specified on the command line plus the default values from the "
 "system. The new group will be entered into the system files as needed."
 msgstr ""
 
-#: groupadd.8.xml:46(para)
+#: groupadd.8.xml:72(para)
 msgid "The options which apply to the <command>groupadd</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>groupadd</command> är:"
 
-#: groupadd.8.xml:56(para)
+#: groupadd.8.xml:82(para)
 msgid ""
 "This option causes the command to simply exit with success status if the "
 "specified group already exists. When used with <option>-g</option>, and the "
@@ -5753,7 +6364,7 @@
 "g</option> is turned off)."
 msgstr ""
 
-#: groupadd.8.xml:70(para)
+#: groupadd.8.xml:96(para)
 msgid ""
 "The numerical value of the group's ID. This value must be unique, unless the "
 "<option>-o</option> option is used. The value must be non-negative. The "
@@ -5762,7 +6373,7 @@
 "system accounts."
 msgstr ""
 
-#: groupadd.8.xml:90(para)
+#: groupadd.8.xml:116(para)
 msgid ""
 "Overrides <filename>/etc/login.defs</filename> defaults (GID_MIN, GID_MAX "
 "and others). Multiple <option>-K</option> options can be specified."
@@ -5770,7 +6381,7 @@
 "Åsidosätter standardvärden i <filename>/etc/login.defs</filename> (GID_MIN, "
 "GID_MAX och andra). Flera flaggor av <option>-K</option> kan anges."
 
-#: groupadd.8.xml:95(para)
+#: groupadd.8.xml:121(para)
 msgid ""
 "Example: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>100</replaceable><option> -K </"
@@ -5780,7 +6391,7 @@
 "replaceable>=<replaceable>100</replaceable><option> -K </"
 "option><replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>"
 
-#: groupadd.8.xml:99(para)
+#: groupadd.8.xml:125(para)
 msgid ""
 "Note: <option>-K </option><replaceable>GID_MIN</"
 "replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</"
@@ -5790,18 +6401,18 @@
 "replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</"
 "replaceable>=<replaceable>499</replaceable> fungerar ännu inte."
 
-#: groupadd.8.xml:111(para)
+#: groupadd.8.xml:137(para)
 #, fuzzy
 msgid "This option permits to add a group with a non-unique GID."
 msgstr "Denna flagga tillåter att en grupp med ett icke-unikt GID läggs till."
 
-#: groupadd.8.xml:134(para)
+#: groupadd.8.xml:160(para)
 #, fuzzy
 #| msgid "create a new group"
 msgid "Create a system group."
 msgstr "skapa en ny grupp"
 
-#: groupadd.8.xml:137(para)
+#: groupadd.8.xml:163(para)
 msgid ""
 "The numeric identifiers of new system groups are choosen in the "
 "<option>SYS_GID_MIN</option>-<option>SYS_GID_MAX</option> range, defined in "
@@ -5809,18 +6420,26 @@
 "<option>GID_MAX</option>."
 msgstr ""
 
-#: groupadd.8.xml:188(para)
+#: groupadd.8.xml:214(para)
+#, fuzzy
+#| msgid ""
+#| "Usernames must begin with a lower case letter or an underscore, and only "
+#| "lower case letters, underscores, dashes, and dollar signs may follow. In "
+#| "regular expression terms: [a-z_][a-z0-9_-]*[$]"
 msgid ""
 "Groupnames must begin with a lower case letter or an underscore, and only "
 "lower case letters, underscores, dashes, and dollar signs may follow. In "
-"regular expression terms: [a-z_][a-z0-9_-]*[$]"
+"regular expression terms: [a-z_][a-z0-9_-]*[$]?"
 msgstr ""
+"Användarnamn måste börja med en gemen bokstav eller ett understreck och får "
+"endast innehålla gemener, understreck, minustecken och på slutet ett dollar-"
+"tecken. I reguljära uttryckstermer: [a-z_][a-z0-9_-]*[$]"
 
-#: groupadd.8.xml:193(para)
-msgid "Groupnames may only be up to 16 characters long."
+#: groupadd.8.xml:219(para)
+msgid "Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long."
 msgstr ""
 
-#: groupadd.8.xml:196(para)
+#: groupadd.8.xml:222(para)
 #, fuzzy
 msgid ""
 "You may not add a NIS or LDAP group. This must be performed on the "
@@ -5829,21 +6448,21 @@
 "Du får inte lägga till en användare till en NIS-grupp. Detta måste "
 "genomföras på NIS-servern."
 
-#: groupadd.8.xml:200(para)
+#: groupadd.8.xml:226(para)
 msgid ""
 "If the groupname already exists in an external group database such as NIS or "
 "LDAP, <command>groupadd</command> will deny the group creation request."
 msgstr ""
 
-#: groupadd.8.xml:233(para)
+#: groupadd.8.xml:259(para)
 msgid "GID not unique (when <option>-o</option> not used)"
 msgstr "GID inte unikt (när <option>-o</option> inte används)"
 
-#: groupadd.8.xml:239(para)
+#: groupadd.8.xml:265(para)
 msgid "group name not unique"
 msgstr "gruppnamn inte unikt"
 
-#: groupadd.8.xml:209(para)
+#: groupadd.8.xml:235(para)
 msgid ""
 "The <command>groupadd</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -5851,7 +6470,7 @@
 "Kommandot <command>groupadd</command> avslutas med följande värden: "
 "<placeholder-1/>"
 
-#: groupadd.8.xml:254(para)
+#: groupadd.8.xml:280(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>chsh</"
@@ -5885,26 +6504,26 @@
 "manvolnum></citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: gpasswd.1.xml:21(phrase)
+#: gpasswd.1.xml:50(phrase)
 #, fuzzy
 msgid "and <placeholder-1/> files"
 msgstr "-a <placeholder-1/>"
 
-#: gpasswd.1.xml:23(phrase)
+#: gpasswd.1.xml:52(phrase)
 msgid "file"
 msgstr ""
 
-#: gpasswd.1.xml:19(refpurpose)
+#: gpasswd.1.xml:48(refpurpose)
 #, fuzzy
 msgid "administer the <placeholder-1/><placeholder-2/><placeholder-3/>"
 msgstr "-K <placeholder-1/>=<placeholder-2/>"
 
-#: gpasswd.1.xml:31(replaceable)
+#: gpasswd.1.xml:60(replaceable)
 #, fuzzy
 msgid "option"
 msgstr "flaggor"
 
-#: gpasswd.1.xml:41(para)
+#: gpasswd.1.xml:70(para)
 msgid ""
 "The <command>gpasswd</command> command is used to administer <filename>/etc/"
 "group</filename><phrase condition=\"gshadow\">, and <filename>/etc/gshadow</"
@@ -5912,14 +6531,14 @@
 "\">administrators,</phrase> members and a password."
 msgstr ""
 
-#: gpasswd.1.xml:49(para)
+#: gpasswd.1.xml:78(para)
 msgid ""
 "System administrator can use the <option>-A</option> option to define group "
 "administrator(s) and the <option>-M</option> option to define members and "
 "has all rights of group administrators and members."
 msgstr ""
 
-#: gpasswd.1.xml:54(para)
+#: gpasswd.1.xml:83(para)
 msgid ""
 "<command>gpasswd</command> called by <phrase condition=\"gshadow\">a group "
 "administrator</phrase><phrase condition=\"no_gshadow\">a system "
@@ -5927,7 +6546,7 @@
 "of the <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:61(para)
+#: gpasswd.1.xml:90(para)
 #, fuzzy
 msgid ""
 "If a password is set the members can still "
@@ -5938,18 +6557,18 @@
 "refentrytitle><manvolnum>3</manvolnum></citerefentry> för detaljer om hur "
 "denna sträng tolkas."
 
-#: gpasswd.1.xml:69(title)
+#: gpasswd.1.xml:98(title)
 msgid "Notes about group passwords"
 msgstr "Noteringar angående grupplösenord"
 
-#: gpasswd.1.xml:70(para)
+#: gpasswd.1.xml:99(para)
 msgid ""
 "Group passwords are an inherent security problem since more than one person "
 "is permitted to know the password. However, groups are a useful tool for "
 "permitting co-operation between different users."
 msgstr ""
 
-#: gpasswd.1.xml:81(para)
+#: gpasswd.1.xml:110(para)
 #, fuzzy
 msgid ""
 "Except for the <option>-A</option> and <option>-M</option> options, the "
@@ -5958,69 +6577,107 @@
 "Flaggorna <option>-r</option>, <option>-h</option> och <option>-f</option> "
 "används endast när <command>login</command> har startats av root."
 
-#: gpasswd.1.xml:85(para)
+#: gpasswd.1.xml:114(para)
 msgid "The options cannot be combined."
 msgstr ""
 
-#: gpasswd.1.xml:88(para)
+#: gpasswd.1.xml:117(para)
 #, fuzzy
 msgid "The options which apply to the <command>gpasswd</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>passwd</command> är:"
 
-#: gpasswd.1.xml:97(para)
+#: gpasswd.1.xml:122(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
 msgid ""
+"<option>-a</option>, <option>--add</option><replaceable>user</replaceable>"
+msgstr ""
+"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+
+#: gpasswd.1.xml:126(para)
+msgid ""
 "Add the <replaceable>user</replaceable> to the named <replaceable>group</"
 "replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:110(para)
+#: gpasswd.1.xml:135(term)
+#, fuzzy
+#| msgid ""
+#| "<option>-t</option>, <option>--time</option><replaceable>DAYS</"
+#| "replaceable>"
 msgid ""
+"<option>-d</option>, <option>--delete</option><replaceable>user</replaceable>"
+msgstr ""
+"<option>-t</option>, <option>--time</option><replaceable>DAGAR</replaceable>"
+
+#: gpasswd.1.xml:139(para)
+msgid ""
 "Remove the <replaceable>user</replaceable> from the named "
 "<replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:123(para)
+#: gpasswd.1.xml:148(term)
+#, fuzzy
+#| msgid "<option>-r</option>, <option>--remove</option>"
+msgid "<option>-r</option>, <option>--remove-password</option>"
+msgstr "<option>-r</option>, <option>--remove</option>"
+
+#: gpasswd.1.xml:152(para)
 msgid ""
 "Remove the password from the named <replaceable>group</replaceable>. Only "
 "group members will be allowed to use <command>newgrp</command> to join the "
 "named <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:135(option)
+#: gpasswd.1.xml:163(term)
 #, fuzzy
-msgid "-R"
-msgstr "-"
+#| msgid "<option>-r</option>, <option>--reset</option>"
+msgid "<option>-R</option>, <option>--restrict</option>"
+msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: gpasswd.1.xml:138(para)
+#: gpasswd.1.xml:167(para)
 msgid ""
 "Restrict the access to the named <replaceable>group</replaceable>. Only "
 "group members will be allowed to use <command>newgrp</command> to join the "
 "named <replaceable>group</replaceable>."
 msgstr ""
 
-#: gpasswd.1.xml:149(term)
+#: gpasswd.1.xml:178(term)
 #, fuzzy
-msgid "<option>-A</option><replaceable>user</replaceable>,..."
+#| msgid ""
+#| "<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-A</option>, <option>--administrators</option><replaceable>user</"
+"replaceable>,..."
 msgstr ""
-"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+"<option>-m</option>, <option>--mindays</option><replaceable>MIN_DAGAR</"
+"replaceable>"
 
-#: gpasswd.1.xml:153(para)
+#: gpasswd.1.xml:182(para)
 #, fuzzy
 msgid "Set the list of administrative users."
 msgstr "kommaseparerad lista med gruppadministratörer"
 
-#: gpasswd.1.xml:161(term)
+#: gpasswd.1.xml:190(term)
 #, fuzzy
-msgid "<option>-M</option><replaceable>user</replaceable>,..."
+#| msgid ""
+#| "<option>-b</option>, <option>--before</option><replaceable>DAYS</"
+#| "replaceable>"
+msgid ""
+"<option>-M</option>, <option>--members</option><replaceable>user</"
+"replaceable>,..."
 msgstr ""
-"<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+"<option>-b</option>, <option>--before</option><replaceable>DAGAR</"
+"replaceable>"
 
-#: gpasswd.1.xml:165(para)
+#: gpasswd.1.xml:194(para)
 #, fuzzy
 msgid "Set the list of group members."
 msgstr "kommaseparerad lista med gruppmedlemmar"
 
-#: gpasswd.1.xml:175(para)
+#: gpasswd.1.xml:204(para)
 msgid ""
 "This tool only operates on the <filename>/etc/group</filename><phrase "
 "condition=\"gshadow\"> and <filename>/etc/gshadow</filename> files.</"
@@ -6029,7 +6686,7 @@
 "server."
 msgstr ""
 
-#: gpasswd.1.xml:220(para)
+#: gpasswd.1.xml:249(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum></"
@@ -6056,17 +6713,17 @@
 "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: faillog.8.xml:5(refentrytitle) faillog.8.xml:10(refname)
-#: faillog.8.xml:16(command) faillog.5.xml:5(refentrytitle)
-#: faillog.5.xml:10(refname) faillog.5.xml:53(refentrytitle)
+#: faillog.8.xml:34(refentrytitle) faillog.8.xml:39(refname)
+#: faillog.8.xml:45(command) faillog.5.xml:34(refentrytitle)
+#: faillog.5.xml:39(refname) faillog.5.xml:82(refentrytitle)
 msgid "faillog"
 msgstr "faillog"
 
-#: faillog.8.xml:11(refpurpose)
+#: faillog.8.xml:40(refpurpose)
 msgid "display faillog records or set login failure limits"
 msgstr ""
 
-#: faillog.8.xml:25(para)
+#: faillog.8.xml:54(para)
 msgid ""
 "<command>faillog</command> formats the contents of the failure log from "
 "<filename>/var/log/faillog</filename> database. It also can be used for "
@@ -6075,15 +6732,17 @@
 "had a login failure."
 msgstr ""
 
-#: faillog.8.xml:36(para)
+#: faillog.8.xml:65(para)
 msgid "The options which apply to the <command>faillog</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>faillog</command> är:"
 
-#: faillog.8.xml:44(para)
-msgid "Display faillog records for all users."
+#: faillog.8.xml:73(para)
+msgid ""
+"Display (or act on) faillog records for all users having an entry in the "
+"<filename>faillog</filename> database."
 msgstr ""
 
-#: faillog.8.xml:54(term)
+#: faillog.8.xml:86(term)
 msgid ""
 "<option>-l</option>, <option>--lock-time</option><replaceable>SEC</"
 "replaceable>"
@@ -6091,61 +6750,90 @@
 "<option>-l</option>, <option>--lock-time</option><replaceable>SEK</"
 "replaceable>"
 
-#: faillog.8.xml:59(para)
+#: faillog.8.xml:91(para)
 msgid ""
 "Lock account to <replaceable>SEC</replaceable> seconds after failed login."
 msgstr ""
 "Lås kontot <replaceable>SEK</replaceable> sekunder efter misslyckad "
 "inloggning."
 
-#: faillog.8.xml:66(term)
+#: faillog.8.xml:95(para) faillog.8.xml:121(para) faillog.8.xml:135(para)
 msgid ""
+"Write access to <filename>/var/log/faillog</filename> is required for this "
+"option."
+msgstr ""
+
+#: faillog.8.xml:102(term)
+msgid ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 msgstr ""
 "<option>-m</option>, <option>--maximum</option><replaceable>MAX</replaceable>"
 
-#: faillog.8.xml:71(para)
+#: faillog.8.xml:107(para)
 msgid ""
 "Set maximum number of login failures after the account is disabled to "
-"<replaceable>MAX</replaceable>. Selecting <replaceable>MAX</replaceable> "
-"value of 0 has the effect of not placing a limit on the number of failed "
-"logins. The maximum failure count should always be 0 for <emphasis>root</"
-"emphasis> to prevent a denial of services attack against the system."
+"<replaceable>MAX</replaceable>."
 msgstr ""
 
-#: faillog.8.xml:82(term)
+#: faillog.8.xml:111(para)
+msgid ""
+"Selecting a <replaceable>MAX</replaceable> value of 0 has the effect of not "
+"placing a limit on the number of failed logins."
+msgstr ""
+
+#: faillog.8.xml:116(para)
+msgid ""
+"The maximum failure count should always be 0 for <emphasis>root</emphasis> "
+"to prevent a denial of services attack against the system."
+msgstr ""
+
+#: faillog.8.xml:128(term)
 msgid "<option>-r</option>, <option>--reset</option>"
 msgstr "<option>-r</option>, <option>--reset</option>"
 
-#: faillog.8.xml:84(para)
+#: faillog.8.xml:130(para)
 msgid ""
 "Reset the counters of login failures or one record if used with the <option>-"
-"u</option><replaceable>LOGIN</replaceable> option. Write access to "
-"<filename>/var/log/faillog</filename> is required for this option."
+"u</option><replaceable>LOGIN</replaceable> option."
 msgstr ""
 
-#: faillog.8.xml:97(para)
+#: faillog.8.xml:146(para)
 msgid ""
-"Display faillog records more recent than <replaceable>DAYS</replaceable>. "
-"The <option>-t</option> flag overrides the use of <option>-u</option>."
+"Display faillog records more recent than <replaceable>DAYS</replaceable>."
 msgstr ""
 
-#: faillog.8.xml:105(term)
+#: faillog.8.xml:158(para)
 msgid ""
-"<option>-u</option>, <option>--user</option><replaceable>LOGIN</replaceable>"
+"Display faillog record or maintains failure counters and limits (if used "
+"with <option>-l</option>, <option>-m</option> or <option>-r</option> "
+"options) only for the specified user(s)."
 msgstr ""
-"<option>-u</option>, <option>--user</option><replaceable>INLOGGNINGSNAMN</"
-"replaceable>"
 
-#: faillog.8.xml:109(para)
+#: faillog.8.xml:176(para)
+#, fuzzy
+#| msgid ""
+#| "The <option>-r</option>, <option>-h</option> and <option>-f</option> "
+#| "options are only used when <command>login</command> is invoked by root."
 msgid ""
-"Display faillog record or maintains failure counters and limits (if used "
-"with <option>-l</option>, <option>-m</option> or <option>-r</option> "
-"options) only for user with <replaceable>LOGIN</replaceable>."
+"When none of the <option>-l</option>, <option>-m</option>, or <option>-r</"
+"option> options are used, <command>faillog</command> displays the faillog "
+"record of the specified user(s)."
 msgstr ""
+"Flaggorna <option>-r</option>, <option>-h</option> och <option>-f</option> "
+"används endast när <command>login</command> har startats av root."
 
-#: faillog.8.xml:122(para)
+#: faillog.8.xml:181(para)
 msgid ""
+"NOTE: in display mode, only the records of users which currently exist in "
+"the system are displayed. In the other modes (when the <option>-l</option>, "
+"<option>-m</option>, or <option>-r</option> options are used), the records "
+"of the user, or the range of users, or all the users that may have an entry "
+"in the faillog database will be changed. This is useful to reset records of "
+"users that have been deleted or set a policy in advance for a range of users."
+msgstr ""
+
+#: faillog.8.xml:194(para)
+msgid ""
 "<command>faillog</command> only prints out users with no successful login "
 "since the last failure. To print out a user who has had a successful login "
 "since their last failure, you must explicitly request the user with the "
@@ -6153,15 +6841,15 @@
 "option> flag."
 msgstr ""
 
-#: faillog.8.xml:135(filename) faillog.5.xml:41(filename)
+#: faillog.8.xml:207(filename) faillog.5.xml:70(filename)
 msgid "/var/log/faillog"
 msgstr "/var/log/faillog"
 
-#: faillog.8.xml:137(para) faillog.5.xml:43(para)
+#: faillog.8.xml:209(para) faillog.5.xml:72(para)
 msgid "Failure logging file."
 msgstr ""
 
-#: faillog.8.xml:145(para)
+#: faillog.8.xml:217(para)
 msgid ""
 "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
@@ -6171,11 +6859,11 @@
 "citerefentry>, <citerefentry><refentrytitle>faillog</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: faillog.5.xml:11(refpurpose)
+#: faillog.5.xml:40(refpurpose)
 msgid "login failure logging file"
 msgstr ""
 
-#: faillog.5.xml:16(para)
+#: faillog.5.xml:45(para)
 msgid ""
 "<filename>/var/log/faillog</filename> maintains a count of login failures "
 "and the limits for each account. The file is fixed length record, indexed by "
@@ -6186,11 +6874,11 @@
 "locked after a failure."
 msgstr ""
 
-#: faillog.5.xml:26(para)
+#: faillog.5.xml:55(para)
 msgid "The structure of the file is:"
 msgstr "Strukturen för filen är:"
 
-#: faillog.5.xml:27(programlisting)
+#: faillog.5.xml:56(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -6211,23 +6899,23 @@
 "\tlong    fail_locktime;\n"
 "};"
 
-#: expiry.1.xml:11(refentrytitle) expiry.1.xml:16(refname)
-#: expiry.1.xml:22(command)
+#: expiry.1.xml:41(refentrytitle) expiry.1.xml:46(refname)
+#: expiry.1.xml:52(command)
 msgid "expiry"
 msgstr "expiry"
 
-#: expiry.1.xml:17(refpurpose)
+#: expiry.1.xml:47(refpurpose)
 msgid "check and enforce password expiration policy"
 msgstr "kontrollera och upprätthåll policy för lösenordsutgång"
 
-#: expiry.1.xml:30(para)
+#: expiry.1.xml:60(para)
 msgid ""
 "The <command>expiry</command> command checks (<option>-c</option>) the "
 "current password expiration and forces (<option>-f</option>) changes when "
 "required. It is callable as a normal user command."
 msgstr ""
 
-#: expiry.1.xml:57(para) chage.1.xml:233(para)
+#: expiry.1.xml:87(para) chage.1.xml:262(para)
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
@@ -6237,11 +6925,11 @@
 "citerefentry>, <citerefentry><refentrytitle>shadow</"
 "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
 
-#: chsh.1.xml:17(refpurpose)
+#: chsh.1.xml:46(refpurpose)
 msgid "change login shell"
 msgstr "ändra inloggningsskal"
 
-#: chsh.1.xml:34(para)
+#: chsh.1.xml:63(para)
 msgid ""
 "The <command>chsh</command> command changes the user login shell. This "
 "determines the name of the user's initial login command. A normal user may "
@@ -6249,11 +6937,11 @@
 "the login shell for any account."
 msgstr ""
 
-#: chsh.1.xml:45(para)
+#: chsh.1.xml:74(para)
 msgid "The options which apply to the <command>chsh</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>chsh</command> är:"
 
-#: chsh.1.xml:67(para)
+#: chsh.1.xml:96(para)
 msgid ""
 "If the <option>-s</option> option is not selected, <command>chsh</command> "
 "operates in an interactive fashion, prompting the user with the current "
@@ -6262,7 +6950,7 @@
 "of <emphasis>[ ]</emphasis> marks."
 msgstr ""
 
-#: chsh.1.xml:78(para)
+#: chsh.1.xml:107(para)
 msgid ""
 "The only restriction placed on the login shell is that the command name must "
 "be listed in <filename>/etc/shells</filename>, unless the invoker is the "
@@ -6273,15 +6961,15 @@
 "the user from ever changing her login shell back to its original value."
 msgstr ""
 
-#: chsh.1.xml:113(filename)
+#: chsh.1.xml:142(filename)
 msgid "/etc/shells"
 msgstr "/etc/shells"
 
-#: chsh.1.xml:115(para)
+#: chsh.1.xml:144(para)
 msgid "List of valid login shells."
 msgstr "Lista på giltiga inloggningsskal."
 
-#: chsh.1.xml:129(para)
+#: chsh.1.xml:158(para)
 msgid ""
 "<citerefentry><refentrytitle>chfn</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -6295,11 +6983,11 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chpasswd.8.xml:18(refpurpose)
+#: chpasswd.8.xml:47(refpurpose)
 msgid "update passwords in batch mode"
 msgstr "uppdatera lösenord i satsläge"
 
-#: chpasswd.8.xml:32(para)
+#: chpasswd.8.xml:61(para)
 #, fuzzy
 msgid ""
 "The <command>chpasswd</command> command reads a list of user name and "
@@ -6310,7 +6998,7 @@
 "från standard in och använder denna information för att uppdatera en "
 "uppsättning redan existerande grupper. Varje rad är i formatet:"
 
-#: chpasswd.8.xml:37(para)
+#: chpasswd.8.xml:66(para)
 msgid ""
 "<emphasis remap=\"I\">user_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -6318,7 +7006,7 @@
 "<emphasis remap=\"I\">användarnamn</emphasis>:<emphasis remap=\"I"
 "\">lösenord</emphasis>"
 
-#: chpasswd.8.xml:41(para)
+#: chpasswd.8.xml:70(para)
 #, fuzzy
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
@@ -6328,7 +7016,7 @@
 "Som standard måste det insända lösenordet vara i klartext. "
 "Standardkrypteringsalgoritmen är DES."
 
-#: chpasswd.8.xml:46(para) chgpasswd.8.xml:46(para)
+#: chpasswd.8.xml:75(para) chgpasswd.8.xml:75(para)
 msgid ""
 "The default encryption algorithm can be defined for the system with the "
 "ENCRYPT_METHOD variable of <filename>/etc/login.defs</filename>, and can be "
@@ -6336,29 +7024,33 @@
 "option> options."
 msgstr ""
 
-#: chpasswd.8.xml:52(para) chgpasswd.8.xml:52(para)
+#: chpasswd.8.xml:81(para) chgpasswd.8.xml:81(para)
 msgid ""
 "This command is intended to be used in a large system environment where many "
 "accounts are created at a single time."
 msgstr ""
 
-#: chpasswd.8.xml:60(para)
+#: chpasswd.8.xml:89(para)
 msgid "The options which apply to the <command>chpasswd</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>chpasswd</command> är:"
 
-#: chpasswd.8.xml:76(term) chgpasswd.8.xml:76(term)
+#: chpasswd.8.xml:98(para) chgpasswd.8.xml:98(para)
+msgid "The available methods are DES, MD5, and NONE."
+msgstr ""
+
+#: chpasswd.8.xml:108(term) chgpasswd.8.xml:108(term)
 msgid "<option>-e</option>, <option>--encrypted</option>"
 msgstr "<option>-e</option>, <option>--encrypted</option>"
 
-#: chpasswd.8.xml:78(para) chgpasswd.8.xml:78(para)
+#: chpasswd.8.xml:110(para) chgpasswd.8.xml:110(para)
 msgid "Supplied passwords are in encrypted form."
 msgstr "Insända lösenord är i ett krypterat format."
 
-#: chpasswd.8.xml:88(term) chgpasswd.8.xml:88(term)
+#: chpasswd.8.xml:120(term) chgpasswd.8.xml:120(term)
 msgid "<option>-m</option>, <option>--md5</option>"
 msgstr "<option>-m</option>, <option>--md5</option>"
 
-#: chpasswd.8.xml:90(para) chgpasswd.8.xml:90(para)
+#: chpasswd.8.xml:122(para) chgpasswd.8.xml:122(para)
 msgid ""
 "Use MD5 encryption instead of DES when the supplied passwords are not "
 "encrypted."
@@ -6366,7 +7058,7 @@
 "Använd MD5-kryptering istället för DES när insända lösenord inte är "
 "krypterade."
 
-#: chpasswd.8.xml:126(para) chgpasswd.8.xml:126(para)
+#: chpasswd.8.xml:158(para) chgpasswd.8.xml:158(para)
 msgid ""
 "Remember to set permissions or umask to prevent readability of unencrypted "
 "files by other users."
@@ -6374,7 +7066,7 @@
 "Kom ihåg att ställa in rättigheter eller umask för att förhindra läsning av "
 "okrypterade filer för andra användare."
 
-#: chpasswd.8.xml:178(para)
+#: chpasswd.8.xml:210(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum></"
@@ -6391,11 +7083,11 @@
 "citerefentry>, <citerefentry><refentrytitle>usermod</"
 "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
 
-#: chgpasswd.8.xml:19(refpurpose)
+#: chgpasswd.8.xml:48(refpurpose)
 msgid "update group passwords in batch mode"
 msgstr "uppdatera grupplösenord i satsläge"
 
-#: chgpasswd.8.xml:33(para)
+#: chgpasswd.8.xml:62(para)
 #, fuzzy
 msgid ""
 "The <command>chgpasswd</command> command reads a list of group name and "
@@ -6406,7 +7098,7 @@
 "från standard in och använder denna information för att uppdatera en "
 "uppsättning redan existerande grupper. Varje rad är i formatet:"
 
-#: chgpasswd.8.xml:38(para)
+#: chgpasswd.8.xml:67(para)
 msgid ""
 "<emphasis remap=\"I\">group_name</emphasis>:<emphasis remap=\"I\">password</"
 "emphasis>"
@@ -6414,7 +7106,7 @@
 "<emphasis remap=\"I\">gruppnamn</emphasis>:<emphasis remap=\"I\">lösenord</"
 "emphasis>"
 
-#: chgpasswd.8.xml:42(para)
+#: chgpasswd.8.xml:71(para)
 #, fuzzy
 msgid ""
 "By default the supplied password must be in clear-text, and is encrypted by "
@@ -6423,12 +7115,12 @@
 "Som standard måste det insända lösenordet vara i klartext. "
 "Standardkrypteringsalgoritmen är DES."
 
-#: chgpasswd.8.xml:60(para)
+#: chgpasswd.8.xml:89(para)
 msgid ""
 "The options which apply to the <command>chgpasswd</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>chgpasswd</command> är:"
 
-#: chgpasswd.8.xml:173(para)
+#: chgpasswd.8.xml:205(para)
 #, fuzzy
 msgid ""
 "<citerefentry><refentrytitle>gpasswd</refentrytitle><manvolnum>1</"
@@ -6443,39 +7135,43 @@
 "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chfn.1.xml:18(refpurpose)
+#: chfn.1.xml:47(refpurpose)
 msgid "change real user name and information"
 msgstr "ändra verkligt användarnamn och information"
 
-#: chfn.1.xml:24(replaceable)
+#: chfn.1.xml:53(replaceable)
 msgid "full_name"
 msgstr "fullständigt_namn"
 
-#: chfn.1.xml:25(replaceable)
+#: chfn.1.xml:53(arg)
+msgid "-f <placeholder-1/>"
+msgstr "-f <placeholder-1/>"
+
+#: chfn.1.xml:54(replaceable)
 msgid "room_no"
 msgstr "rumsnummer"
 
-#: chfn.1.xml:26(replaceable)
+#: chfn.1.xml:55(replaceable)
 msgid "work_ph"
 msgstr "arbetstelefon"
 
-#: chfn.1.xml:26(arg)
+#: chfn.1.xml:55(arg)
 msgid "-w <placeholder-1/>"
 msgstr "-w <placeholder-1/>"
 
-#: chfn.1.xml:27(replaceable)
+#: chfn.1.xml:56(replaceable)
 msgid "home_ph"
 msgstr "hemtelefon"
 
-#: chfn.1.xml:28(replaceable)
+#: chfn.1.xml:57(replaceable)
 msgid "other"
 msgstr "övrigt"
 
-#: chfn.1.xml:28(arg)
+#: chfn.1.xml:57(arg)
 msgid "-o <placeholder-1/>"
 msgstr "-o <placeholder-1/>"
 
-#: chfn.1.xml:35(para)
+#: chfn.1.xml:64(para)
 msgid ""
 "The <command>chfn</command> command changes user fullname, office number, "
 "office extension, and home phone number information for a user's account. "
@@ -6489,7 +7185,7 @@
 "option to change the undefined portions of the GECOS field."
 msgstr ""
 
-#: chfn.1.xml:49(para)
+#: chfn.1.xml:78(para)
 msgid ""
 "These fields must not contain any colons. Except for the <emphasis remap=\"I"
 "\">other</emphasis> field, they should not contain any comma or equal sign. "
@@ -6498,7 +7194,7 @@
 "field is used to store accounting information used by other applications."
 msgstr ""
 
-#: chfn.1.xml:58(para)
+#: chfn.1.xml:87(para)
 msgid ""
 "If none of the options are selected, <command>chfn</command> operates in an "
 "interactive fashion, prompting the user with the current values for all of "
@@ -6508,7 +7204,7 @@
 "command> prompts for the current user account."
 msgstr ""
 
-#: chfn.1.xml:103(para)
+#: chfn.1.xml:132(para)
 msgid ""
 "<citerefentry><refentrytitle>chsh</refentrytitle><manvolnum>1</manvolnum></"
 "citerefentry>, <citerefentry><refentrytitle>login.defs</"
@@ -6522,27 +7218,27 @@
 "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</manvolnum></"
 "citerefentry>."
 
-#: chage.1.xml:5(refentrytitle) chage.1.xml:10(refname)
-#: chage.1.xml:15(command)
+#: chage.1.xml:34(refentrytitle) chage.1.xml:39(refname)
+#: chage.1.xml:44(command)
 msgid "chage"
 msgstr "chage"
 
-#: chage.1.xml:11(refpurpose)
+#: chage.1.xml:40(refpurpose)
 msgid "change user password expiry information"
 msgstr "ändra åldringsinformation för användarlösenord"
 
-#: chage.1.xml:27(para)
+#: chage.1.xml:56(para)
 msgid ""
 "The <command>chage</command> command changes the number of days between "
 "password changes and the date of the last password change. This information "
 "is used by the system to determine when a user must change his/her password."
 msgstr ""
 
-#: chage.1.xml:37(para)
+#: chage.1.xml:66(para)
 msgid "The options which apply to the <command>chage</command> command are:"
 msgstr "Flaggorna som gäller för kommandot <command>chage</command> är:"
 
-#: chage.1.xml:42(term)
+#: chage.1.xml:71(term)
 msgid ""
 "<option>-d</option>, <option>--lastday</option><replaceable>LAST_DAY</"
 "replaceable>"
@@ -6550,14 +7246,14 @@
 "<option>-d</option>, <option>--lastday</option><replaceable>SISTA_DAG</"
 "replaceable>"
 
-#: chage.1.xml:46(para)
+#: chage.1.xml:75(para)
 msgid ""
 "Set the number of days since January 1st, 1970 when the password was last "
 "changed. The date may also be expressed in the format YYYY-MM-DD (or the "
 "format more commonly used in your area)."
 msgstr ""
 
-#: chage.1.xml:54(term)
+#: chage.1.xml:83(term)
 msgid ""
 "<option>-E</option>, <option>--expiredate</option><replaceable>EXPIRE_DATE</"
 "replaceable>"
@@ -6565,7 +7261,7 @@
 "<option>-E</option>, <option>--expiredate</option><replaceable>UTGÅNGSDATUM</"
 "replaceable>"
 
-#: chage.1.xml:58(para)
+#: chage.1.xml:87(para)
 msgid ""
 "Set the date or number of days since January 1, 1970 on which the user's "
 "account will no longer be accessible. The date may also be expressed in the "
@@ -6574,14 +7270,14 @@
 "able to use the system again."
 msgstr ""
 
-#: chage.1.xml:66(para)
+#: chage.1.xml:95(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>EXPIRE_DATE</replaceable> will remove an account expiration "
 "date."
 msgstr ""
 
-#: chage.1.xml:80(term)
+#: chage.1.xml:109(term)
 msgid ""
 "<option>-I</option>, <option>--inactive</option><replaceable>INACTIVE</"
 "replaceable>"
@@ -6589,7 +7285,7 @@
 "<option>-I</option>, <option>--inactive</option><replaceable>INAKTIV</"
 "replaceable>"
 
-#: chage.1.xml:84(para)
+#: chage.1.xml:113(para)
 msgid ""
 "Set the number of days of inactivity after a password has expired before the "
 "account is locked. The <replaceable>INACTIVE</replaceable> option is the "
@@ -6597,21 +7293,17 @@
 "the system administrator before being able to use the system again."
 msgstr ""
 
-#: chage.1.xml:91(para)
+#: chage.1.xml:120(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as the "
 "<replaceable>INACTIVE</replaceable> will remove an account's inactivity."
 msgstr ""
 
-#: chage.1.xml:99(term)
-msgid "<option>-l</option>, <option>--list</option>"
-msgstr "<option>-l</option>, <option>--list</option>"
-
-#: chage.1.xml:103(para)
+#: chage.1.xml:132(para)
 msgid "Show account aging information."
 msgstr "Visa kontots åldringsinformation"
 
-#: chage.1.xml:121(term)
+#: chage.1.xml:150(term)
 msgid ""
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAYS</"
 "replaceable>"
@@ -6619,7 +7311,7 @@
 "<option>-M</option>, <option>--maxdays</option><replaceable>MAX_DAGAR</"
 "replaceable>"
 
-#: chage.1.xml:125(para)
+#: chage.1.xml:154(para)
 msgid ""
 "Set the maximum number of days during which a password is valid. When "
 "<replaceable>MAX_DAYS</replaceable> plus <replaceable>LAST_DAY</replaceable> "
@@ -6629,14 +7321,14 @@
 "provides the user with advance warning."
 msgstr ""
 
-#: chage.1.xml:134(para)
+#: chage.1.xml:163(para)
 msgid ""
 "Passing the number <emphasis remap=\"I\">-1</emphasis> as "
 "<replaceable>MAX_DAYS</replaceable> will remove checking a password's "
 "validity."
 msgstr ""
 
-#: chage.1.xml:142(term)
+#: chage.1.xml:171(term)
 msgid ""
 "<option>-W</option>, <option>--warndays</option><replaceable>WARN_DAYS</"
 "replaceable>"
@@ -6644,7 +7336,7 @@
 "<option>-W</option>, <option>--warndays</option><replaceable>VARN_DAGAR</"
 "replaceable>"
 
-#: chage.1.xml:146(para)
+#: chage.1.xml:175(para)
 msgid ""
 "Set the number of days of warning before a password change is required. The "
 "<replaceable>WARN_DAYS</replaceable> option is the number of days prior to "
@@ -6652,7 +7344,7 @@
 "to expire."
 msgstr ""
 
-#: chage.1.xml:155(para)
+#: chage.1.xml:184(para)
 msgid ""
 "If none of the options are selected, <command>chage</command> operates in an "
 "interactive fashion, prompting the user with the current values for all of "
@@ -6661,7 +7353,7 @@
 "<emphasis>[ ]</emphasis> marks."
 msgstr ""
 
-#: chage.1.xml:165(para)
+#: chage.1.xml:194(para)
 msgid ""
 "The <command>chage</command> program requires a shadow password file to be "
 "available."
@@ -6669,22 +7361,22 @@
 "Programmet <command>chage</command> kräver att en skugglösenordsfil finns "
 "tillgänglig."
 
-#: chage.1.xml:169(para)
+#: chage.1.xml:198(para)
 msgid ""
 "The <command>chage</command> command is restricted to the root user, except "
 "for the <option>-l</option> option, which may be used by an unprivileged "
 "user to determine when his/her password or account is due to expire."
 msgstr ""
 
-#: chage.1.xml:222(replaceable)
+#: chage.1.xml:251(replaceable)
 msgid "15"
 msgstr "15"
 
-#: chage.1.xml:224(para)
+#: chage.1.xml:253(para)
 msgid "can't find the shadow password file"
 msgstr "kan inte hitta skugglösenordsfilen"
 
-#: chage.1.xml:200(para)
+#: chage.1.xml:229(para)
 msgid ""
 "The <command>chage</command> command exits with the following values: "
 "<placeholder-1/>"
@@ -6697,7 +7389,154 @@
 msgid "translator-credits"
 msgstr "Daniel Nylander <po at danielnylander.se>, 2006."
 
+#~ msgid "days since Jan 1, 1970 that password was last changed"
+#~ msgstr "dagar sedan 1:a januari, 1970 som lösenordet senast ändrades"
+
+#~ msgid "days after which password must be changed"
+#~ msgstr "dagar efter vilket lösenordet måste ändras"
+
+#~ msgid "days before password is to expire that user is warned"
+#~ msgstr "dagar innan lösenordet går ut som användaren varnas"
+
+#~ msgid "days after password expires that account is disabled"
+#~ msgstr "dagar efter att lösenordet gått ut och kontot inaktiveras"
+
+#~ msgid "days since Jan 1, 1970 that account is disabled"
+#~ msgstr "dagar sedan 1:a januari 1970 som kontot är inaktiverat"
+
 #~ msgid ""
+#~ "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>chage</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
+#~ "citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>getpwnam</"
+#~ "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>getent</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>login</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>su</"
+#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>crypt</refentrytitle><manvolnum>3</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>getpwnam</"
+#~ "refentrytitle><manvolnum>3</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pwconv</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>pwunconv</refentrytitle><manvolnum>8</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>sulogin</"
+#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
+
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>."
+
+#, fuzzy
+#~ msgid ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>1</"
+#~ "manvolnum></citerefentry>."
+#~ msgstr ""
+#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gpasswd</"
+#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
+#~ "<citerefentry><refentrytitle>newgrp</refentrytitle><manvolnum>5</"
+#~ "manvolnum></citerefentry>."
+
+#~ msgid "-a"
+#~ msgstr "-a"
+
+#~ msgid "-d"
+#~ msgstr "-d"
+
+#~ msgid "-g"
+#~ msgstr "-g"
+
+#~ msgid "GID"
+#~ msgstr "GID"
+
+#~ msgid "-o"
+#~ msgstr "-o"
+
+#~ msgid "KEY"
+#~ msgstr "NYCKEL"
+
+#~ msgid "VALUE"
+#~ msgstr "VÄRDE"
+
+#~ msgid "-K <placeholder-1/>=<placeholder-2/>"
+#~ msgstr "-K <placeholder-1/>=<placeholder-2/>"
+
+#, fuzzy
+#~ msgid "-R"
+#~ msgstr "-"
+
+#, fuzzy
+#~ msgid "<option>-A</option><replaceable>user</replaceable>,..."
+#~ msgstr ""
+#~ "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+
+#, fuzzy
+#~ msgid "<option>-M</option><replaceable>user</replaceable>,..."
+#~ msgstr ""
+#~ "<option>-u</option>, <option>--uid</option><replaceable>UID</replaceable>"
+
+#~ msgid ""
+#~ "<option>-u</option>, <option>--user</option><replaceable>LOGIN</"
+#~ "replaceable>"
+#~ msgstr ""
+#~ "<option>-u</option>, <option>--user</option><replaceable>INLOGGNINGSNAMN</"
+#~ "replaceable>"
+
+#~ msgid ""
 #~ "Your password must be easily remembered so that you will not be forced to "
 #~ "write it on a piece of paper. This can be accomplished by appending two "
 #~ "small words together and separating each with a special character or "
@@ -6771,29 +7610,7 @@
 #~ msgid "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 #~ msgstr "PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE UMASK"
 
-#, fuzzy
 #~ msgid ""
-#~ "<citerefentry><refentrytitle>id</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>login</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>gpasswd</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>group</refentrytitle><manvolnum>5</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>gshadow</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>."
-#~ msgstr ""
-#~ "<citerefentry><refentrytitle>login</refentrytitle><manvolnum>1</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>passwd</"
-#~ "refentrytitle><manvolnum>1</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>su</refentrytitle><manvolnum>1</manvolnum></"
-#~ "citerefentry>, <citerefentry><refentrytitle>passwd</"
-#~ "refentrytitle><manvolnum>5</manvolnum></citerefentry>, "
-#~ "<citerefentry><refentrytitle>shadow</refentrytitle><manvolnum>5</"
-#~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>pam</"
-#~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>."
-
-#~ msgid ""
 #~ "<citerefentry><refentrytitle>passwd</refentrytitle><manvolnum>1</"
 #~ "manvolnum></citerefentry>, <citerefentry><refentrytitle>newusers</"
 #~ "refentrytitle><manvolnum>8</manvolnum></citerefentry>, "

Modified: upstream/trunk/po/bs.po
===================================================================
--- upstream/trunk/po/bs.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/bs.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -54,6 +54,9 @@
 msgid "  Choose a new password."
 msgstr "  Izaberite novu šifru."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Vaša šifra ističe za in %ld dana.\n"
@@ -65,9 +68,13 @@
 msgstr "Vaša šifra ističe danas."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
 msgstr ""
 
+#, c-format
+msgid "Unable to change owner or mode of tty stdin: %s"
+msgstr ""
+
 msgid "Environment overflow\n"
 msgstr ""
 
@@ -85,10 +92,12 @@
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, c-format
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr ""
 
-msgid "Can't get unique GID (no more available GIDs)\n"
+#, c-format
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr ""
 
 msgid "Too many logins.\n"
@@ -179,9 +188,16 @@
 msgstr ""
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr ""
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr ""
 
+msgid "No"
+msgstr ""
+
 msgid "Password: "
 msgstr "Šifra:"
 
@@ -189,6 +205,10 @@
 msgid "%s's Password: "
 msgstr "%s's Šifra: "
 
+#, c-format
+msgid "%s: failed to unlock %s\n"
+msgstr ""
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -270,42 +290,32 @@
 msgstr ""
 
 #, c-format
-msgid "%s: PAM authentication failed\n"
+msgid "%s: Cannot determine your user name.\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock password file\n"
+msgid "%s: PAM authentication failed\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: Try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: Pokušajte ponovo kasnije\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: unknown member %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: nepoznat član %s\n"
 
 #, c-format
-msgid "%s: can't open shadow password file\n"
+msgid "%s: failure while writing changes to %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr ""
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr ""
 
@@ -313,9 +323,9 @@
 msgid "%s: failed to drop privileges (%s)\n"
 msgstr ""
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: grupa %s postoji\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -339,56 +349,25 @@
 msgstr "Puno ime i prezime"
 
 #, c-format
-msgid "\tFull Name: %s\n"
+msgid "\t%s: %s\n"
 msgstr ""
 
 msgid "Room Number"
 msgstr "Broj sobe"
 
-#, fuzzy, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "Broj sobe"
-
 msgid "Work Phone"
 msgstr "Poslovni telefon"
 
-#, fuzzy, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "Poslovni telefon"
-
 msgid "Home Phone"
 msgstr "Kućni telefon"
 
-#, fuzzy, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "Kućni telefon"
-
 msgid "Other"
 msgstr "Ostalo"
 
 msgid "Cannot change ID to root.\n"
 msgstr ""
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr ""
-
-msgid "Cannot open the password file.\n"
-msgstr ""
-
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr ""
-
-msgid "Error updating the password entry.\n"
-msgstr ""
-
-msgid "Cannot commit password file changes.\n"
-msgstr ""
-
-msgid "Cannot unlock the password file.\n"
-msgstr ""
-
-#, c-format
 msgid "%s: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -420,9 +399,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr ""
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: grupa %s postoji\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -463,7 +442,7 @@
 msgstr ""
 
 #, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr ""
 
 #, c-format
@@ -475,30 +454,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-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 ""
 
@@ -507,37 +462,21 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "nepoznata grupa: %s\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: grupa %s postoji\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "nepoznata grupa: %s\n"
 
 #, c-format
 msgid "%s: error detected, changes ignored\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: grupa %s postoji\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: line %d: unknown user %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr ""
-
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -551,7 +490,7 @@
 msgstr ""
 
 #, c-format
-msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr ""
 
 #, c-format
@@ -562,24 +501,20 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr ""
 
-#, c-format
-msgid "%s is an invalid shell.\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: %s is an invalid shell.\n"
+msgstr "%s: grupa %s postoji\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr ""
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr ""
-
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -592,90 +527,81 @@
 "\n"
 msgstr ""
 
-msgid "Login       Failures Maximum Latest                   On\n"
-msgstr ""
-
 #, c-format
-msgid " [%lds left]"
+msgid "faillog: Failed to get the entry for UID %d\n"
 msgstr ""
 
-#, c-format
-msgid " [%lds lock]"
+msgid "Login       Failures Maximum Latest                   On\n"
 msgstr ""
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Nepoznat korisnik: %s\n"
-
-#, c-format
-msgid "Usage: %s [-r|-R] group\n"
+msgid " [%lus left]"
 msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
+msgid " [%lds lock]"
 msgstr ""
 
 #, c-format
-msgid "       %s [-d user] group\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
 msgstr ""
 
 #, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
+msgid "faillog: Failed to set max for UID %d\n"
 msgstr ""
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
 msgstr ""
 
-#, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Nepoznat korisnik: %s\n"
 
 #, c-format
-msgid "%s: can't get lock\n"
+msgid "faillog: Cannot open %s: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't open file\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't re-write file\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
+msgid "The options cannot be combined.\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't unlock file\n"
+msgid "%s: shadow group passwords required for -A\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't update entry\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: grupa %s postoji\n"
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
+msgid "%s: failure while closing read-only %s\n"
 msgstr ""
 
 #, c-format
-msgid "unknown group: %s\n"
-msgstr "nepoznata grupa: %s\n"
-
-#, c-format
-msgid "%s: can't close file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't close shadow file\n"
-msgstr ""
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Mijenjam šifru za grupu %s\n"
 
@@ -692,9 +618,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Pokušajte ponovo kasnije\n"
 
-msgid "Who are you?\n"
-msgstr ""
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Dodajem korisnika %s grupi %s\n"
@@ -703,9 +626,9 @@
 msgid "Removing user %s from group %s\n"
 msgstr "Uklanjam korisnika %s iz grupe %s\n"
 
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: nepoznat član %s\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: grupa %s postoji\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -727,111 +650,83 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: '%s' is not a valid group name\n"
+msgstr "%s: grupa %s postoji\n"
 
-#, c-format
-msgid "%s: %s is not a valid group name\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "nepoznata grupa: %s\n"
 
 #, c-format
-msgid "%s: cannot rewrite group file\n"
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr ""
 
-#, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
+msgstr "%s: grupa %s postoji\n"
 
 #, c-format
-msgid "%s: unable to lock group file\n"
+msgid "%s: GID '%lu' already exists\n"
 msgstr ""
 
-#, c-format
-msgid "%s: unable to open group file\n"
+msgid "Usage: groupdel group\n"
 msgstr ""
 
 #, c-format
-msgid "%s: unable to lock shadow group file\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: unable to open shadow group file\n"
+msgid "%s: cannot remove the primary group of user '%s'\n"
 msgstr ""
 
-#, c-format
-msgid "%s: -K requires KEY=VALUE\n"
-msgstr ""
-
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: grupa %s postoji\n"
 
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr ""
-
 #, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "nepoznata grupa: %s\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: grupa %s postoji\n"
 
-msgid "Usage: groupdel group\n"
-msgstr ""
-
 #, c-format
-msgid "%s: error removing group entry\n"
+msgid "%s: %s is the NIS master\n"
 msgstr ""
 
 #, c-format
-msgid "%s: error removing shadow group entry\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "%s: cannot remove user's primary group.\n"
+msgid "%s: Out of memory. Cannot update %s.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: group %s does not exist\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
 
 #, c-format
-msgid "%s: group %s is a NIS group\n"
+msgid "%s: your groupname does not match your username\n"
 msgstr ""
 
 #, c-format
-msgid "%s: %s is the NIS master\n"
+msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-msgid "Member already exists\n"
-msgstr ""
-
-msgid "Member to remove could not be found\n"
-msgstr ""
-
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
-msgstr ""
-
-msgid "Only root can add members to different groups\n"
-msgstr ""
-
-msgid "Group access is required\n"
-msgstr ""
-
-msgid "Not primary owner of current group\n"
-msgstr ""
-
-msgid "PAM authentication failed for\n"
-msgstr ""
-
-msgid "Unable to lock group file\n"
-msgstr ""
-
-msgid "Unable to open group file\n"
-msgstr ""
-
-msgid "Cannot close group file\n"
-msgstr ""
-
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -846,40 +741,18 @@
 msgstr ""
 
 #, c-format
-msgid "%s: %s not found in /etc/group\n"
+msgid "%s: invalid group name '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "%s: %u is not a unique GID\n"
+msgid "%s: group %s is a NIS group\n"
 msgstr ""
 
 #, c-format
-msgid "%s: %s is not a unique name\n"
+msgid "%s: unknown user %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: unable to lock password file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: unable to open password file\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr ""
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr ""
 
@@ -891,18 +764,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr ""
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: cannot update file %s\n"
-msgstr ""
-
 msgid "invalid group file entry"
 msgstr ""
 
@@ -919,6 +780,10 @@
 msgstr ""
 
 #, c-format
+msgid "invalid group ID '%lu'\n"
+msgstr ""
+
+#, c-format
 msgid "group %s: no user %s\n"
 msgstr ""
 
@@ -931,17 +796,9 @@
 msgstr ""
 
 #, c-format
-msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr ""
-
 msgid "invalid shadow group file entry"
 msgstr ""
 
@@ -968,30 +825,17 @@
 msgid "%s: no changes\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
+msgid "Usage: grpconv\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
+msgid "Usage: grpunconv\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: unknown member %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: nepoznat član %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr ""
-
 msgid "Usage: id [-a]\n"
 msgstr ""
 
@@ -1013,6 +857,10 @@
 "\n"
 msgstr ""
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr ""
 
@@ -1022,15 +870,15 @@
 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 ""
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr ""
 
@@ -1117,6 +965,9 @@
 "\n"
 msgstr ""
 
+msgid "Usage: logoutd\n"
+msgstr ""
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr ""
 
@@ -1132,13 +983,9 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "unknown UID: %u\n"
-msgstr "nepoznata grupa: %s\n"
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: grupa %s postoji\n"
 
-#, fuzzy, c-format
-msgid "unknown GID: %lu\n"
-msgstr "nepoznata grupa: %s\n"
-
 msgid "too many groups\n"
 msgstr ""
 
@@ -1151,61 +998,19 @@
 "%s\n"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
-msgstr "%s: grupa %s postoji\n"
-
 #, c-format
-msgid "%s: invalid group name `%s'\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr ""
 
 #, c-format
-msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgid "%s: invalid user ID '%s'\n"
 msgstr ""
 
 #, c-format
-msgid ""
-"%s: group %s created, failure during the creation of the corresponding "
-"gshadow group\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: grupa %s postoji\n"
-
-#, c-format
-msgid "%s: invalid user name `%s'\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't open files\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error updating files\n"
-msgstr ""
-
-#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr ""
 
@@ -1221,9 +1026,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "nepoznata grupa: %s\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: grupa %s postoji\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1253,15 +1058,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1306,13 +1111,10 @@
 msgstr ""
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr ""
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1359,17 +1161,22 @@
 msgstr ""
 
 #, c-format
-msgid "user %s: no group %u\n"
+msgid "invalid user ID '%lu'\n"
 msgstr ""
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "Adding user %s to group %s\n"
+msgid "user '%s': no group %lu\n"
+msgstr "Dodajem korisnika %s grupi %s\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "user '%s': directory '%s' does not exist\n"
+msgstr "%s: grupa %s postoji\n"
 
+#, fuzzy, c-format
+msgid "user '%s': program '%s' does not exist\n"
+msgstr "%s: grupa %s postoji\n"
+
 #, c-format
 msgid "no matching password file entry in %s\n"
 msgstr ""
@@ -1378,10 +1185,6 @@
 msgid "add user '%s' in %s? "
 msgstr ""
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr ""
-
 msgid "invalid shadow password file entry"
 msgstr ""
 
@@ -1393,33 +1196,19 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock passwd file\n"
+msgid "%s: cannot sort entries in %s\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't open passwd file\n"
+msgid "Usage: pwconv\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
+msgid "Usage: pwunconv\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr ""
-
 msgid "Access to su to that account DENIED.\n"
 msgstr ""
 
@@ -1473,6 +1262,14 @@
 "(Ignored)\n"
 msgstr ""
 
+#, c-format
+msgid "%s: Authentication failure\n"
+msgstr ""
+
+#, c-format
+msgid "%s: You are not authorized to su at that time\n"
+msgstr ""
+
 msgid "No shell\n"
 msgstr ""
 
@@ -1495,15 +1292,7 @@
 msgid "Entering System Maintenance Mode"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: nepoznat član %s\n"
-
 #, c-format
-msgid "%s: unknown group %s\n"
-msgstr ""
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr ""
 
@@ -1543,10 +1332,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1562,14 +1353,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr ""
-
-#, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr ""
-
-#, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr ""
 
@@ -1606,50 +1389,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr ""
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr ""
 
@@ -1663,9 +1410,9 @@
 msgid "Setting mailbox file permissions"
 msgstr ""
 
-#, c-format
-msgid "%s: user %s exists\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: user '%s' already exists\n"
+msgstr "%s: grupa %s postoji\n"
 
 #, c-format
 msgid ""
@@ -1676,20 +1423,20 @@
 msgid "%s: can't create user\n"
 msgstr ""
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: UID %lu is not unique\n"
+msgstr "%s: grupa %s postoji\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "nepoznata grupa: %s\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr ""
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1702,50 +1449,22 @@
 msgstr ""
 
 #, c-format
-msgid "%s: error updating group entry\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 
 #, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: user %s is currently logged in\n"
 msgstr ""
 
-#, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: warning: can't remove %s: %s"
+msgstr "nepoznata grupa: %s\n"
 
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr ""
-
-#, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr ""
-
-#, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr ""
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr ""
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr ""
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr ""
 
@@ -1785,9 +1504,15 @@
 msgstr ""
 
 #, c-format
-msgid "%s: error adding new shadow group entry\n"
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: grupa %s postoji\n"
+
 #, c-format
 msgid "%s: no flags given\n"
 msgstr ""
@@ -1801,42 +1526,38 @@
 msgstr ""
 
 #, c-format
-msgid "%s: uid %lu is not unique\n"
+msgid "%s: UID '%lu' already exists\n"
 msgstr ""
 
 #, c-format
-msgid "%s: error changing password entry\n"
+msgid "%s: directory %s exists\n"
 msgstr ""
 
 #, c-format
-msgid "%s: error removing password entry\n"
+msgid "%s: can't create %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: error removing shadow password entry\n"
+msgid "%s: can't chown %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: directory %s exists\n"
+msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
 #, c-format
-msgid "%s: can't create %s\n"
+msgid "%s: cannot rename directory %s to %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't chown %s\n"
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: warning: failed to completely remove old home directory %s"
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: cannot rename directory %s to %s\n"
-msgstr ""
-
-#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr ""
 
@@ -1850,7 +1571,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -1866,11 +1587,13 @@
 msgstr ""
 
 #, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+msgid "%s: failed to remove %s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: %s is unchanged\n"
+msgstr "Šifra:"
+
 msgid "Couldn't lock file"
 msgstr ""
 
@@ -1882,6 +1605,40 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "Broj sobe"
+
+#, fuzzy
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "Poslovni telefon"
+
+#, fuzzy
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "Kućni telefon"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "nepoznata grupa: %s\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Nepoznat korisnik: %s\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "nepoznata grupa: %s\n"
+
+#, fuzzy
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "nepoznata grupa: %s\n"
+
+#, fuzzy
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "nepoznata grupa: %s\n"
+
+#, fuzzy
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: nepoznat član %s\n"
+
+#, fuzzy
 #~ msgid "No password.\n"
 #~ msgstr "Nova šifra:"
 

Modified: upstream/trunk/po/ca.po
===================================================================
--- upstream/trunk/po/ca.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/ca.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -54,6 +54,9 @@
 msgid "  Choose a new password."
 msgstr "  Escolliu una nova contrasenya."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "La vostra contrasenya caduca en %ld dies.\n"
@@ -65,7 +68,12 @@
 msgstr "La vostra contrasenya caduca avui."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "No es pot canviar la tty %s"
 
 msgid "Environment overflow\n"
@@ -89,14 +97,14 @@
 "S'han produït %d fallades des de l'últim accés.\n"
 "L'ultim va ser %s en %s.\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\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"
+
+#, 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
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s: no es pot obtenir un GID únic\n"
-
 msgid "Too many logins.\n"
 msgstr "Massa accessos.\n"
 
@@ -187,9 +195,18 @@
 msgstr "No s'ha pogut determinar el nom de la vostra tty."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: sense memòria\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) ha fallat\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "No\n"
+
 msgid "Password: "
 msgstr "Contrasenya: "
 
@@ -197,6 +214,11 @@
 msgid "%s's Password: "
 msgstr "Contrasenya de l'usuari %s: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: els camps són massa llargs\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -294,42 +316,33 @@
 msgstr "%s: Permís denegat.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: No s'ha pogut determinar el seu nom d'usuari.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 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"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: no es poden blocar els fitxers, intenteu-ho més tard\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: no es pot obrir el fitxer de contrasenyes\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: no es pot obrir el fitxer %s\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: no es pot blocar el fitxer de contrasenyes ombra\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: fallada al fer fork: %s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: no es pot obrir el fitxer de contrasenyes ombra\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: ha fallat el despreniment de privilegis (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: no es pot reescriure el fitxer de contrasenyes ombra\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: no es pot reescriure el fitxer de contrasenyes\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: no es pot actualitzar el fitxer de contrasenyes\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: no es pot actualitzar el fitxer de contrasenyes ombra\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: el fitxer de contrasenyes ombra no és present\n"
 
@@ -337,9 +350,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: l'usuari %s no existeix\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -366,57 +379,27 @@
 msgid "Full Name"
 msgstr "Nom complet"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tNom complet: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Número d'habitació"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tNúmero d'habitació: %s\n"
-
 msgid "Work Phone"
 msgstr "Telèfon de la feina"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tTelèfon de la feina: %s\n"
-
 msgid "Home Phone"
 msgstr "Telèfon de casa"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tTelèfon de casa: %s\n"
-
 msgid "Other"
 msgstr "Altre"
 
 msgid "Cannot change ID to root.\n"
 msgstr "No s'ha pogut canviar l'ID al de root.\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"
-
-msgid "Cannot open the password file.\n"
-msgstr "No s'ha pogut obrir el fitxer de contrasenyes.\n"
-
 #, c-format
-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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -449,9 +432,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: «%s» conté caràcters il·legals\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: No s'ha pogut determinar el seu nom d'usuari.\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: l'usuari %s no existeix\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -499,7 +482,7 @@
 msgstr "%s: l'argument numèric «%s» no és vàlid\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: el senyalador «-a» NOMÉS es permet amb el senyalador «-G»\n"
 
 #, c-format
@@ -511,31 +494,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: no es pot blocar el fitxer de grups\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: no es pot obrir el fitxer de grups\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: no s'ha pogut blocar el fitxer de contrasenyes ombra\n"
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-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"
 
@@ -543,39 +501,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: línia %d: manca la nova contrasenya\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: línia %d: el grup %s és desconegut\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: el grup %s no existeix\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: l'usuari %s no existeix\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"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: s'ha produït un error en actualitzar el fitxer de contrasenyes\n"
-
-#, c-format
-msgid "%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"
@@ -595,8 +538,9 @@
 msgid "Login Shell"
 msgstr "Intèrpret d'accés"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "No podeu canviar l'intèrpret per a %s.\n"
 
 #, c-format
@@ -607,24 +551,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: L'entrada no és vàlida: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s no és un intèrpret vàlid.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Forma d'ús: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: l'usuari és desconegut\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -656,11 +616,16 @@
 "                                per a l'usuari amb USUARI\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Usuari      Fallades Màxim   Últim                    A\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [falten %lds]"
 
 #, c-format
@@ -668,76 +633,67 @@
 msgstr " [blocat %lds]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "L'usuari és desconegut: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Forma d'ús: %s [-r|-R] grup\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a usuari] grup\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d usuari] grup\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "L'usuari és desconegut: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A usuari,...] [-M usuari,...] grup\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: no es pot obrir el fitxer %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M usuari,...] grup\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: contrasenyes ombra de grups requerides per a «-A»\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: no es pot obtenir el bloqueig\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: no es pot obtenir el bloqueig del fitxer de contrasenyes ombra\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "No es pot canviar la contrasenya per a %s.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: no es pot obrir el fitxer\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: contrasenyes ombra de grups requerides per a «-A»\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: no es pot obrir el fitxer\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: el grup %s no existeix\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: no s'ha pogut obrir el fitxer de contrasenyes ombra\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: fallada al fer fork: %s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -756,9 +712,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Intenteu-ho de nou més tard.\n"
 
-msgid "Who are you?\n"
-msgstr "Qui sou?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "S'està afegint l'usuari %s al grup %s\n"
@@ -767,9 +720,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: l'usuari %s no existeix\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -804,111 +757,89 @@
 "                                (no únics)\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: s'ha produït un error en afegir la nova entrada de grup\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s no és un nom de grup valid\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: no es pot reescriure el fitxer de grup\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "el nom de grup «%s» no és vàlid\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: no es pot reescriure el fitxer de grups ombra\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: no es pot blocar el fitxer de grup\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: no es pot obrir el fitxer de grup\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: no es pot blocar el fitxer de grup ombra\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: no es pot obrir el fitxer de grup ombra\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: «-K» requereix CLAU=VALOR\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 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"
-
 #, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: no es pot crear %s\n"
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "El membre ja existeix\n"
 
 msgid "Usage: groupdel group\n"
 msgstr "Forma d'ús: groupdel grup\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: s'ha produït un error en eliminar l'entrada de grup\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: no es pot reanomenar el directori %s a %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: s'ha produït un error en eliminar l'entrada de grup ombra\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: no s'ha pogut canviar l'usuari «%s» al client NIS.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: no es pot eliminar el grup primari de l'usuari.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: el grup %s no existeix\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: el grup %s no és un grup NIS\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: el grup «%s» és un grup NIS.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s és el mestre NIS\n"
 
-msgid "Member already exists\n"
-msgstr "El membre ja existeix\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: l'usuari %s és un usuari NIS\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "No s'han trobat els membres a borrar\n"
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: sense memòria a update_group\n"
 
-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"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
 
-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 "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "És requereix accés de grup\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "No és propietari principal del grup actual\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "l'autenticació PAM ha fallat per\n"
-
-msgid "Unable to lock group file\n"
-msgstr "No es pot blocar el fitxer de grup\n"
-
-msgid "Unable to open group file\n"
-msgstr "No es pot obrir el fitxer de grup\n"
-
-msgid "Cannot close group file\n"
-msgstr "No es pot obrir el fitxer de grup\n"
-
 #, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
@@ -932,41 +863,19 @@
 "                                a GRUP\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: no s'ha trobat %s a «/etc/group»\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u no és un GID únic\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s no és un nom únic\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: no es pot reescriure el fitxer de contrasenyes\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "el nom de grup «%s» no és vàlid\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: no es pot blocar el fitxer de contrasenyes\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: el grup %s no és un grup NIS\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: no es pot d'obrir el fitxer de contrasenyes\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: usuari %s desconegut\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: no s'ha pogut canviar l'usuari «%s» al client NIS.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Forma d'ús: %s [-r] [-s] [grup [grup_ombra]]\n"
 
@@ -978,18 +887,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: «-s» i «-r» són incompatibles\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: no es pot blocar el fitxer %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "l'entrada del fitxer de grup no és vàlida"
 
@@ -1004,6 +901,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "el nom de grup «%s» no és vàlid\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "el nom de grup «%s» no és vàlid\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "grup %s: no existeix l'usuari %s\n"
@@ -1016,18 +918,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "no hi ha cap entrada coincident al fitxer de grup en %s\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "voleu afegir el grup «%s» a %s?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: no es pot actualitzar l'entrada ombra per a %s\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: no es pot actualitzar l'entrada per al grup %s\n"
-
 msgid "invalid shadow group file entry"
 msgstr "l'entrada del fitxer de grup ombra no és vàlida"
 
@@ -1054,30 +949,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: no hi ha canvis\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: no es pot blocar el fitxer de grups ombra\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Forma d'ús: groupdel grup\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: no es pot obrir el fitxer de grups ombra\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Forma d'ús: groupdel grup\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: no es pot eliminar el grup ombra %s\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: no es pot actualitzar el fitxer %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: no es pot actualitzar el fitxer de grups ombra\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: no es pot actualitzar el fitxer de grups\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: no es pot eliminar el fitxer de grups ombra\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Forma d'ús: id [-a]\n"
 
@@ -1110,6 +996,10 @@
 "                                l'usuari amb USUARI especific\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Usuari           Port     Des de           Últim"
 
@@ -1119,15 +1009,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Forma d'ús: %s [-p] [nom]\n"
 
@@ -1224,6 +1114,11 @@
 "temps d'accés excedit\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Forma d'ús: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Forma d'ús: newgrp [-] [grup]\n"
 
@@ -1238,14 +1133,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: fallada al fer fork: %s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "El UID és desconegut: %u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: l'usuari %s no existeix\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "El GID és desconegut: %lu\n"
-
 msgid "too many groups\n"
 msgstr "hi ha massa grups\n"
 
@@ -1259,60 +1150,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: el grup %s no existeix\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "el nom de grup «%s» no és vàlid\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: el nom d'usuari «%s» no és vàlid\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: l'usuari %s no existeix\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: l'usuari %s no existeix\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: el nom d'usuari «%s» no és vàlid\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: no es pot blocar «/etc/passwd».\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: no es pot blocar «/etc/passwd».\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: no es pot blocar «/etc/passwd».\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: no es pot blocar «/etc/passwd».\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1328,9 +1178,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: línia %d: no es pot crear el GID\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: línia %d: no es pot trobar l'usuari %s\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: l'usuari %s no existeix\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1348,6 +1198,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: línia %d: no es pot actualitzar l'entrada\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1360,15 +1238,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1445,13 +1323,10 @@
 msgstr "No es pot canviar la contrasenya per a %s.\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: sense memòria\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1494,16 +1369,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "el nom d'usuari «%s» no és vàlid\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "el nom d'usuari «%s» no és vàlid\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "usuari %s: no existeix el grup %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "usuari %s: el directori %s no existeix\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "usuari %s: el programa %s no existeix\n"
 
 #, c-format
@@ -1514,10 +1397,6 @@
 msgid "add user '%s' in %s? "
 msgstr "voleu afegir l'usuari «%s» a %s? "
 
-#, c-format
-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"
-
 msgid "invalid shadow password file entry"
 msgstr "l'entrada del fitxer de contrasenyes ombra no és vàlida"
 
@@ -1528,34 +1407,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "usuari %s: l'últim canvi de contrasenya s'ha produït en el futur\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: no es pot blocar el fitxer de contrasenyes\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: no es pot obrir el fitxer %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: no es pot obrir el fitxer de contrasenyes\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Forma d'ús: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: no es pot eliminar l'entrada ombra per a %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: no es pot actualitzar el fitxer de contrasenyes ombra\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Forma d'ús: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: no es pot actualitzar el fitxer de contrasenyes\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: no es pot actualitzar l'entrada per a l'usuari %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: no es pot eliminar el fitxer de contrasenyes ombra\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "L'accés de «su» a aquest compte està DENEGAT.\n"
 
@@ -1623,6 +1493,16 @@
 "%s: %s\n"
 "(Ignorat)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: l'autenticació PAM ha fallat\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "No esteu autoritzats a usar «su %s»\n"
+
 msgid "No shell\n"
 msgstr "No hi ha intèrpret d'ordres\n"
 
@@ -1648,14 +1528,6 @@
 msgstr "S'està entrant en mode de manteniment del sistema"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: el GID %s és desconegut\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: el grup %s és desconegut\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: no es pot crear un fitxer nou de preferències predeterminades\n"
 
@@ -1696,10 +1568,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1749,14 +1623,6 @@
 "                                   d'usuari\n"
 "\n"
 
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: sense memòria a update_group\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: sense memòria a update_gshadow\n"
-
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: el directori base «%s» no és vàlid\n"
@@ -1794,49 +1660,12 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: el nom d'usuari «%s» no és vàlid\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: no es pot reescriure el fitxer de contrasenyes\n"
-
-#, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: no es pot reescriure el fitxer de contrasenyes ombra\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: no es pot blocar el fitxer de contrasenyes ombra\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: no es pot obrir el fitxer de contrasenyes ombra\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: s'ha produït un error en blocar el fitxer de grups\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: s'ha produït un error en obrir el fitxer de grups\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: s'ha produït un error en blocar el fitxer de grups ombra\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: s'ha produït un error en obrir el fitxer de grups ombra\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: s'ha produït un error en afegir la nova entrada de contrasenya\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
 msgstr ""
-"%s: s'ha produït un error en afegir la nova entrada de contrasenya ombra\n"
 
 #, c-format
 msgid "%s: cannot create directory %s\n"
@@ -1854,8 +1683,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "S'estan establint els permisos de la bústia de correu"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: l'usuari %s existeix\n"
 
 #, c-format
@@ -1869,10 +1699,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s: no es pot crear %s\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: el UID %u no és únic\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: no es pot crear %s\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1881,11 +1716,6 @@
 "%s: avís: el directori personal ja existeix.\n"
 "No s'hi copiarà cap fitxer del directori skel.\n"
 
-#, 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"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1906,53 +1736,28 @@
 "                                de correu\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: s'ha produït un error en actualitzar l'entrada de grup\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: no es pot eliminar el grup %s, que és el grup primari per un altre "
 "usuari.\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: s'ha produït un error en actualitzar l'entrada de grup\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: no es pot obrir el fitxer de grups\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: no es pot obrir el fitxer de grups ombra\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: s'ha produït un error en eliminar l'entrada de contrasenya\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: s'ha produït un error en eliminar l'entrada de contrasenya ombra\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: l'usuari %s està actualment dins el sistema\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: avís: no es pot eliminar "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s no és propietat de %s, no s'elimina\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: avís: no es pot eliminar "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: l'usuari %s no existeix\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: l'usuari %s és un usuari NIS\n"
 
@@ -2022,9 +1827,16 @@
 "  -U, --unlock                  desbloca el compte d'usuari\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: s'ha produït un error en afegir la nova entrada de grup\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: l'usuari %s existeix\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -2038,23 +1850,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: l'UID %lu no és únic\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "El membre ja existeix\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: s'ha produït un error en canviar l'entrada de contrasenya\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: s'ha produït un error en eliminar l'entrada de contrasenya\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: s'ha produït un error en eliminar l'entrada de contrasenya ombra\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: el directori %s ja existeix\n"
 
@@ -2076,6 +1877,14 @@
 msgstr "%s: no es pot reanomenar el directori %s a %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: avís: %s no és propietat de %s\n"
 
@@ -2089,7 +1898,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -2113,10 +1922,16 @@
 "  -s, --shadow                  edita la base de dades de shadow o gshadow\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: ha fallat el despreniment de privilegis (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: no s'ha canviat %s\n"
@@ -2131,6 +1946,431 @@
 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: can't lock password file\n"
+#~ msgstr "%s: no es pot blocar el fitxer de contrasenyes\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: no es pot obrir el fitxer de contrasenyes\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: no es pot blocar el fitxer de contrasenyes ombra\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: no es pot obrir el fitxer de contrasenyes ombra\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: no es pot reescriure el fitxer de contrasenyes ombra\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: no es pot reescriure el fitxer de contrasenyes\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: no es pot actualitzar el fitxer de contrasenyes\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: no es pot actualitzar el fitxer de contrasenyes ombra\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tNom complet: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tNúmero d'habitació: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tTelèfon de la feina: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tTelèfon de casa: %s\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"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "No s'ha pogut obrir el fitxer de contrasenyes.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: no es pot blocar el fitxer de grups\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: no es pot obrir el fitxer de grups\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: no s'ha pogut blocar el fitxer de contrasenyes ombra\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: no s'ha pogut obrir el fitxer de contrasenyes ombra\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr ""
+#~ "%s: s'ha produït un error en actualitzar el fitxer de contrasenyes ombra\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: s'ha produït un error en actualitzar l'entrada de grup\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: línia %d: el grup %s és desconegut\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: línia %d: no es pot actualitzar l'entrada\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: no s'ha pogut blocar el fitxer de contrasenyes ombra\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr ""
+#~ "%s: s'ha produït un error en actualitzar el fitxer de contrasenyes ombra\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr ""
+#~ "%s: s'ha produït un error en actualitzar el fitxer de contrasenyes\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: línia %d: l'usuari %s és desconegut\n"
+
+#~ 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 "%s: unknown user\n"
+#~ msgstr "%s: l'usuari és desconegut\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "L'usuari és desconegut: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Forma d'ús: %s [-r|-R] grup\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a usuari] grup\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d usuari] grup\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A usuari,...] [-M usuari,...] grup\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M usuari,...] grup\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: no es pot obtenir el bloqueig\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr ""
+#~ "%s: no es pot obtenir el bloqueig del fitxer de contrasenyes ombra\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: no es pot obrir el fitxer\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: no es pot reescriure el fitxer\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: no es pot reescriure el fitxer ombra\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: no es pot desblocar el fitxer\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: no es pot actualitzar l'entrada\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr ""
+#~ "%s: no es pot actualitzar l'entrada del fitxer de contrasenyes ombra\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "El grup és desconegut: %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: no es pot obrir el fitxer\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: no s'ha pogut obrir el fitxer de contrasenyes ombra\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Qui sou?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: El membre %s és desconegut\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: s'ha produït un error en afegir la nova entrada de grup\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: no es pot reescriure el fitxer de grup\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: no es pot reescriure el fitxer de grups ombra\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: no es pot blocar el fitxer de grup\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: no es pot obrir el fitxer de grup\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: no es pot blocar el fitxer de grup ombra\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: no es pot obrir el fitxer de grup ombra\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: el GID %u no és únic\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: s'ha produït un error en eliminar l'entrada de grup\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: s'ha produït un error en eliminar l'entrada de grup ombra\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: no es pot eliminar el grup primari de l'usuari.\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "No s'han trobat els membres a borrar\n"
+
+#~ 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"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "Només el superusuari pot afegir members a grups diferents\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "És requereix accés de grup\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "No és propietari principal del grup actual\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "l'autenticació PAM ha fallat per\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "No es pot blocar el fitxer de grup\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "No es pot obrir el fitxer de grup\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "No es pot obrir el fitxer de grup\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: no s'ha trobat %s a «/etc/group»\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u no és un GID únic\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s no és un nom únic\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: no es pot reescriure el fitxer de contrasenyes\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: no es pot blocar el fitxer de contrasenyes\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: no es pot d'obrir el fitxer de contrasenyes\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: no es pot blocar el fitxer %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: no es pot actualitzar l'entrada ombra per a %s\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: no es pot actualitzar l'entrada per al grup %s\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: no es pot blocar el fitxer de grups ombra\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: no es pot obrir el fitxer de grups ombra\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: no es pot eliminar el grup ombra %s\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: no es pot actualitzar el fitxer de grups ombra\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: no es pot actualitzar el fitxer de grups\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: no es pot eliminar el fitxer de grups ombra\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "El UID és desconegut: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "El GID és desconegut: %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: el grup %s no existeix\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: l'usuari %s no existeix\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: el nom d'usuari «%s» no és vàlid\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: no es pot blocar «/etc/passwd».\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: no es pot blocar «/etc/passwd».\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: no es pot blocar «/etc/passwd».\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: no es pot blocar «/etc/passwd».\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: no es poden obrir els fitxers\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: s'ha produït un error en actualitzar el fitxer\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: línia %d: no es pot trobar l'usuari %s\n"
+
+#~ 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"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: no es pot blocar el fitxer de contrasenyes\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: no es pot obrir el fitxer de contrasenyes\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: no es pot eliminar l'entrada ombra per a %s\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: no es pot actualitzar el fitxer de contrasenyes ombra\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: no es pot actualitzar el fitxer de contrasenyes\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: no es pot actualitzar l'entrada per a l'usuari %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: no es pot eliminar el fitxer de contrasenyes ombra\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: el GID %s és desconegut\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: el grup %s és desconegut\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: sense memòria a update_gshadow\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: no es pot reescriure el fitxer de contrasenyes\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: no es pot reescriure el fitxer de contrasenyes ombra\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: no es pot blocar el fitxer de contrasenyes ombra\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: no es pot obrir el fitxer de contrasenyes ombra\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: s'ha produït un error en blocar el fitxer de grups\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: s'ha produït un error en obrir el fitxer de grups\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: s'ha produït un error en blocar el fitxer de grups ombra\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: s'ha produït un error en obrir el fitxer de grups ombra\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr ""
+#~ "%s: s'ha produït un error en afegir la nova entrada de contrasenya\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr ""
+#~ "%s: s'ha produït un error en afegir la nova entrada de contrasenya ombra\n"
+
+#~ 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"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: s'ha produït un error en actualitzar l'entrada de grup\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: s'ha produït un error en actualitzar l'entrada de grup\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: no es pot obrir el fitxer de grups\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: no es pot obrir el fitxer de grups ombra\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: s'ha produït un error en eliminar l'entrada de contrasenya\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr ""
+#~ "%s: s'ha produït un error en eliminar l'entrada de contrasenya ombra\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: l'usuari %s no existeix\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: s'ha produït un error en afegir la nova entrada de grup\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: l'UID %lu no és únic\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: s'ha produït un error en canviar l'entrada de contrasenya\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: s'ha produït un error en eliminar l'entrada de contrasenya\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr ""
+#~ "%s: s'ha produït un error en eliminar l'entrada de contrasenya ombra\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: no es pot obtenir un GID únic\n"
 
@@ -2140,18 +2380,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " a «%.100s»"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: no es poden blocar els fitxers, intenteu-ho més tard\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: línia %d: no es pot crear el UID\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/cs.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-03-18 00:08+0100\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\n"
 "PO-Revision-Date: 2008-05-25 12:30+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -57,6 +57,9 @@
 msgid "  Choose a new password."
 msgstr "  Zvolte nové heslo."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Platnost vašeho hesla vyprší za %ld dnů.\n"
@@ -68,7 +71,12 @@
 msgstr "Platnost vašeho hesla vyprší dnes."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "TTY %s nelze změnit"
 
 msgid "Environment overflow\n"
@@ -95,12 +103,16 @@
 "%d selhání od posledního přihlášení.\n"
 "Poslední: %s na %s.\n"
 
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+#| msgid "Can't get unique GID (no more available GIDs)\n"
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "Nelze získat jedinečné GID (další GID již nejsou dostupná)\n"
+
+#, fuzzy, c-format
+#| msgid "Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "Nelze získat jedinečné UID (další UID již nejsou dostupná)\n"
 
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "Nelze získat jedinečné GID (další GID již nejsou dostupná)\n"
-
 msgid "Too many logins.\n"
 msgstr "Příliš mnoho přihlášení.\n"
 
@@ -190,9 +202,18 @@
 msgstr "Nelze zjistit vaše uživatelské jméno."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: došla paměť\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "volání malloc(%d) selhalo\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "Ne\n"
+
 msgid "Password: "
 msgstr "Heslo: "
 
@@ -200,6 +221,11 @@
 msgid "%s's Password: "
 msgstr "Heslo uživatele %s:"
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: položka je příliš dlouhá\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -295,42 +321,34 @@
 msgstr "%s: Přístup odmítnut.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: vaše uživatelské jméno nelze zjistit.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 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"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: soubory nelze zamknout. Zkuste to opět později.\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: soubor s hesly nelze otevřít\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: soubor %s nelze otevřít\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: soubor se stínovými hesly nelze zamknout\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: chyba rozdvojení: %s\n"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: soubor se stínovými hesly nelze otevřít\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: selhalo odevzdání privilegií (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: soubor se stínovými hesly nelze přepsat\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: soubor s hesly nelze přepsat\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: soubor s hesly nelze aktualizovat\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: soubor se stínovými hesly nelze aktualizovat\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"
 
@@ -338,9 +356,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: uživatel „%s“ neexistuje\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -367,57 +386,27 @@
 msgid "Full Name"
 msgstr "Celé jméno"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tCelé jméno: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Číslo místnosti"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tČíslo místnosti: %s\n"
-
 msgid "Work Phone"
 msgstr "Telefon do zaměstnání"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tTelefon do zaměstnání: %s\n"
-
 msgid "Home Phone"
 msgstr "Telefon domů"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tTelefon domů: %s\n"
-
 msgid "Other"
 msgstr "Ostatní"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Nelze změnit ID na root.\n"
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Nelze zamknout soubor s hesly; zkuste to později.\n"
-
-msgid "Cannot open the password file.\n"
-msgstr "Soubor s hesly nelze otevřít.\n"
-
 #, c-format
-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: name with non-ASCII characters: '%s'\n"
 msgstr "%s: jméno obsahuje jiné znaky než ASCII: „%s“\n"
 
@@ -449,9 +438,10 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: „%s“ obsahuje chybné znaky\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: vaše uživatelské jméno nelze zjistit.\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: uživatel „%s“ neexistuje\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -500,8 +490,9 @@
 msgid "%s: invalid numeric argument '%s'\n"
 msgstr "%s: chybný numerický argument „%s“\n"
 
-#, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+#, fuzzy, c-format
+#| msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: přepínač %s je povolen POUZE s přepínačem %s\n"
 
 #, c-format
@@ -513,30 +504,6 @@
 msgstr "%s: nepodporovaný typ šifry: %s\n"
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: soubor se skupinami nelze zamknout\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: soubor se skupinami nelze otevřít\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: soubor stínových skupin nelze zamknout\n"
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-msgstr "%s: soubor se stínovými hesly nelze otevřít\n"
-
-#, c-format
-msgid "%s: error updating gshadow file\n"
-msgstr "%s: chyba při aktualizaci souboru se stínovými skupinami\n"
-
-#, c-format
-msgid "%s: error updating group file\n"
-msgstr "%s: chyba při aktualizaci souboru se skupinami\n"
-
-#, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: řádek %d je příliš dlouhý\n"
 
@@ -544,38 +511,25 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: řádek %d: chybí nové heslo\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: řádek %d: neznámá skupina %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: skupina %s neexistuje\n"
 
-#, c-format
-msgid "%s: line %d: cannot update group entry\n"
-msgstr "%s: řádek %d: položku nelze aktualizovat skupinu\n"
+#, fuzzy, c-format
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: uživatel „%s“ neexistuje\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: chyba při aktualizaci souboru se stínovými hesly\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: chyba při aktualizaci souboru s hesly\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"
@@ -594,8 +548,9 @@
 msgid "Login Shell"
 msgstr "Přihlašovací shell"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Nemůžete změnit shell pro %s.\n"
 
 #, c-format
@@ -606,24 +561,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: chybná položka %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "Shell %s je neplatný.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Použití: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: neznámý uživatel\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -653,11 +624,16 @@
 "                                nebo -l)\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Uživatel    Chyb     Maximum Poslední                 Na\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds zbývá]"
 
 #, c-format
@@ -665,78 +641,71 @@
 msgstr " [%lds zámek]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Neznámý uživatel: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Použití: %s [r|-R] skupina\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a uživatel] skupina\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d uživatel] skupina\n"
+#, fuzzy, c-format
+#| msgid "Unknown user or range: %s\n"
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Neznámý uživatel nebo rozsah: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A uživatel,...] [-M uživatel,...] skupina\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: soubor %s nelze otevřít\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M uživatel,...] skupina\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: přepínač -A funguje pouze se stínovými hesly skupin\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: nelze získat zámek\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, 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"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Heslo uživatele %s nelze změnit.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: nelze otevřít soubor\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: přepínač -A funguje pouze se stínovými hesly skupin\n"
 
-#, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: nelze přepsat soubor\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: skupina %s neexistuje\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: nelze přepsat soubor se stínovými hesly\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: chyba rozdvojení: %s\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"
-
-#, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: nelze zavřít soubor\n"
-
-#, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: soubor se stínovými hesly nelze zavřít\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Měním heslo skupiny %s\n"
 
@@ -753,9 +722,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Zkuste to později\n"
 
-msgid "Who are you?\n"
-msgstr "Kdo jste?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Přidávám uživatele %s do skupiny %s\n"
@@ -764,9 +730,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: uživatel „%s“ neexistuje\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -801,111 +768,92 @@
 "  -r, --system                  vytvoří systémový účet\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: chyba při přidávání nové skupiny\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s není platným jménem skupiny\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: soubor se skupinami nelze přepsat\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group ID '%s'\n"
+msgstr "%s: neplatné jméno skupiny „%s“\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: soubor se stínovými skupinami nelze přepsat\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: soubor se skupinami nelze zamknout\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: soubor se skupinami nelze otevřít\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: soubor se stínovými skupinami nelze zamknout\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: soubor se stínovými skupinami nelze otevřít\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: parametr -K vyžaduje argument typu KLÍČ=HODNOTA\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 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"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "Člen již ve skupině existuje\n"
 
-#, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: nelze vytvořit skupinu\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "Použití: groupdel skupina\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: chyba při odstraňování položky ze souboru se skupinami\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: adresář %s nelze na %s přejmenovat\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: chyba při odstraňování položky ze souboru se stínovými skupinami\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: nelze změnit primární skupinu uživatele „%s“ z %u na %u.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: primární skupinu uživatele nelze odstranit.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: skupina %s neexistuje\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: skupina %s je NIS skupinou\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: skupina „%s“ je NIS skupinou.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s je hlavním NIS serverem\n"
 
-msgid "Member already exists\n"
-msgstr "Člen již ve skupině existuje\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: uživatel %s je NIS uživatelem\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Člen určený pro odstranění nebyl nalezen\n"
+#, fuzzy, c-format
+#| msgid "%s: Out of memory. Cannot update the group database.\n"
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: Nedostatek paměti. Nelze aktualizovat databázi skupin.\n"
 
-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"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
 
-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 "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "Je vyžadován skupinový přístup\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Nejste vlastníkem aktuální skupiny\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "Ověření pomocí PAM selhalo\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Soubor se skupinami nelze zamknout\n"
-
-msgid "Unable to open group file\n"
-msgstr "Soubor se skupinami nelze otevřít\n"
-
-msgid "Cannot close group file\n"
-msgstr "Soubor se skupinami nelze zavřít\n"
-
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -929,43 +877,20 @@
 "  -p, --password HESLO          pro SKUPINU použije šifrované heslo\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s se v /etc/group nenalézá\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "%s: neplatné jméno skupiny „%s“\n"
 
 #, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u není jedinečné gid\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: skupina %s je NIS skupinou\n"
 
 #, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: jméno %s není jedinečné\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: neznámý uživatel %s\n"
 
 #, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: soubor s hesly nelze přepsat\n"
-
-#, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: soubor s hesly nelze zamknout\n"
-
-#, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: soubor s hesly nelze otevřít\n"
-
-#, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-"%s: nelze změnit primární skupinu uživatele „%s“ z %u na %u, protože se "
-"nenachází v souboru passwd.\n"
-
-#, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: nelze změnit primární skupinu uživatele „%s“ z %u na %u.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr ""
 "Použití: %s [-r] [-s] [soubor se skupinami [soubor se stínovými skupinami]]\n"
@@ -978,18 +903,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s a -r nejsou slučitelné\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: soubor %s nelze zamknout\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "chybná položka v souboru se skupinami"
 
@@ -1004,6 +917,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "jméno skupiny „%s“ je chybné\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "jméno skupiny „%s“ je chybné\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "skupina %s: uživatel %s neexistuje\n"
@@ -1016,18 +934,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "žádný záznam v souboru se skupinami %s neodpovídá\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "přidat skupinu „%s“ do %s ?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: položku %s souboru se stínovými hesly nelze aktualizovat\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: položku skupiny %s nelze odstranit\n"
-
 msgid "invalid shadow group file entry"
 msgstr "chybná položka v souboru se stínovými skupinami"
 
@@ -1054,30 +965,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: žádné změny nebyly provedeny\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: soubor se stínovými skupinami nelze zamknout\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Použití: groupdel skupina\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: soubor se stínovými skupinami nelze otevřít\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Použití: groupdel skupina\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: položku stínové skupiny %s nelze odstranit\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: soubor %s nelze aktualizovat\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: soubor se stínovými hesly nelze aktualizovat\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: soubor s hesly nelze aktualizovat\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: soubor se stínovými hesly skupin nelze smazat\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Použití: id [-a]\n"
 
@@ -1107,6 +1009,10 @@
 "  -u, --user ÚČET               zobrazí záznamy lastlogu pro uživatele ÚČET\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Uživatel         Port     Z                Naposledy"
 
@@ -1117,14 +1023,14 @@
 msgstr "**Nikdy nebyl přihlášen**"
 
 #, c-format
-msgid "Unknown user or range: %s\n"
-msgstr "Neznámý uživatel nebo rozsah: %s\n"
-
-#, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: neočekávaný argument: %s\n"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Použití: %s [-p] [jméno]\n"
 
@@ -1221,6 +1127,11 @@
 "Čas přihlášení vypršel\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Použití: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Použití: newgrp [-] [skupina]\n"
 
@@ -1234,14 +1145,11 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: chyba rozdvojení: %s\n"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "neznámé UID: %u\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: uživatel „%s“ neexistuje\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "neznámé GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "příliš mnoho skupin\n"
 
@@ -1259,63 +1167,21 @@
 "  -r, --system                  vytvoří systémové účty\n"
 "%s\n"
 
-#, c-format
-msgid "%s: group ID `%s' is not valid\n"
-msgstr "%s: skupinové ID „%s“ není platné\n"
-
-#, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "%s: neplatné jméno skupiny „%s“\n"
-
-#, c-format
-msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: skupina %s je stínovou skupinou, ale neexistuje v /etc/group\n"
 
-#, c-format
-msgid ""
-"%s: group %s created, failure during the creation of the corresponding "
-"gshadow group\n"
-msgstr ""
-"%s: skupina %s byla vytvořena, ale nastala chyba při vytváření odpovídající "
-"stínové skupiny\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: chybné uživatelské jméno „%s“\n"
 
 #, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: uživatelské ID „%s“ není platné\n"
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: chybné uživatelské jméno „%s“\n"
 
 #, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: uživatel „%s“ neexistuje\n"
-
-#, c-format
-msgid "%s: invalid user name `%s'\n"
-msgstr "%s: neplatné uživatelské jméno „%s“\n"
-
-#, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: soubor /etc/passwd nelze zamknout.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: soubor /etc/shadow nelze zamknout.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: soubor /etc/group nelze zamknout.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: soubor /etc/gshadow nelze zamknout.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1332,9 +1198,10 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: řádek %d: nelze vytvořit skupinu\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: řádek %d: uživatele %s nelze nalézt\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: uživatel „%s“ neexistuje\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1352,6 +1219,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: řádek %d: položku nelze aktualizovat\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1364,15 +1259,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1442,14 +1337,14 @@
 msgid "The password for %s cannot be changed yet.\n"
 msgstr "Heslo uživatele %s nelze zatím změnit.\n"
 
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: došla paměť\n"
-
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 "%s odemknutí uživatele by znamenalo mít účet bez hesla.\n"
 "Pro odemknutí tohoto uživatelského účtu byste měli nastavit heslo pomocí "
@@ -1496,16 +1391,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "chybné uživatelské jméno '%s'\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "chybné uživatelské jméno '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "uživatel %s: skupina %u neexistuje\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "uživatel %s: adresář %s neexistuje\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "uživatel %s: program %s neexistuje\n"
 
 #, c-format
@@ -1516,10 +1419,6 @@
 msgid "add user '%s' in %s? "
 msgstr "přidat uživatele „%s“ do %s? "
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: položku souboru s hesly pro uživatele %s nelze aktualizovat\n"
-
 msgid "invalid shadow password file entry"
 msgstr "chybná položka v souboru se stínovými hesly"
 
@@ -1530,34 +1429,26 @@
 msgid "user %s: last password change in the future\n"
 msgstr "uživatel %s: poslední změna hesla v budoucnosti\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: soubor s hesly nelze zamknout\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: soubor %s nelze otevřít\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: soubor s hesly nelze otevřít\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Použití: id\n"
 
-#, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: položku souboru s hesly pro uživatele %s nelze odstranit\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not authorized to change the password of %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr "%s: %s není oprávněn změnit heslo %s\n"
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: soubor se stínovými hesly nelze aktualizovat\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Použití: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: soubor s hesly nelze aktualizovat\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: položku pro uživatele %s nelze aktualizovat\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: nemůžete smazat soubor se stínovými hesly\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Z tohoto účtu je přístup k su ZAKÁZÁN.\n"
 
@@ -1624,6 +1515,16 @@
 "%s: %s\n"
 "(Ignoruji)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: ověření pomocí PAM selhalo\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Nejste oprávněn používat su %s\n"
+
 msgid "No shell\n"
 msgstr "Žádný shell\n"
 
@@ -1649,14 +1550,6 @@
 msgstr "Vstupuji do režimu údržby systému"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: neznámé GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: neznámá skupina %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: nemohu vytvořit nový soubor s implicitními hodnotami\n"
 
@@ -1676,6 +1569,46 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: zadáno příliš mnoho skupin (max %d).\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: useradd [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
+#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#| "                                home directory\n"
+#| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#| "account\n"
+#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#| "  -D, --defaults                print or save modified default useradd\n"
+#| "                                configuration\n"
+#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#| "EXPIRE_DATE\n"
+#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#| "                                user account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#| "  -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"
+#| "  -N, --no-user-group           do not create a group with the same name "
+#| "as\n"
+#| "                                the user\n"
+#| "  -o, --non-unique              allow create user with duplicate\n"
+#| "                                (non-unique) UID\n"
+#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#| "                                account\n"
+#| "  -r, --system                  create a system account\n"
+#| "  -s, --shell SHELL             the login shell for the new user account\n"
+#| "  -u, --uid UID                 force use the UID for the new user "
+#| "account\n"
+#| "  -U, --user-group              create a group with the same name as the "
+#| "user\n"
+#| "\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1696,10 +1629,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1749,14 +1684,6 @@
 "\n"
 
 #, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: Nedostatek paměti. Nelze aktualizovat databázi skupin.\n"
-
-#, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: Nedostatek paměti. Nelze aktualizovat databázi stínových skupin.\n"
-
-#, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: chybný základní adresář „%s“\n"
 
@@ -1793,50 +1720,14 @@
 msgstr "%s: volby %s a %s kolidují\n"
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: chybné uživatelské jméno „%s“\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: soubor s hesly nelze přepsat\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: soubor se stínovými hesly nelze přepsat\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: soubor se stínovými hesly nelze zamknout\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: soubor se stínovými hesly nelze otevřít\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: chyba při zamykání souboru se skupinami\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: chyba při otevírání souboru se skupinami\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: chyba při zamykání souboru se stínovými hesly\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: chyba při otevírání souboru se stínovými hesly\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: chyba při vytváření nové položky v souboru s hesly\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: chyba při vytváření nové položky v souboru se stínovými hesly\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: adresář %s nelze vytvořit\n"
 
@@ -1852,8 +1743,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Nastavuji oprávnění k poštovní schránce"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: uživatel %s již existuje\n"
 
 #, c-format
@@ -1867,11 +1759,16 @@
 msgid "%s: can't create user\n"
 msgstr "%s: nelze vytvořit uživatele\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u není jedinečné\n"
 
 #, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: nelze vytvořit skupinu\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1879,10 +1776,6 @@
 "%s: varování: domovský adresář již existuje.\n"
 "Nekopíruji do něj žádné soubory z adresáře skel.\n"
 
-#, c-format
-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"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1903,53 +1796,28 @@
 "                                schránku\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: položku souboru se skupinami nelze aktualizovat\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Nemohu odstranit skupinu %s, která je primární skupinou jiného "
 "uživatele.\n"
 
 #, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: chyba při aktualizaci stínové skupiny\n"
-
-#, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: soubor se skupinami nelze otevřít\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: soubor se stínovými skupinami nelze otevřít\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: chyba při odstraňování položky ze souboru s hesly\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: chyba při odstraňování položky ze souboru se stínovými hesly\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: uživatel %s je právě přihlášen\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: varování: nemohu smazat "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: vlastníkem %s není %s, nemažu jej\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: varování: nemohu smazat "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: uživatel %s neexistuje\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: uživatel %s je NIS uživatelem\n"
 
@@ -2013,10 +1881,23 @@
 "  -U, --unlock                  odemkne uživatelský účet\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: chyba při přidávání nové stínové skupiny\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+"%s odemknutí uživatele by znamenalo mít účet bez hesla.\n"
+"Pro odemknutí tohoto uživatelského účtu byste měli nastavit heslo pomocí "
+"usermod -p.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: uživatel %s již existuje\n"
+
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: žádné přepínače\n"
@@ -2029,23 +1910,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr "%s: přepínače -L, -p a -U se navzájem vylučují\n"
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: uid %lu není jedinečné\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "Člen již ve skupině existuje\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: chyba při změně položky v souboru s hesly\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: chyba při odstraňování položky ze souboru s hesly\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: chyba při odstraňování položky ze souboru se stínovými hesly\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: adresář %s již existuje\n"
 
@@ -2066,6 +1936,14 @@
 msgstr "%s: adresář %s nelze na %s přejmenovat\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: varování: vlastníkem %s není %s\n"
 
@@ -2075,11 +1953,15 @@
 msgid "failed to rename mailbox"
 msgstr "chyba při přejmenovávání poštovní schránky"
 
-#, c-format
+#, fuzzy, 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"
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 "Změnili jste %s.\n"
 "Z důvodu konzistence byste měli změnit i %s.\n"
@@ -2106,10 +1988,16 @@
 "  -s, --shadow                  upraví databázi shadow nebo gshadow\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: selhalo odevzdání privilegií (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s je beze změny\n"
@@ -2124,6 +2012,420 @@
 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: can't lock password file\n"
+#~ msgstr "%s: soubor s hesly nelze zamknout\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: soubor s hesly nelze otevřít\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: soubor se stínovými hesly nelze zamknout\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: soubor se stínovými hesly nelze otevřít\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: soubor se stínovými hesly nelze přepsat\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: soubor s hesly nelze přepsat\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: soubor s hesly nelze aktualizovat\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: soubor se stínovými hesly nelze aktualizovat\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tCelé jméno: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tČíslo místnosti: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tTelefon do zaměstnání: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tTelefon domů: %s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr "Nelze zamknout soubor s hesly; zkuste to později.\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Soubor s hesly nelze otevřít.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: soubor se skupinami nelze zamknout\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: soubor se skupinami nelze otevřít\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: soubor stínových skupin nelze zamknout\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: soubor se stínovými hesly nelze otevřít\n"
+
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: chyba při aktualizaci souboru se stínovými skupinami\n"
+
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: chyba při aktualizaci souboru se skupinami\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: řádek %d: neznámá skupina %s\n"
+
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: řádek %d: položku nelze aktualizovat skupinu\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: soubor se stínovými hesly nelze zamknout\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: chyba při aktualizaci souboru se stínovými hesly\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: chyba při aktualizaci souboru s hesly\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: řádek %d: neznámý uživatel %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: řádek %d: položku v souboru s hesly nelze aktualizovat\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: neznámý uživatel\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Neznámý uživatel: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Použití: %s [r|-R] skupina\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a uživatel] skupina\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d uživatel] skupina\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A uživatel,...] [-M uživatel,...] skupina\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M uživatel,...] skupina\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: nelze získat zámek\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: nelze získat zámek pro soubor se stínovými hesly\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: nelze otevřít soubor\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: nelze přepsat soubor\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: nelze přepsat soubor se stínovými hesly\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: nelze odemknout soubor\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: nelze aktualizovat položku\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: nelze aktualizovat položku souboru se stínovými hesly\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "neznámá skupina %s\n"
+
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: nelze zavřít soubor\n"
+
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: soubor se stínovými hesly nelze zavřít\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Kdo jste?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: neznámý člen %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: chyba při přidávání nové skupiny\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: soubor se skupinami nelze přepsat\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: soubor se stínovými skupinami nelze přepsat\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: soubor se skupinami nelze zamknout\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: soubor se skupinami nelze otevřít\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: soubor se stínovými skupinami nelze zamknout\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: soubor se stínovými skupinami nelze otevřít\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u není jedinečné\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: chyba při odstraňování položky ze souboru se skupinami\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr ""
+#~ "%s: chyba při odstraňování položky ze souboru se stínovými skupinami\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: primární skupinu uživatele nelze odstranit.\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Člen určený pro odstranění nebyl nalezen\n"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "Je vyžadován skupinový přístup\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Nejste vlastníkem aktuální skupiny\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "Ověření pomocí PAM selhalo\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Soubor se skupinami nelze zamknout\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Soubor se skupinami nelze otevřít\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Soubor se skupinami nelze zavřít\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s se v /etc/group nenalézá\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u není jedinečné gid\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: jméno %s není jedinečné\n"
+
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: soubor s hesly nelze přepsat\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: soubor s hesly nelze zamknout\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: soubor s hesly nelze otevřít\n"
+
+#~ msgid ""
+#~ "%s: cannot change the primary group of user '%s' from %u to %u, since it "
+#~ "is not in the passwd file.\n"
+#~ msgstr ""
+#~ "%s: nelze změnit primární skupinu uživatele „%s“ z %u na %u, protože se "
+#~ "nenachází v souboru passwd.\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: soubor %s nelze zamknout\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: položku %s souboru se stínovými hesly nelze aktualizovat\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: položku skupiny %s nelze odstranit\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: soubor se stínovými skupinami nelze zamknout\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: soubor se stínovými skupinami nelze otevřít\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: položku stínové skupiny %s nelze odstranit\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: soubor se stínovými hesly nelze aktualizovat\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: soubor s hesly nelze aktualizovat\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: soubor se stínovými hesly skupin nelze smazat\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "neznámé UID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "neznámé GID: %lu\n"
+
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: skupinové ID „%s“ není platné\n"
+
+#~ msgid ""
+#~ "%s: group %s created, failure during the creation of the corresponding "
+#~ "gshadow group\n"
+#~ msgstr ""
+#~ "%s: skupina %s byla vytvořena, ale nastala chyba při vytváření "
+#~ "odpovídající stínové skupiny\n"
+
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: uživatelské ID „%s“ není platné\n"
+
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: neplatné uživatelské jméno „%s“\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: soubor /etc/passwd nelze zamknout.\n"
+
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: soubor /etc/shadow nelze zamknout.\n"
+
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: soubor /etc/group nelze zamknout.\n"
+
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: soubor /etc/gshadow nelze zamknout.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: soubory nelze otevřít\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: chyba při aktualizaci souborů\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: řádek %d: uživatele %s nelze nalézt\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: položku souboru s hesly pro uživatele %s nelze aktualizovat\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: soubor s hesly nelze zamknout\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: soubor s hesly nelze otevřít\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: položku souboru s hesly pro uživatele %s nelze odstranit\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: soubor se stínovými hesly nelze aktualizovat\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: soubor s hesly nelze aktualizovat\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: položku pro uživatele %s nelze aktualizovat\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: nemůžete smazat soubor se stínovými hesly\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: neznámé GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: neznámá skupina %s\n"
+
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr ""
+#~ "%s: Nedostatek paměti. Nelze aktualizovat databázi stínových skupin.\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: soubor s hesly nelze přepsat\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: soubor se stínovými hesly nelze přepsat\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: soubor se stínovými hesly nelze zamknout\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: soubor se stínovými hesly nelze otevřít\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: chyba při zamykání souboru se skupinami\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: chyba při otevírání souboru se skupinami\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: chyba při zamykání souboru se stínovými hesly\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: chyba při otevírání souboru se stínovými hesly\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: chyba při vytváření nové položky v souboru s hesly\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: chyba při vytváření nové položky v souboru se stínovými hesly\n"
+
+#~ 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"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: položku souboru se skupinami nelze aktualizovat\n"
+
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: chyba při aktualizaci stínové skupiny\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: soubor se skupinami nelze otevřít\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: soubor se stínovými skupinami nelze otevřít\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: chyba při odstraňování položky ze souboru s hesly\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: chyba při odstraňování položky ze souboru se stínovými hesly\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: uživatel %s neexistuje\n"
+
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: chyba při přidávání nové stínové skupiny\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: uid %lu není jedinečné\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: chyba při změně položky v souboru s hesly\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: chyba při odstraňování položky ze souboru s hesly\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: chyba při odstraňování položky ze souboru se stínovými hesly\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: nelze získat jedinečné GID\n"
 
@@ -2133,18 +2435,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " na „%.100s“"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: soubory nelze zamknout. Zkuste to opět později.\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: řádek %d: nelze vytvořit UID\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/da.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -56,6 +56,9 @@
 msgid "  Choose a new password."
 msgstr "  Vælg en ny adgangskode."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Din adgangskode udløber om %ld dage.\n"
@@ -67,7 +70,12 @@
 msgstr "Din adgangskode udløber i dag."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Kunne ikke ændre tty %s"
 
 msgid "Environment overflow\n"
@@ -91,14 +99,14 @@
 "%d fejl siden sidste logind.\n"
 "Sidst var %s, %s.\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "%s: kan ikke få unik GID\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
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s: kan ikke få unik GID\n"
-
 msgid "Too many logins.\n"
 msgstr "Logget på for mange gange.\n"
 
@@ -188,9 +196,18 @@
 msgstr "Kan ikke afgøre dit tty-navn."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: hukommelse opbrugt\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) mislykkedes\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "Nej\n"
+
 msgid "Password: "
 msgstr "Adgangskode: "
 
@@ -198,6 +215,11 @@
 msgid "%s's Password: "
 msgstr "%s's adgangskode: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: felter for lange\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -295,42 +317,33 @@
 msgstr "%s: Adgang nægtet.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Kan ikke afgøre dit brugernavn.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM-autentifikation mislykkedes\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: kan ikke låse adgangskodefil\n"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: kan ikke låse filer. Prøv igen senere\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: kan ikke åbne adgangskodefil\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: kan ikke åbne filen %s\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: kan ikke låse skyggeadgangskodefil\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: fejl under spaltning: %s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: kan ikke åbne skyggeadgangskodefil\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: kunne ikke afgive rettigheder (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: kan ikke genskrive skyggeadgangskodefilen\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: kan ikke genskrive adgangskodefilen\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: kan ikke opdatere adgangskodefil\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: kan ikke opdatere skyggeadgangskodefil\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: skyggeadgangskodefilen findes ikke\n"
 
@@ -338,9 +351,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: brugeren %s eksisterer ikke\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -366,57 +379,27 @@
 msgid "Full Name"
 msgstr "Fulde navn"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tFulde navn: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Rum-nummer"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tRum-nummer: %s\n"
-
 msgid "Work Phone"
 msgstr "Arbejdstelefon"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tArbejdstelefon: %s\n"
-
 msgid "Home Phone"
 msgstr "Hjemmetelefon"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tHjemmetelefon: %s\n"
-
 msgid "Other"
 msgstr "Andet"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Kan ikke ændre ID til root.\n"
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Kan ikke låse adgangskodefilen; forsøg igen senere.\n"
-
-msgid "Cannot open the password file.\n"
-msgstr "Kan ikke åbne adgangskodefilen.\n"
-
 #, c-format
-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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -449,9 +432,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' indeholder ugyldige tegn\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Kan ikke afgøre dit brugernavn.\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: brugeren %s eksisterer ikke\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -500,7 +483,7 @@
 msgstr "%s: ugyldigt numerisk parameter '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: flaget -a er KUN tilladt sammen med -G\n"
 
 #, c-format
@@ -512,30 +495,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: kan ikke låse gruppefilen\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: kan ikke åbne gruppefilen\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: Kan ikke låse gshadow-filen\n"
-
-#, c-format
-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"
 
@@ -543,38 +502,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: linje %d: mangler ny adgangskode\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: linje %d: ukendt gruppe %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: gruppen %s eksisterer ikke\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: brugeren %s eksisterer ikke\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: fejl under opdatering af skyggefil\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: fejl under opdatering af adgangskodefil\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"
@@ -595,8 +540,9 @@
 msgid "Login Shell"
 msgstr "Login-skal"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Du kan ikke ændre skal for %s.\n"
 
 #, c-format
@@ -607,24 +553,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Ugyldig linje: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s er en ugyldig skal.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Brug: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: ukendt bruger\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -654,11 +616,16 @@
 "                                brugeren med LOGIND\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Logind      Fejl     Maksimum Seneste                 Tid\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds tilbage]"
 
 #, c-format
@@ -666,76 +633,67 @@
 msgstr " [%lds lås]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Ukendt bruger: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Brug: %s [-r|-R] gruppe\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "      %s [-a bruger] gruppe\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "      %s [-d bruger] gruppe\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Ukendt bruger: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "      %s [-A bruger,...] [-M bruger,...] gruppe\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: kan ikke åbne filen %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "      %s [-M bruger,...] gruppe\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: der kræves skyggeadgangskoder for -A\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: Kan ikke opnå lås\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: Kan ikke opnå skyggelås\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Adgangskoden for %s kan ikke ændres.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: kan ikke åbne fil\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: der kræves skyggeadgangskoder for -A\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: kan ikke åbne fil\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: gruppen %s eksisterer ikke\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: Kan ikke åbne skyggefilen\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: fejl under spaltning: %s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -754,9 +712,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Prøv igen senere\n"
 
-msgid "Who are you?\n"
-msgstr "Hvem er du?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Tilføjer brugeren %s til gruppen %s\n"
@@ -765,9 +720,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: brugeren %s eksisterer ikke\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -802,112 +757,89 @@
 "                                (ikke-unikt) GID\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: fejl under tilføjelse af gruppelinje\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s er ikke et gyldigt gruppenavn\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: kan ikke genskrive gruppefil\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "ugyldigt gruppenavn '%s'\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: kan ikke genskrive skyggegruppefil\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: kan ikke låse gruppefil\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: kan ikke åbne gruppefil\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: kan ikke låse skyggegruppefil\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: kan ikke åbne skyggegruppefil\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K kræver NAVN=VÆRDI\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 msgstr "%s: gruppen %s eksisterer\n"
 
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u er ikke unikt\n"
-
 #, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: kan ikke oprette %s\n"
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "Medlemmet eksisterer allerede\n"
 
 msgid "Usage: groupdel group\n"
 msgstr "Brug: groupdel gruppe\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: fejl under fjernelse af gruppelinje\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: kan ikke omdøbe mappen %s til %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: fejl under fjernelse af skyggegruppelinje\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: kan ikke ændre brugeren'%s' på NIS-klienten.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: kan ikke fjerne brugerens primære gruppe.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: gruppen %s eksisterer ikke\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: gruppen %s er en NIS-gruppe\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: gruppen '%s' er en NIS-gruppe.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s er NIS-masteren\n"
 
-msgid "Member already exists\n"
-msgstr "Medlemmet eksisterer allerede\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: brugeren %s er en NIS-bruger\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Medlemmet, der skulle slettes, blev ikke fundet\n"
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: løbet tør for hukommelse i update_group\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
-"Brug: groupmems -a brugernavn| -d brugernavn | -D | -l [-g gruppenavn]\n"
 
-msgid "Only root can add members to different groups\n"
-msgstr "Kun root kan tilføje medlemmer til andre grupper\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "Gruppeadgang kræves\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Ikke primær ejer af den aktuelle gruppe\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "PAM-autentifikation mislykkedes for\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Kan ikke låse gruppefil\n"
-
-msgid "Unable to open group file\n"
-msgstr "Kan ikke åbne gruppefil\n"
-
-msgid "Cannot close group file\n"
-msgstr "Kan ikke lukke gruppefil\n"
-
 #, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
@@ -931,41 +863,19 @@
 "                                efter GRUPPE\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s blev ikke fundet i /etc/group\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u er ikke en unik GID\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s er ikke et unikt navn\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: kan ikke genskrive adgangskodefilen\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "ugyldigt gruppenavn '%s'\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: kunne ikke låse adgangskodefilen\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: gruppen %s er en NIS-gruppe\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: kunne ikke åbne adgangskodefilen\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: ukendt bruger %s\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: kan ikke ændre brugeren'%s' på NIS-klienten.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Brug: %s [-r] [-s] [gruppe [gskygge]]\n"
 
@@ -977,18 +887,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s og -r er ikke kompatible\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: kan ikke låse filen %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "ugyldig gruppefils-linje"
 
@@ -1003,6 +901,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "ugyldigt gruppenavn '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "ugyldigt gruppenavn '%s'\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "gruppe %s: ingen bruger %s\n"
@@ -1015,18 +918,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "ingen tilsvarende gruppefilslinje i %s\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "tilføj gruppen %s i %s?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: kan ikke opdatere skygge-linjen for %s\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: kan ikke opdatere linjen for gruppen %s\n"
-
 msgid "invalid shadow group file entry"
 msgstr "ugyldig skyggegruppefils-linje"
 
@@ -1053,30 +949,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: ingen ændringer\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: kan ikke låse skyggegruppefilen\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Brug: groupdel gruppe\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: kan ikke åbne skyggegruppefilen\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Brug: groupdel gruppe\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: kan ikke fjerne skyggegruppen %s\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: kan ikke opdatere filen %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: kan ikke opdatere skyggegruppefilen\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: kan ikke opdatere gruppefilen\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: kan ikke slette skyggegruppefilen\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Brug: id [-a]\n"
 
@@ -1109,6 +996,10 @@
 "                                det angivne LOGIND\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Brugernavn       Port     Fra              Seneste"
 
@@ -1118,15 +1009,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Brug: %s [-p] [navn]\n"
 
@@ -1223,6 +1114,11 @@
 "logind-tid overskredet\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Brug: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Brug: newgrp [-] [gruppe]\n"
 
@@ -1237,14 +1133,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: fejl under spaltning: %s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "ukendt UID: %u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: brugeren %s eksisterer ikke\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "ukendt GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "for mange grupper\n"
 
@@ -1258,60 +1150,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: gruppen %s eksisterer ikke\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "ugyldigt gruppenavn '%s'\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: ugyldigt brugernavn '%s'\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: brugeren %s eksisterer ikke\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: brugeren %s eksisterer ikke\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: ugyldigt brugernavn '%s'\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: kan ikke låse /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: kan ikke låse /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: kan ikke låse /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: kan ikke låse /etc/passwd.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1327,9 +1178,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: linje %d: kan ikke oprette GID\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: linje %d: kan ikke finde brugeren %s\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: brugeren %s eksisterer ikke\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1347,6 +1198,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: linje %d: kan ikke opdatere posten\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1359,15 +1238,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1438,13 +1317,10 @@
 msgstr "Adgangskoden for %s kan ikke ændres.\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: hukommelse opbrugt\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1487,16 +1363,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "ugyldigt brugernavn'%s'\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "ugyldigt brugernavn'%s'\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "bruger %s: ingen gruppe %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "bruger %s: mappen %s eksisterer ikke\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "bruger %s: programmet %s eksisterer ikke\n"
 
 #, c-format
@@ -1507,10 +1391,6 @@
 msgid "add user '%s' in %s? "
 msgstr "tilføj brugeren '%s' i %s? "
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: kan ikke opdatere adgangskodelinjen for  %s\n"
-
 msgid "invalid shadow password file entry"
 msgstr "ugyldig linje i skyggeadgangskodefil"
 
@@ -1521,34 +1401,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "bruger %s: seneste ændring af adgangskoden skete i fremtiden\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: kan ikke låse adgangskodefil\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: kan ikke åbne filen %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: kan ikke åbne adgangskodefil\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Brug: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: kan ikke fjerne skyggelinjen for %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: kan ikke opdatere skyggefilen\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Brug: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: kan ikke opdatere adgangskodefilen\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: kan ikke opdatere linje for brugeren %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: kan ikke slette skyggeadgangskodefilen\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Adgang til at udføre su til den konto er NÆGTET.\n"
 
@@ -1615,6 +1486,16 @@
 "%s: %s\n"
 "(Ignoreret)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: PAM-autentifikation mislykkedes\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Du er ikke autoriseret til at 'su %s'\n"
+
 msgid "No shell\n"
 msgstr "Ingen skal\n"
 
@@ -1640,14 +1521,6 @@
 msgstr "Går i systemvedligeholdelses-tilstand"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: ukendt GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: ukendt gruppe %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: kan ikke oprette ny standardværdi-fil\n"
 
@@ -1688,10 +1561,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1734,14 +1609,6 @@
 "                                den nye brugerkonto\n"
 "\n"
 
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: løbet tør for hukommelse i update_group\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: løbet tør for hukommelse i update_gshadow\n"
-
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: ugyldig grundmappe '%s'\n"
@@ -1779,50 +1646,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: ugyldigt brugernavn '%s'\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: kan ikke genskrive adgangskodefilen\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: kan ikke genskrive skyggeadgangskodefilen\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: kunne ikke låse skyggeadgangskodefilen\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: kunne ikke åbne skyggeadgangskodefilen\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: fejl under låsning af gruppefil\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: fejl under åbning af gruppefil\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: fejl under låsning af skyggegruppefil\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: fejl under åbning af skyggegruppefil\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: fejl under tilføjelse af ny adgangskodelinje\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: fejl under tilføjelse af ny skyggeadgangskode-linje\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: kan ikke oprette mappen %s\n"
 
@@ -1838,8 +1669,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Indstiller postboks-filens rettigheder"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: brugeren %s eksisterer\n"
 
 #, c-format
@@ -1853,10 +1685,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s: kan ikke oprette %s\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u er ikke unikt\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: kan ikke oprette %s\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1865,10 +1702,6 @@
 "%s: advarsel: hjemmemappen eksisterer allerede.\n"
 "Kopierer ikke nogen filer til den fra skelet-mappen.\n"
 
-#, c-format
-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"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1888,52 +1721,27 @@
 "  -r, --remove                  fjern home-mappen og postkøen\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: fejl under opdatering af gruppelinje\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Kan ikke fjerne gruppen %s, som er primærgruppe for en anden bruger.\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: fejl under opdatering af gruppelinje\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: kan ikke åbne gruppefilen\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: kan ikke åbne skyggegruppefilen\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: fejl under sletning af adgangskodelinje\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: fejl under sletning af skyggeadgangskodelinje\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: brugeren %s er logget på\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: advarsel: kan ikke fjerne "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s ejes ikke af %s, fjerner ikke\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: advarsel: kan ikke fjerne "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: brugeren %s eksisterer ikke\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: brugeren %s er en NIS-bruger\n"
 
@@ -1998,9 +1806,16 @@
 "  -U, --unlock                  fjern lås fra brugerkontoen\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: fejl under tilføjelse af gruppelinje\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: brugeren %s eksisterer\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -2014,23 +1829,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: uid %lu er ikke unik\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "Medlemmet eksisterer allerede\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: fejl under ændring af adgangskodelinje\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: fejl under fjernelse af adgangskodelinje\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: fejl under fjernelse af skyggeadgangskodelinje\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: mappen %s eksisterer\n"
 
@@ -2051,6 +1855,14 @@
 msgstr "%s: kan ikke omdøbe mappen %s til %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: advarsel: %s ejes ikke af %s\n"
 
@@ -2064,7 +1876,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -2088,10 +1900,16 @@
 "  -s, --shadow                  ret shadow- eller gshadow-databasen\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: kunne ikke afgive rettigheder (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s er uændret\n"
@@ -2106,6 +1924,419 @@
 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: can't lock password file\n"
+#~ msgstr "%s: kan ikke låse adgangskodefil\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: kan ikke åbne adgangskodefil\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: kan ikke låse skyggeadgangskodefil\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: kan ikke åbne skyggeadgangskodefil\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: kan ikke genskrive skyggeadgangskodefilen\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: kan ikke genskrive adgangskodefilen\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: kan ikke opdatere adgangskodefil\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: kan ikke opdatere skyggeadgangskodefil\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tFulde navn: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tRum-nummer: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tArbejdstelefon: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tHjemmetelefon: %s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr "Kan ikke låse adgangskodefilen; forsøg igen senere.\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Kan ikke åbne adgangskodefilen.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: kan ikke låse gruppefilen\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: kan ikke åbne gruppefilen\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: Kan ikke låse gshadow-filen\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: Kan ikke åbne skyggefilen\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: fejl under opdatering af skyggefil\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: fejl under opdatering af gruppelinje\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: linje %d: ukendt gruppe %s\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: linje %d: kan ikke opdatere posten\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: Kan ikke låse skyggefilen\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: fejl under opdatering af skyggefil\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: fejl under opdatering af adgangskodefil\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: linje %d: ukendt bruger %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: linje %d: kan ikke opdatere adgangskodelinje\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: ukendt bruger\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Ukendt bruger: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Brug: %s [-r|-R] gruppe\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "      %s [-a bruger] gruppe\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "      %s [-d bruger] gruppe\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "      %s [-A bruger,...] [-M bruger,...] gruppe\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "      %s [-M bruger,...] gruppe\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: Kan ikke opnå lås\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: Kan ikke opnå skyggelås\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: kan ikke åbne fil\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: kan ikke genskrive fil\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: kan ikke genskrive skyggefil\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: kan ikke låse fil op\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: kan ikke opdatere linje\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: kan ikke opdatere skyggelinje\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "ukendt gruppe: %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: kan ikke åbne fil\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: Kan ikke åbne skyggefilen\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Hvem er du?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: ukendt medlem %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: fejl under tilføjelse af gruppelinje\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: kan ikke genskrive gruppefil\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: kan ikke genskrive skyggegruppefil\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: kan ikke låse gruppefil\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: kan ikke åbne gruppefil\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: kan ikke låse skyggegruppefil\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: kan ikke åbne skyggegruppefil\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u er ikke unikt\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: fejl under fjernelse af gruppelinje\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: fejl under fjernelse af skyggegruppelinje\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: kan ikke fjerne brugerens primære gruppe.\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Medlemmet, der skulle slettes, blev ikke fundet\n"
+
+#~ msgid ""
+#~ "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+#~ msgstr ""
+#~ "Brug: groupmems -a brugernavn| -d brugernavn | -D | -l [-g gruppenavn]\n"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "Kun root kan tilføje medlemmer til andre grupper\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "Gruppeadgang kræves\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Ikke primær ejer af den aktuelle gruppe\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "PAM-autentifikation mislykkedes for\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Kan ikke låse gruppefil\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Kan ikke åbne gruppefil\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Kan ikke lukke gruppefil\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s blev ikke fundet i /etc/group\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u er ikke en unik GID\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s er ikke et unikt navn\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: kan ikke genskrive adgangskodefilen\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: kunne ikke låse adgangskodefilen\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: kunne ikke åbne adgangskodefilen\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: kan ikke låse filen %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: kan ikke opdatere skygge-linjen for %s\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: kan ikke opdatere linjen for gruppen %s\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: kan ikke låse skyggegruppefilen\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: kan ikke åbne skyggegruppefilen\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: kan ikke fjerne skyggegruppen %s\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: kan ikke opdatere skyggegruppefilen\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: kan ikke opdatere gruppefilen\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: kan ikke slette skyggegruppefilen\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "ukendt UID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "ukendt GID: %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: gruppen %s eksisterer ikke\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: brugeren %s eksisterer ikke\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: ugyldigt brugernavn '%s'\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: kan ikke låse /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: kan ikke låse /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: kan ikke låse /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: kan ikke låse /etc/passwd.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: kan ikke åbne filer\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: fejl under opdatering af filerne\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: linje %d: kan ikke finde brugeren %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: kan ikke opdatere adgangskodelinjen for  %s\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: kan ikke låse adgangskodefil\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: kan ikke åbne adgangskodefil\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: kan ikke fjerne skyggelinjen for %s\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: kan ikke opdatere skyggefilen\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: kan ikke opdatere adgangskodefilen\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: kan ikke opdatere linje for brugeren %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: kan ikke slette skyggeadgangskodefilen\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: ukendt GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: ukendt gruppe %s\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: løbet tør for hukommelse i update_gshadow\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: kan ikke genskrive adgangskodefilen\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: kan ikke genskrive skyggeadgangskodefilen\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: kunne ikke låse skyggeadgangskodefilen\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: kunne ikke åbne skyggeadgangskodefilen\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: fejl under låsning af gruppefil\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: fejl under åbning af gruppefil\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: fejl under låsning af skyggegruppefil\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: fejl under åbning af skyggegruppefil\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: fejl under tilføjelse af ny adgangskodelinje\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: fejl under tilføjelse af ny skyggeadgangskode-linje\n"
+
+#~ 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"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: fejl under opdatering af gruppelinje\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: fejl under opdatering af gruppelinje\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: kan ikke åbne gruppefilen\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: kan ikke åbne skyggegruppefilen\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: fejl under sletning af adgangskodelinje\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: fejl under sletning af skyggeadgangskodelinje\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: brugeren %s eksisterer ikke\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: fejl under tilføjelse af gruppelinje\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: uid %lu er ikke unik\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: fejl under ændring af adgangskodelinje\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: fejl under fjernelse af adgangskodelinje\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: fejl under fjernelse af skyggeadgangskodelinje\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: kan ikke få unik GID\n"
 
@@ -2115,18 +2346,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " på '%.100s'"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: kan ikke låse filer. Prøv igen senere\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: linje %d: kan ikke oprette UID\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/de.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.1.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\n"
 "PO-Revision-Date: 2008-03-31 22:09+0100\n"
 "Last-Translator: Holger Wansing <linux at wansing-online.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -58,6 +58,9 @@
 msgid "  Choose a new password."
 msgstr "  Wählen Sie ein neues Passwort."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Ihr Passwort läuft in %ld Tagen ab.\n"
@@ -69,7 +72,12 @@
 msgstr "Ihr Passwort läuft heute ab."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "tty %s kann nicht geändert werden"
 
 msgid "Environment overflow\n"
@@ -93,12 +101,16 @@
 "%d Fehlversuche seit letzter Anmeldung.\n"
 "Der letzte war am %s auf %s.\n"
 
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+#| msgid "Can't get unique GID (no more available GIDs)\n"
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "Kann keine einmalige GID bekommen (keine GIDs mehr verfügbar)\n"
+
+#, fuzzy, c-format
+#| msgid "Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "Kann keine einmalige UID bekommen (keine UIDs mehr verfügbar)\n"
 
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "Kann keine einmalige GID bekommen (keine GIDs mehr verfügbar)\n"
-
 msgid "Too many logins.\n"
 msgstr "Zu viele Anmeldungen.\n"
 
@@ -192,9 +204,16 @@
 msgstr "Kann Ihren tty-Namen nicht feststellen."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: Speicher erschöpft\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) fehlgeschlagen\n"
 
+msgid "No"
+msgstr ""
+
 msgid "Password: "
 msgstr "Passwort: "
 
@@ -202,6 +221,11 @@
 msgid "%s's Password: "
 msgstr "Passwort von %s: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: Felder zu lang\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -299,42 +323,35 @@
 msgstr "%s: Zugriff verweigert.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Kann Ihren Benutzernamen nicht bestimmen.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM-Authentifizierung fehlgeschlagen\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: kann Passwortdatei nicht sperren\n"
+#, fuzzy, c-format
+#| msgid "Cannot lock the password file; try again later.\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr ""
+"Kann die Passwortdatei nicht sperren; versuchen Sie es später noch einmal.\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: Kann Passwortdatei nicht öffnen\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: Kann Datei %s nicht öffnen\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: Kann shadow-Passwortdatei nicht sperren\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: Fehler beim Fork: %s\n"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: Kann shadow-Passwortdatei nicht öffnen\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: Abgeben der Privilegien (%s) fehlgeschlagen\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: Kann die shadow-Passwortdatei nicht neu schreiben\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: Kann die Passwortdatei nicht neu schreiben\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: Kann Passwortdatei nicht aktualisieren\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: Kann shadow-Passwortdatei nicht aktualisieren\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: shadow-Passwortdatei ist nicht vorhanden\n"
 
@@ -342,9 +359,10 @@
 msgid "%s: failed to drop privileges (%s)\n"
 msgstr "%s: Abgeben der Privilegien (%s) fehlgeschlagen\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: Benutzer %s unbekannt\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: Benutzer »%s« ist nicht vorhanden\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -370,58 +388,27 @@
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tVollständiger Name: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Raumnummer"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tRaumnummer: %s\n"
-
 msgid "Work Phone"
 msgstr "Telefon geschäftlich"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tTelefon geschäftlich: %s\n"
-
 msgid "Home Phone"
 msgstr "Telefon privat"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tTelefon privat: %s\n"
-
 msgid "Other"
 msgstr "Sonstiges"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Kann ID nicht auf root ändern.\n"
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr ""
-"Kann die Passwortdatei nicht sperren; versuchen Sie es später noch einmal.\n"
-
-msgid "Cannot open the password file.\n"
-msgstr "Kann die Passwortdatei nicht öffnen.\n"
-
 #, c-format
-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 Passworteintrags.\n"
-
-msgid "Cannot commit password file changes.\n"
-msgstr "Kann Änderungen in der Passwortdatei nicht schreiben.\n"
-
-msgid "Cannot unlock the password file.\n"
-msgstr "Kann die Passwortdatei nicht entsperren.\n"
-
-#, c-format
 msgid "%s: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -454,9 +441,10 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: »%s« enthält ungültige Zeichen\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Kann Ihren Benutzernamen nicht bestimmen.\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: Benutzer »%s« ist nicht vorhanden\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -509,8 +497,9 @@
 msgid "%s: invalid numeric argument '%s'\n"
 msgstr "%s: Ungültiges numerisches Argument »%s«\n"
 
-#, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+#, fuzzy, c-format
+#| msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: %s ist NUR zusammen mit %s erlaubt\n"
 
 #, c-format
@@ -522,30 +511,6 @@
 msgstr "%s: Nicht unterstützte Verschlüsselungsmethode: %s\n"
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: Kann group-Datei nicht sperren\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: Kann group-Datei nicht öffnen\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: Kann die gshadow-Datei nicht sperren\n"
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-msgstr "%s: Kann die shadow-Datei nicht öffnen\n"
-
-#, c-format
-msgid "%s: error updating gshadow file\n"
-msgstr "%s: Fehler beim Aktualisieren der gshadow-Datei\n"
-
-#, c-format
-msgid "%s: error updating group file\n"
-msgstr "%s: Fehler beim Aktualisieren der Gruppendatei\n"
-
-#, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: Zeile %d: Zeile zu lang\n"
 
@@ -553,38 +518,25 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: Zeile %d: Neues Passwort fehlt\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: Zeile %d: Gruppe %s unbekannt\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: Gruppe %s existiert nicht\n"
 
-#, c-format
-msgid "%s: line %d: cannot update group entry\n"
-msgstr "%s: Zeile %d: Kann Gruppeneintrag nicht aktualisieren\n"
+#, fuzzy, c-format
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: Benutzer »%s« ist nicht vorhanden\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: Fehler beim Aktualisieren der shadow-Datei\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: Fehler beim Aktualisieren der Passwortdatei\n"
-
-#, c-format
-msgid "%s: line %d: unknown user %s\n"
-msgstr "%s: Zeile %d: Benutzer %s unbekannt\n"
-
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: Zeile %d: Kann Passworteintrag nicht aktualisieren\n"
-
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -603,8 +555,9 @@
 msgid "Login Shell"
 msgstr "Login-Shell"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Sie dürfen die Shell für %s nicht ändern.\n"
 
 #, c-format
@@ -615,24 +568,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Ungültiger Eintrag: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s ist eine ungültige Shell.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Aufruf: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: Unbekannter Benutzer\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -665,11 +634,16 @@
 "                                aufgerufen) für den Benutzerzugang LOGIN\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Fehlver. Maximum Letzter                  Auf\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds übrig]"
 
 #, c-format
@@ -677,78 +651,71 @@
 msgstr " [%lds Sperre]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Unbekannter Benutzer: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Aufruf: %s [-r|-R] Gruppe\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a Benutzer] Gruppe\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d Benutzer] Gruppe\n"
+#, fuzzy, c-format
+#| msgid "Unknown user or range: %s\n"
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Unbekannter Benutzer oder Bereich: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A Benutzer,...] [-M Benutzer,...] Gruppe\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: Kann Datei %s nicht öffnen\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M Benutzer,...] Gruppe\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: shadow-Gruppenpasswörter für -A erforderlich\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: Kann Sperre nicht bekommen\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: Kann Sperre für shadow nicht bekommen\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Das Passwort für %s kann nicht geändert werden.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: Kann Datei nicht öffnen\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: shadow-Gruppenpasswörter für -A erforderlich\n"
 
-#, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: Datei kann nicht neu geschrieben werden\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: Gruppe %s existiert nicht\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: shadow-Datei kann nicht neu geschrieben werden\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: Fehler beim Fork: %s\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"
-
-#, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: Kann Datei nicht schließen\n"
-
-#, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: Kann die shadow-Datei nicht schließen\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Ändere Passwort für die Gruppe %s\n"
 
@@ -765,9 +732,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Versuchen Sie es später noch einmal\n"
 
-msgid "Who are you?\n"
-msgstr "Wer sind Sie?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Füge Benutzer %s zu Gruppe %s hinzu\n"
@@ -776,9 +740,10 @@
 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: Gruppenmitglied %s unbekannt\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: Benutzer »%s« ist nicht vorhanden\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -815,113 +780,93 @@
 "  -r, --system                  erstelle eine Systemgruppe\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: Fehler beim Hinzufügen eines neuen Gruppeneintrags\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s ist kein gültiger Gruppenname\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: Kann group-Datei nicht neu schreiben\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group ID '%s'\n"
+msgstr "%s: Ungültiger Gruppenname »%s«\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: Kann shadow-group-Datei nicht neu schreiben\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: Kann group-Datei nicht sperren\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: Kann group-Datei nicht öffnen\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: Kann shadow-group-Datei nicht sperren\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: Kann shadow-group-Datei nicht öffnen\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K benötigt SCHLÜSSEL=WERT\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 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"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "Gruppenmitglied existiert bereits\n"
 
-#, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: Kann Gruppe nicht erzeugen\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "Aufruf: groupdel Gruppe\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: Fehler beim Entfernen des Gruppeneintrags\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: Kann das Verzeichnis %s nicht in %s umbenennen\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: Fehler beim Entfernen des shadow-Gruppeneintrags\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr ""
+"%s: Kann die primäre Gruppe des Benutzers »%s« nicht von %u nach %u ändern.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: Kann die primäre Gruppe des Benutzers nicht entfernen.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: Gruppe %s existiert nicht\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: Gruppe %s ist eine NIS-Gruppe\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: Die Gruppe »%s« ist eine NIS-Gruppe.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s ist der NIS-Master\n"
 
-msgid "Member already exists\n"
-msgstr "Gruppenmitglied existiert bereits\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: Benutzer %s ist ein NIS-Benutzer\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Zu entfernendes Gruppenmitglied konnte nicht gefunden werden\n"
+#, fuzzy, c-format
+#| msgid "%s: Out of memory. Cannot update the group database.\n"
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: Zu wenig Speicher. Kann group-Datenbank nicht aktualisieren.\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
-"Aufruf: groupmems -a Benutzername | -d Benutzername | -D | -l [-g "
-"Gruppenname]\n"
 
-msgid "Only root can add members to different groups\n"
-msgstr "Nur root kann Mitglieder zu verschiedenen Gruppen hinzufügen\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "Gruppenzugriff ist erforderlich\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Nicht der primäre Eigentümer der aktuellen Gruppe\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "PAM-Authentifizierung fehlgeschlagen für\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Kann group-Datei nicht sperren\n"
-
-msgid "Unable to open group file\n"
-msgstr "Kann group-Datei nicht öffnen\n"
-
-msgid "Cannot close group file\n"
-msgstr "Kann group-Datei nicht schließen\n"
-
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -947,44 +892,20 @@
 "  -p, --password PASSWORT       Verwende verschlüsseltes Passwort\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s in /etc/group nicht gefunden\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "%s: Ungültiger Gruppenname »%s«\n"
 
 #, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u ist keine einmalige GID\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: Gruppe %s ist eine NIS-Gruppe\n"
 
 #, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s ist kein einmaliger Name\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: Benutzer %s unbekannt\n"
 
 #, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: Kann passwd-Datei nicht neu schreiben\n"
-
-#, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: Kann Passwortdatei nicht sperren\n"
-
-#, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: Kann Passwortdatei nicht öffnen\n"
-
-#, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-"%s: Kann die primäre Gruppe des Benutzers »%s« nicht von %u nach %u ändern, "
-"da diese in der passwd-Datei nicht vorhanden ist.\n"
-
-#, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr ""
-"%s: Kann die primäre Gruppe des Benutzers »%s« nicht von %u nach %u ändern.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Aufruf: %s [-r] [-s] [Gruppe [gshadow]]\n"
 
@@ -996,18 +917,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s und -r sind nicht kompatibel\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: Kann Datei %s nicht sperren\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "Ungültiger Eintrag in group-Datei"
 
@@ -1022,6 +931,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "Ungültiger Gruppenname »%s«\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "Ungültiger Gruppenname »%s«\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "Gruppe %s: Kein Benutzer %s\n"
@@ -1034,18 +948,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "Kein passender group-Dateieintrag in %s\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "Gruppe »%s« zu %s hinzufügen?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: Kann shadow-Eintrag für %s nicht aktualisieren\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: Kann Gruppeneintrag %s nicht aktualisieren\n"
-
 msgid "invalid shadow group file entry"
 msgstr "Ungültiger Eintrag in shadow-group-Datei"
 
@@ -1072,30 +979,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: Keine Änderungen\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: Kann shadow-group-Datei nicht sperren\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Aufruf: groupdel Gruppe\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: Kann shadow-group-Datei nicht öffnen\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Aufruf: groupdel Gruppe\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: Kann shadow-Gruppe %s nicht entfernen\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: Kann Datei %s nicht aktualisieren\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: Kann shadow-group-Datei nicht aktualisieren\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: Kann group-Datei nicht aktualisieren\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: Kann shadow-group-Datei nicht löschen\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Aufruf: id [-a]\n"
 
@@ -1127,6 +1025,10 @@
 "  -u, --user LOGIN              Eintrag für Benutzer LOGIN anzeigen\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Benutzername     Port     Von              Letzter"
 
@@ -1137,14 +1039,14 @@
 msgstr "**Noch nie angemeldet**"
 
 #, c-format
-msgid "Unknown user or range: %s\n"
-msgstr "Unbekannter Benutzer oder Bereich: %s\n"
-
-#, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: unerwartetes Argument: %s\n"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Aufruf: %s [-p] [Name]\n"
 
@@ -1242,6 +1144,11 @@
 "Login-Zeit überschritten\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Aufruf: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Aufruf: newgrp [-] [Gruppe]\n"
 
@@ -1255,14 +1162,11 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: Fehler beim Fork: %s\n"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "Unbekannte UID: %u\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: Benutzer »%s« ist nicht vorhanden\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "Unbekannte GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "zu viele Gruppen\n"
 
@@ -1281,64 +1185,22 @@
 "  -r, --system                  erzeuge Systemzugänge\n"
 "%s\n"
 
-#, c-format
-msgid "%s: group ID `%s' is not valid\n"
-msgstr "%s: Gruppen-ID »%s« ist ungültig\n"
-
-#, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "%s: Ungültiger Gruppenname »%s«\n"
-
-#, c-format
-msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr ""
 "%s: Gruppe %s ist eine shadow-Gruppe, existiert aber nicht in /etc/group\n"
 
-#, c-format
-msgid ""
-"%s: group %s created, failure during the creation of the corresponding "
-"gshadow group\n"
-msgstr ""
-"%s: Gruppe %s erzeugt, jedoch Fehler beim Erzeugen der zugehörigen gshadow-"
-"Gruppe\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: Ungültiger Benutzername »%s«\n"
 
 #, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: Benutzer-ID »%s« ist ungültig\n"
-
-#, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: Benutzer »%s« ist nicht vorhanden\n"
-
-#, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: Ungültiger Benutzername »%s«\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: Kann /etc/passwd nicht sperren.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: Kann /etc/shadow nicht sperren.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: Kann /etc/group nicht sperren.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: Kann /etc/gshadow nicht sperren.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1356,9 +1218,10 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: Zeile %d: Kann Gruppe nicht erstellen\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: Zeile %d: Kann Benutzer %s nicht finden\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: Benutzer »%s« ist nicht vorhanden\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1376,6 +1239,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: Zeile %d: Kann Eintrag nicht aktualisieren\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1388,15 +1279,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1471,14 +1362,14 @@
 msgid "The password for %s cannot be changed yet.\n"
 msgstr "Das Passwort für %s kann noch nicht geändert werden.\n"
 
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: Speicher erschöpft\n"
-
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 "%s: diesen Benutzer zu entsperren würde zu einem Benutzerzugang ohne\n"
 "Passwort führen. Sie sollten mit usermod -p ein Passwort setzen, um diesen\n"
@@ -1525,16 +1416,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "Ungültiger Benutzername »%s«\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "Ungültiger Benutzername »%s«\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "Benutzer %s: Keine Gruppe %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "Benutzer %s: Verzeichnis %s nicht vorhanden\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "Benutzer %s: Programm %s nicht vorhanden\n"
 
 #, c-format
@@ -1545,10 +1444,6 @@
 msgid "add user '%s' in %s? "
 msgstr "Füge Benutzer »%s« zu %s hinzu? "
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: Kann passwd-Eintrag für %s nicht aktualisieren\n"
-
 msgid "invalid shadow password file entry"
 msgstr "Ungültiger shadow-Passwortdateieintrag"
 
@@ -1559,34 +1454,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "Benutzer %s: Letzte Passwortänderung liegt in der Zukunft\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: Kann passwd-Datei nicht sperren\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: Kann Datei %s nicht öffnen\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: Kann passwd-Datei nicht öffnen\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Aufruf: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: Kann shadow-Eintrag für %s nicht entfernen\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: Kann shadow-Datei nicht aktualisieren\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Aufruf: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: Kann passwd-Datei nicht aktualisieren\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: Kann Eintrag für Benutzer %s nicht aktualisieren\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: Kann shadow-Passwortdatei nicht löschen\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Zugriff mit su zu diesem Benutzerzugang VERWEIGERT.\n"
 
@@ -1653,6 +1539,16 @@
 "%s: %s\n"
 "(Ignoriert)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: PAM-Authentifizierung fehlgeschlagen\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "su %s ist Ihnen nicht erlaubt\n"
+
 msgid "No shell\n"
 msgstr "Keine Shell\n"
 
@@ -1678,14 +1574,6 @@
 msgstr "Wechsle in den Systemwartungsmodus"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: Unbekannte GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: Unbekannte Gruppe %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: Kann keine neue defaults-Datei erstellen\n"
 
@@ -1705,6 +1593,46 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: Zu viele Gruppen angegeben (max. %d).\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: useradd [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
+#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#| "                                home directory\n"
+#| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#| "account\n"
+#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#| "  -D, --defaults                print or save modified default useradd\n"
+#| "                                configuration\n"
+#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#| "EXPIRE_DATE\n"
+#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#| "                                user account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#| "  -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"
+#| "  -N, --no-user-group           do not create a group with the same name "
+#| "as\n"
+#| "                                the user\n"
+#| "  -o, --non-unique              allow create user with duplicate\n"
+#| "                                (non-unique) UID\n"
+#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#| "                                account\n"
+#| "  -r, --system                  create a system account\n"
+#| "  -s, --shell SHELL             the login shell for the new user account\n"
+#| "  -u, --uid UID                 force use the UID for the new user "
+#| "account\n"
+#| "  -U, --user-group              create a group with the same name as the "
+#| "user\n"
+#| "\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1725,10 +1653,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1786,14 +1716,6 @@
 "\n"
 
 #, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: Zu wenig Speicher. Kann group-Datenbank nicht aktualisieren.\n"
-
-#, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: Zu wenig Speicher. Kann shadow-Datenbank nicht aktualisieren.\n"
-
-#, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: Ungültiges Basis-Verzeichnis »%s«\n"
 
@@ -1830,50 +1752,14 @@
 msgstr "%s: Optionen %s und %s stehen im Konflikt zueinander\n"
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: Ungültiger Benutzername »%s«\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: Kann Passwortdatei nicht neu schreiben\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: Kann shadow-Passwortdatei nicht neu schreiben\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: Kann shadow-Passwortdatei nicht sperren\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: Kann shadow-Passwortdatei nicht öffnen\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: Fehler beim Sperren der group-Datei\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: Fehler beim Öffnen der group-Datei\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: Fehler beim Sperren der shadow-group-Datei\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: Fehler beim Öffnen der shadow-group-Datei\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: Fehler beim Hinzufügen eines neuen Passworteintrags\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: Fehler beim Hinzufügen eines neuen shadow-Passworteintrags\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: Kann Verzeichnis %s nicht erstellen\n"
 
@@ -1889,8 +1775,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Setze Zugriffsrechte der Mailboxdatei"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: Benutzer %s vorhanden\n"
 
 #, c-format
@@ -1904,11 +1791,16 @@
 msgid "%s: can't create user\n"
 msgstr "%s: Kann Benutzer nicht erstellen\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u ist nicht einmalig\n"
 
 #, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: Kann Gruppe nicht erzeugen\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1916,12 +1808,6 @@
 "%s: Warnung: Das Home-Verzeichnis existiert bereits.\n"
 "Es werden keine Dateien vom skel-Verzeichnis dorthin kopiert.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr ""
-"%s: Warnung: CREATE_HOME wird nicht unterstützt, verwenden Sie stattdessen -"
-"m.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1942,53 +1828,28 @@
 "  -r, --remove                  Entferne Home-Verzeichnis und Mail-Spool\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: Fehler beim Aktualisieren des Gruppeneintrags\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Kann Gruppe %s nicht entfernen; sie ist die primäre Gruppe eines anderen "
 "Benutzers.\n"
 
 #, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: Fehler beim Aktualisieren des shadow-Gruppeneintrags\n"
-
-#, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: Kann group-Datei nicht öffnen\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: Kann shadow-group-Datei nicht öffnen\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: Fehler beim Löschen des Passworteintrags\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: Fehler beim Löschen des shadow-Passworteintrags\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: Benutzer %s ist derzeit angemeldet\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: Warnung: Kann nicht löschen "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s nicht im Besitz von %s; wird nicht gelöscht\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: Warnung: Kann nicht löschen "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: Benutzer %s nicht vorhanden\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: Benutzer %s ist ein NIS-Benutzer\n"
 
@@ -2057,10 +1918,23 @@
 "  -U, --unlock                  Den Benutzerzugang entsperren\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: Fehler beim Hinzufügen eines neuen shadow-Gruppeneintrags\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+"%s: diesen Benutzer zu entsperren würde zu einem Benutzerzugang ohne\n"
+"Passwort führen. Sie sollten mit usermod -p ein Passwort setzen, um diesen\n"
+"Benutzerzugang zu entsperren.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: Benutzer %s vorhanden\n"
+
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: Keine Optionen angegeben\n"
@@ -2073,23 +1947,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr "%s: -L, -p und -U können nur exklusiv genutzt werden\n"
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: UID %lu ist nicht einmalig\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "Gruppenmitglied existiert bereits\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: Fehler beim Ändern des Passworteintrags\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: Fehler beim Entfernen des Passworteintrags\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: Fehler beim Entfernen des shadow-Passworteintrags\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: Verzeichnis %s vorhanden\n"
 
@@ -2110,6 +1973,14 @@
 msgstr "%s: Kann das Verzeichnis %s nicht in %s umbenennen\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: Warnung: %s nicht im Besitz von %s\n"
 
@@ -2119,11 +1990,15 @@
 msgid "failed to rename mailbox"
 msgstr "Fehler beim Umbenennen von mailbox"
 
-#, c-format
+#, fuzzy, 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"
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 "Sie haben %s verändert.\n"
 "Aus Konsistenzgründen müssen Sie unter Umständen auch %s ändern.\n"
@@ -2150,10 +2025,16 @@
 "  -s, --shadow                  shadow- oder gshadow-Datenbank editieren\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: Abgeben der Privilegien (%s) fehlgeschlagen\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s wurde nicht geändert\n"
@@ -2169,3 +2050,415 @@
 msgstr ""
 "%s: Wiederherstellung von %s fehlgeschlagen: %s\n"
 "(Ihre Änderungen befinden sich in %s)\n"
+
+#~ msgid "%s: can't lock password file\n"
+#~ msgstr "%s: kann Passwortdatei nicht sperren\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: Kann Passwortdatei nicht öffnen\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: Kann shadow-Passwortdatei nicht sperren\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: Kann shadow-Passwortdatei nicht öffnen\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: Kann die shadow-Passwortdatei nicht neu schreiben\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: Kann die Passwortdatei nicht neu schreiben\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: Kann Passwortdatei nicht aktualisieren\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: Kann shadow-Passwortdatei nicht aktualisieren\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tVollständiger Name: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tRaumnummer: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tTelefon geschäftlich: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tTelefon privat: %s\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Kann die Passwortdatei nicht öffnen.\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 Passworteintrags.\n"
+
+#~ msgid "Cannot commit password file changes.\n"
+#~ msgstr "Kann Änderungen in der Passwortdatei nicht schreiben.\n"
+
+#~ msgid "Cannot unlock the password file.\n"
+#~ msgstr "Kann die Passwortdatei nicht entsperren.\n"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: Kann group-Datei nicht sperren\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: Kann group-Datei nicht öffnen\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: Kann die gshadow-Datei nicht sperren\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: Kann die shadow-Datei nicht öffnen\n"
+
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: Fehler beim Aktualisieren der gshadow-Datei\n"
+
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: Fehler beim Aktualisieren der Gruppendatei\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: Zeile %d: Gruppe %s unbekannt\n"
+
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: Zeile %d: Kann Gruppeneintrag nicht aktualisieren\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: Kann die shadow-Datei nicht sperren\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: Fehler beim Aktualisieren der shadow-Datei\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: Fehler beim Aktualisieren der Passwortdatei\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: Zeile %d: Benutzer %s unbekannt\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: Zeile %d: Kann Passworteintrag nicht aktualisieren\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: Unbekannter Benutzer\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Unbekannter Benutzer: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Aufruf: %s [-r|-R] Gruppe\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a Benutzer] Gruppe\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d Benutzer] Gruppe\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A Benutzer,...] [-M Benutzer,...] Gruppe\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M Benutzer,...] Gruppe\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: Kann Sperre nicht bekommen\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: Kann Sperre für shadow nicht bekommen\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: Kann Datei nicht öffnen\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: Datei kann nicht neu geschrieben werden\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: shadow-Datei kann nicht neu geschrieben werden\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: Datei kann nicht entsperrt werden\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: Eintrag kann nicht aktualisiert werden\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: shadow-Eintrag kann nicht aktualisiert werden\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "Unbekannte Gruppe: %s\n"
+
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: Kann Datei nicht schließen\n"
+
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: Kann die shadow-Datei nicht schließen\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Wer sind Sie?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: Gruppenmitglied %s unbekannt\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: Fehler beim Hinzufügen eines neuen Gruppeneintrags\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: Kann group-Datei nicht neu schreiben\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: Kann shadow-group-Datei nicht neu schreiben\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: Kann group-Datei nicht sperren\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: Kann group-Datei nicht öffnen\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: Kann shadow-group-Datei nicht sperren\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: Kann shadow-group-Datei nicht öffnen\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u ist nicht einmalig\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: Fehler beim Entfernen des Gruppeneintrags\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: Fehler beim Entfernen des shadow-Gruppeneintrags\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: Kann die primäre Gruppe des Benutzers nicht entfernen.\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Zu entfernendes Gruppenmitglied konnte nicht gefunden werden\n"
+
+#~ msgid ""
+#~ "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+#~ msgstr ""
+#~ "Aufruf: groupmems -a Benutzername | -d Benutzername | -D | -l [-g "
+#~ "Gruppenname]\n"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "Nur root kann Mitglieder zu verschiedenen Gruppen hinzufügen\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "Gruppenzugriff ist erforderlich\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Nicht der primäre Eigentümer der aktuellen Gruppe\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "PAM-Authentifizierung fehlgeschlagen für\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Kann group-Datei nicht sperren\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Kann group-Datei nicht öffnen\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Kann group-Datei nicht schließen\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s in /etc/group nicht gefunden\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u ist keine einmalige GID\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s ist kein einmaliger Name\n"
+
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: Kann passwd-Datei nicht neu schreiben\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: Kann Passwortdatei nicht sperren\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: Kann Passwortdatei nicht öffnen\n"
+
+#~ msgid ""
+#~ "%s: cannot change the primary group of user '%s' from %u to %u, since it "
+#~ "is not in the passwd file.\n"
+#~ msgstr ""
+#~ "%s: Kann die primäre Gruppe des Benutzers »%s« nicht von %u nach %u "
+#~ "ändern, da diese in der passwd-Datei nicht vorhanden ist.\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: Kann Datei %s nicht sperren\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: Kann shadow-Eintrag für %s nicht aktualisieren\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: Kann Gruppeneintrag %s nicht aktualisieren\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: Kann shadow-group-Datei nicht sperren\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: Kann shadow-group-Datei nicht öffnen\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: Kann shadow-Gruppe %s nicht entfernen\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: Kann shadow-group-Datei nicht aktualisieren\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: Kann group-Datei nicht aktualisieren\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: Kann shadow-group-Datei nicht löschen\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "Unbekannte UID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "Unbekannte GID: %lu\n"
+
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: Gruppen-ID »%s« ist ungültig\n"
+
+#~ msgid ""
+#~ "%s: group %s created, failure during the creation of the corresponding "
+#~ "gshadow group\n"
+#~ msgstr ""
+#~ "%s: Gruppe %s erzeugt, jedoch Fehler beim Erzeugen der zugehörigen "
+#~ "gshadow-Gruppe\n"
+
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: Benutzer-ID »%s« ist ungültig\n"
+
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: Ungültiger Benutzername »%s«\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: Kann /etc/passwd nicht sperren.\n"
+
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: Kann /etc/shadow nicht sperren.\n"
+
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: Kann /etc/group nicht sperren.\n"
+
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: Kann /etc/gshadow nicht sperren.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: Kann Dateien nicht öffnen\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: Fehler beim Aktualisieren von Dateien\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: Zeile %d: Kann Benutzer %s nicht finden\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: Kann passwd-Eintrag für %s nicht aktualisieren\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: Kann passwd-Datei nicht sperren\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: Kann passwd-Datei nicht öffnen\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: Kann shadow-Eintrag für %s nicht entfernen\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: Kann shadow-Datei nicht aktualisieren\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: Kann passwd-Datei nicht aktualisieren\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: Kann Eintrag für Benutzer %s nicht aktualisieren\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: Kann shadow-Passwortdatei nicht löschen\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: Unbekannte GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: Unbekannte Gruppe %s\n"
+
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: Zu wenig Speicher. Kann shadow-Datenbank nicht aktualisieren.\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: Kann Passwortdatei nicht neu schreiben\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: Kann shadow-Passwortdatei nicht neu schreiben\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: Kann shadow-Passwortdatei nicht sperren\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: Kann shadow-Passwortdatei nicht öffnen\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: Fehler beim Sperren der group-Datei\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: Fehler beim Öffnen der group-Datei\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: Fehler beim Sperren der shadow-group-Datei\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: Fehler beim Öffnen der shadow-group-Datei\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: Fehler beim Hinzufügen eines neuen Passworteintrags\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: Fehler beim Hinzufügen eines neuen shadow-Passworteintrags\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr ""
+#~ "%s: Warnung: CREATE_HOME wird nicht unterstützt, verwenden Sie "
+#~ "stattdessen -m.\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: Fehler beim Aktualisieren des Gruppeneintrags\n"
+
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: Fehler beim Aktualisieren des shadow-Gruppeneintrags\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: Kann group-Datei nicht öffnen\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: Kann shadow-group-Datei nicht öffnen\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: Fehler beim Löschen des Passworteintrags\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: Fehler beim Löschen des shadow-Passworteintrags\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: Benutzer %s nicht vorhanden\n"
+
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: Fehler beim Hinzufügen eines neuen shadow-Gruppeneintrags\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: UID %lu ist nicht einmalig\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: Fehler beim Ändern des Passworteintrags\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: Fehler beim Entfernen des Passworteintrags\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: Fehler beim Entfernen des shadow-Passworteintrags\n"

Modified: upstream/trunk/po/dz.po
===================================================================
--- upstream/trunk/po/dz.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/dz.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -57,6 +57,9 @@
 msgid "  Choose a new password."
 msgstr "ཆོག་ཡིག་གསརཔ་ཅིག་གདམས།"
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་འདི་ ཉིནམ་%ldནང་ དུས་ཡོལ་ནི་མས།\n"
@@ -68,7 +71,12 @@
 msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་འདི་ ད་རིས་དུས་ཡོལ་ནི་མས།"
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "ཊི་ཊི་ཝའི་ %s བསྒྱུར་བཅོས་འབད་མ་ཚུགས།"
 
 msgid "Environment overflow\n"
@@ -94,14 +102,14 @@
 "མཇུག་མམ་གྱི་ནང་བསྐྱོད་འབད་ཞིནམ་ལས་ཚུར་ %dའཐུས་ཤོར་ཚུ།\n"
 "མཇུག་མམ་ %s འདི་ %s གུ་ཨིན་པས།\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "%s: ཐུན་མོང་མ་ཡིན་པའི་ ཇི་ཨའི་ཌི་འཐོབ་མི་ཚུགས།\n"
+
+#, fuzzy, c-format
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "%s: ཐུན་མོང་ ཡུ་ཨའི་ཌི་འཐོབ་མི་ཚུགས།\n"
 
-#, fuzzy
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s: ཐུན་མོང་མ་ཡིན་པའི་ ཇི་ཨའི་ཌི་འཐོབ་མི་ཚུགས།\n"
-
 msgid "Too many logins.\n"
 msgstr "ནང་བསྐྱོད་མང་དྲགས་པ།\n"
 
@@ -192,9 +200,18 @@
 msgstr "ཁྱོད་ཀྱི་ཊི་ཊི་ཝའི་མིང་ གཏན་འབེབས་བཟོ་མ་ཚུགས།"
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: དྲན་ཚད་ལས་བརྒལ་བ།\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "མེན།\n"
+
 msgid "Password: "
 msgstr "ཆོག་ཡིག་:"
 
@@ -202,6 +219,11 @@
 msgid "%s's Password: "
 msgstr "%s's ཆོག་ཡིག་:"
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: ས་སྒོ་ཚུ་རིང་དྲགས་པས།\n"
+
 #, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
@@ -298,42 +320,33 @@
 msgstr "%s: སྣང་བ་ཉན་མ་བཏུབ།\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: ཁྱོད་ཀྱི་ལག་ལེན་པའི་མིང་ གཏན་འབེབས་བཟོ་མི་ཚུགས།\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: པི་ཨེ་ཨེམ་ བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s:ཡིག་སྣོད་ཚུ་ལྡེ་མིག་བརྐྱབ་མི་ཚུགས་ དོ་རུང་ཤུལ་ལས་འབད་རྩོལ་བསྐྱེད།\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: ཡིག་སྣོད་%s ཁ་ཕྱེ་མི་ཚུགས།\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མ་ཚུགས།\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: ཁ་སྤེལ་བ་འཐུས་ཤོར་:%s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: ཁེ་དབང་(%s)ཚུ་བཀོག་ནིའི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ ལོག་འབྲི་མ་ཚུགས།\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ ལོག་འབྲི་མ་ཚུགས།\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ དུས་མཐུན་བཟོ་མ་ཚུགས།\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ དུས་མཐུན་བཟོ་མ་ཚུགས།\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་འདི་ མིན་འདུག\n"
 
@@ -341,9 +354,9 @@
 msgid "%s: failed to drop privileges (%s)\n"
 msgstr "%s: ཁེ་དབང་(%s)ཚུ་བཀོག་ནིའི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: མ་ཤེས་པའི་ལག་ལེན་པ་%s\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: ལག་ལེན་པ་  %sའདི་ མེད།\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -368,57 +381,27 @@
 msgid "Full Name"
 msgstr "མིང་ཆ་ཚང་།"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tམིང་ཆ་ཚང་: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "ཁང་མིག་ཨང་།"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tཁང་མིག་ཨང་: %s\n"
-
 msgid "Work Phone"
 msgstr "ལཱ་གི་བརྒྱུད་འཕྲིན།"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tལཱ་གི་བརྒྱུད་འཕྲིན་: %s\n"
-
 msgid "Home Phone"
 msgstr "ཁྱིམ་གྱི་བརྒྱུད་འཕྲིན།"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tཁྱིམ་གྱི་བརྒྱུད་འཕྲིན་: %s\n"
-
 msgid "Other"
 msgstr "གཞན།"
 
 msgid "Cannot change ID to root.\n"
 msgstr "རྩ་བ་ལུ་ ཨའི་ཌི་ བསྒྱུར་བཅོས་འབད་མི་ཚུགས།\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 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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -451,9 +434,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s:  '%s' ནང་ལུ་ ཁྲིམས་འགལ་ཡིག་ཆ་ཚུ་ཡོད།\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: ཁྱོད་ཀྱི་ལག་ལེན་པའི་མིང་ གཏན་འབེབས་བཟོ་མི་ཚུགས།\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: ལག་ལེན་པ་  %sའདི་ མེད།\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -502,7 +485,7 @@
 msgstr "%s: ནུས་མེད་ཨང་གྲངས་སྒྲུབ་རྟགས་ '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: -a ཟུར་རྟགས་འདི་ -Gཟུར་རྟགས་དང་གཅིག་ཁར་རྐྱངམ་ཅིག་ཆོག\n"
 
 #, c-format
@@ -514,30 +497,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: སྡེ་ཚན་ལྡེ་མིག་ ཁ་ཕྱེ་མི་ཚུགས།\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: gshadowཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
-
-#, c-format
-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"
 
@@ -545,38 +504,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: གྲལ་ཐིག་ %d: ཆོག་ཡིག་གསརཔ་ བརླག་སྟོར་ཞུགས་པ།\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: གྲལ་ཐིག་ %d: མ་ཤེས་པའི་སྡེ་ཚན་  %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: སྡེ་ཚན་ %sམེད།\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: ལག་ལེན་པ་  %sའདི་ མེད།\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་དུས་མཐུན་བཟོ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
-
-#, c-format
-msgid "%s: error updating password 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"
-
 #, fuzzy
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
@@ -598,8 +543,9 @@
 msgid "Login Shell"
 msgstr "ནང་བསྐྱོད་ཀྱི་ཤལ།"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "ཁྱོད་ཀྱིས་ %sགི་དོན་ལུ་ ཤལ་བསྒྱུར་བཅོས་མི་འབདཝ་འོང་།\n"
 
 #, c-format
@@ -610,17 +556,14 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: ནུས་མེད་ཀྱི་ཐོ་བཀོད་:%s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s འདི་ནུས་མེད་ཀྱི་ཤལ་ཨིན།\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "ལག་ལེན་: དུས་ཡོལ་{-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: མ་ཤེས་པའི་ལག་ལེན་པ།\n"
-
 #, fuzzy
 msgid ""
 "Usage: faillog [options]\n"
@@ -628,7 +571,7 @@
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -656,11 +599,16 @@
 "བཟོཝ་ཨིན།\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "ནང་བསྐྱོད་       མང་མཐའི་མཇུག་མཐའ་འཐུས་ཤོར་                   ཨཱོན། \n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds གཡོན་]"
 
 #, c-format
@@ -668,76 +616,67 @@
 msgstr " [%lds ལྡེ་མིག་]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "མ་ཤེས་པའི་ལག་ལེན་པ་:%s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "ལག་ལེན་པ་: %s [-r|-R] སྡེ་ཚན།\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a user] སྡེ་ཚན།\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d user] སྡེ་ཚན།\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "མ་ཤེས་པའི་ལག་ལེན་པ་:%s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A user,...] [-M user,...] སྡེ་ཚན།\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: ཡིག་སྣོད་%s ཁ་ཕྱེ་མི་ཚུགས།\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M user,...] སྡེ་ཚན།\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: -Aགི་དོན་ལུ་ གྱིབ་མའི་སྡེ་ཚན་ཆོག་ཡིག་ཚུ་དགོ\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: གྱིབ་མ་ལྡེ་མིག་ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "%sགི་དོན་ལུ་ ཆོག་ཡིག་སོར་མི་ཚུགས།\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: ཡིག་སྣོད་ཁ་ཕྱེ་མི་ཚུགས།\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: -Aགི་དོན་ལུ་ གྱིབ་མའི་སྡེ་ཚན་ཆོག་ཡིག་ཚུ་དགོ\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: ཡིག་སྣོད་ཁ་ཕྱེ་མི་ཚུགས།\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: སྡེ་ཚན་ %sམེད།\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: ཁ་སྤེལ་བ་འཐུས་ཤོར་:%s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -756,9 +695,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: དོ་རུང་ཤུལ་ལས་འབད་རྩོལ་བསྐྱེད།\n"
 
-msgid "Who are you?\n"
-msgstr "ཁྱོད་ག་སྨོ?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "སྡེ་ཚན་ %sལུ་ ལག་ལེན་པ་ %sཁ་སྐོང་འབད་དོ།\n"
@@ -767,9 +703,9 @@
 msgid "Removing user %s from group %s\n"
 msgstr "སྡེ་ཚན་ %sནང་ལས་ ལག་ལེན་པ་ %sརྩ་བསྐྲད་གཏང་དོ།\n"
 
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: མ་ཤེས་པའི་འཐུས་མི་ %s\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: ལག་ལེན་པ་  %sའདི་ མེད།\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -804,116 +740,89 @@
 " \t\t\t\t(ཐུན་མོང་པ་)ཇི་ཨའི་ཌི་དང་བཅས་ སྡེ་ཚན་གསར་བསྐྲུན་འབད་བཅུག\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: སྡེ་ཚན་ཐོ་བཀོད་གསརཔ་ཁ་སྐོང་འབད་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s འདི་ ནུས་ཅན་གྱི་སྡེ་ཚན་མིང་མེན་པས།\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ལོག་འབྲི་མི་ཚུགས།\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "ནུས་མེད་སྡེཚན་གྱི་མིང་ '%s'\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ ལོག་འབྲི་མི་ཚུགས།\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མ་ཚུགས།\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མ་ཚུགས།\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K གིས་ ལྡེ་མིག་=བེ་ལུ་ དགོཔ་ཨིན།\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 msgstr "%s: སྡེ་ཚན་ %sཡོདཔ་ཨིན།\n"
 
 #, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: ཇི་ཨའི་ཌི་ %uའདི་ ཐུན་མོང་པ་ཨིན།\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: %sགསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "ལག་ལེན་:groupdel སྡེ་ཚན།\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: སྡེ་ཚན་ཐོ་བཀོད་རྩ་བསྐྲད་གཏང་པའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: སྣོད་ཐོ་ %s འདི་ %s ལུ་ བསྐྱར་མིང་བཏགས་མི་ཚུགས།\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཐོ་བཀོད་རྩ་བསྐྲད་གཏང་པའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: ཨེན་ཨའི་ཨེསི་ ཞབས་ཏོག་སྤྱོད་མི་གུ་ ལག་ལེན་པ་ '%s' བསྒྱུར་བཅོས་འབད་མི་ཚུགས།\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: ལག་ལེན་པའི་གཞི་རིམ་སྡེ་ཚན་ རྩ་བསྐྲད་གཏང་མི་ཚུགས།\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: སྡེ་ཚན་ %sམེད།\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: སྡེ་ཚན་ %s འདི་ ཨེན་ཇི་ཨེསི་ སྡེ་ཚན་ཨིན།\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: སྡེ་ཚན་ '%s' འདི་ ཨེན་ཨའི་ཨེསི་སྡེ་ཚན་ཨིན།\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %sའདི་ ཨེན་ཇི་ཨེསི་ ཨམ་ཨིན།\n"
 
-msgid "Member already exists\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: ལག་ལེན་པ་ %sའདི་ ཨེན་ཨའི་ཨེསི་ ལག་ལེན་པ་ཅིག་ཨིན།\n"
 
-msgid "Member to remove could not be found\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: དུས་མཐུན་སྡེ་ཚན་ནང་ལུ་ དྲན་ཚད་ལས་བརྒལ་བ།\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
 
-msgid "Only root can add members to different groups\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
 msgstr ""
 
-msgid "Group access is required\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr ""
-
 #, fuzzy
-msgid "PAM authentication failed for\n"
-msgstr "%s: པི་ཨེ་ཨེམ་ བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
-
-#, fuzzy
-msgid "Unable to lock group file\n"
-msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མ་ཚུགས།\n"
-
-#, fuzzy
-msgid "Unable to open group file\n"
-msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།\n"
-
-#, fuzzy
-msgid "Cannot close group file\n"
-msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
-
-#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -939,41 +848,19 @@
 " \t\t\t\t(ཐུན་མོང་པ་)ཇི་ཨའི་ཌི་དང་བཅས་ སྡེ་ཚན་གསར་བསྐྲུན་འབད་བཅུག\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s འདི་ /etc/groupནང་མི་འཐོབ།\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u འདི་ ཐུན་མོང་གི་ཇི་ཨའི་ཌི་མེན།\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s འདི་ ཐུན་མོང་གི་མིང་མེན།\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་འདི་ ལོག་འབྲི་མི་བཏུབ།\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "ནུས་མེད་སྡེཚན་གྱི་མིང་ '%s'\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་འདི་ ལྡེ་མིག་བརྐྱབ་མ་ཚུགས།\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: སྡེ་ཚན་ %s འདི་ ཨེན་ཇི་ཨེསི་ སྡེ་ཚན་ཨིན།\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: མ་ཤེས་པའི་ལག་ལེན་པ་%s\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: ཨེན་ཨའི་ཨེསི་ ཞབས་ཏོག་སྤྱོད་མི་གུ་ ལག་ལེན་པ་ '%s' བསྒྱུར་བཅོས་འབད་མི་ཚུགས།\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "ལག་ལེན་:%s [-r] [-s] [group [gshadow]]\n"
 
@@ -985,18 +872,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s དང་ -r གཉིས་མཐུན་འགྱུར་ཅན་མེན།\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: ཡིག་སྣོད་ %sའདི་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-msgstr "%s: ཡིག་སྣོད་%s ཁ་ཕྱེ་མི་ཚུགས།\n"
-
-#, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: ཡིག་སྣོད་ %sའདི་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
-
 msgid "invalid group file entry"
 msgstr "ནུས་མེད་སྡེ་ཚན་ཐོ་བཀོད།"
 
@@ -1011,6 +886,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "ནུས་མེད་སྡེཚན་གྱི་མིང་ '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "ནུས་མེད་སྡེཚན་གྱི་མིང་ '%s'\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "སྡེ་ཚན་ %s: ལག་ལེན་པ་ %sམེད།\n"
@@ -1023,18 +903,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "%sནང་ མཐུན་སྒྲིག་སྡེ་ཚན་གྱི་ཡིག་སྣོད་ཐོ་བཀོད་མེད།\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "%sནང་ སྡེ་ཚན་ '%s' ཁ་སྐོང་འབད་ནི་ཨིན་ན?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: %sགི་དོན་ལུ་ གྱིབ་མའི་ཐོ་བཀོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: སྡེ་ཚན་ %sགི་དོན་ལུ་ ཐོ་བཀོད་དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
-
 msgid "invalid shadow group file entry"
 msgstr "ནུས་མེད་གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ཐོ་བཀོད།"
 
@@ -1061,30 +934,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: སོར་ནི་མེད།\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "ལག་ལེན་:groupdel སྡེ་ཚན།\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "ལག་ལེན་:groupdel སྡེ་ཚན།\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ %sབསྐྲད་གཏང་མི་ཚུགས།\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: ཡིག་སྣོད་ %sའདི་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ བཏོན་གཏང་མི་ཚུགས།\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "ལག་ལེནཔ་:id [-a]\n"
 
@@ -1117,6 +981,10 @@
 "lastlog དྲན་ཐོ་ དཔར་བསྐྲུན་འབད།\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "ལག་ལེན་པའི་མིང་         འདྲེན་ལམ་     ལས་             མཇུག་མཐའ།"
 
@@ -1126,15 +994,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "ལག་ལེན་: %s [-p] [མིང་]\n"
 
@@ -1231,6 +1099,11 @@
 "ནང་བསྐྱོད་དུས་ཚོད་ལྷག་ཡོདཔ།\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "ལག་ལེན་པ་: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "ལག་ལེན་: newgrp [-][ སྡེ་ཚན་]\n"
 
@@ -1245,14 +1118,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: ཁ་སྤེལ་བ་འཐུས་ཤོར་:%s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "མ་ཤེས་པའི་ ཇི་ཨའི་ཌི་:%u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: ལག་ལེན་པ་  %sའདི་ མེད།\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "མ་ཤེས་པའི་ ཇི་ཨའི་ཌི་:%lu\n"
-
 msgid "too many groups\n"
 msgstr "སྡེ་ཚན་མང་དྲགས་པ།\n"
 
@@ -1266,60 +1135,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: སྡེ་ཚན་ %sམེད།\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "ནུས་མེད་སྡེཚན་གྱི་མིང་ '%s'\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: ནུས་མེད་ལག་ལེན་པའི་མིང་ '%s'།\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: ལག་ལེན་པ་  %sའདི་ མེད།\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: ལག་ལེན་པ་  %sའདི་ མེད།\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: ནུས་མེད་ལག་ལེན་པའི་མིང་ '%s'།\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: /etc/passwd ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: /etc/passwd ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: /etc/passwd ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: /etc/passwd ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1335,9 +1163,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: གྲལ་ཐིག་ %d: ཇི་ཨའི་ཌི་ གསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: གྲལ་ཐིག་ %d:ལག་ལེན་པ་ %sའཚོལ་མི་ཚུགས།\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: ལག་ལེན་པ་  %sའདི་ མེད།\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1368,15 +1196,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1443,13 +1271,10 @@
 msgstr "%sགི་དོན་ལུ་ ཆོག་ཡིག་སོར་མི་ཚུགས།\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: དྲན་ཚད་ལས་བརྒལ་བ།\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1492,16 +1317,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "ནུས་མེད་ལག་ལེན་པའི་མིང་ '%s'\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "ནུས་མེད་ལག་ལེན་པའི་མིང་ '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "ལག་ལེན་པ་ %s: སྡེ་ཚན་ %uམེད།\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "ལག་ལེན་པ་ %s: སྣོད་ཐོ་ %s མེད།\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "ལག་ལེན་པ་ %s: ལས་རིམ་%s མེད།\n"
 
 #, c-format
@@ -1512,10 +1345,6 @@
 msgid "add user '%s' in %s? "
 msgstr "%sནང་ ལག་ལེན་པ་ '%s' ཁ་སྐོང་འབད་ནི་ཨིན་ན?"
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: %sགི་དོན་ལུ་ ཆོག་ཡིག་ཐོ་བཀོད་དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
-
 msgid "invalid shadow password file entry"
 msgstr "ནུས་མེད་གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ཐོ་བཀོད།"
 
@@ -1526,34 +1355,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "ལག་ལེན་པ་ %s: མ་འོངས་པ་ནང་ མཇུག་གི་ཆོག་ཡིག་སོར་ནི།\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: ཡིག་སྣོད་%s ཁ་ཕྱེ་མི་ཚུགས།\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "ལག་ལེན་པ་: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: %sགི་དོན་ལུ་ གྱིབ་མའི་ཐོ་བཀོད་ རྩ་བསྐྲད་གཏང་མི་ཚུགས།\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "ལག་ལེན་པ་: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: ལག་ལེན་པ་%sགི་དོན་ལུ་ ཐོ་བཀོད་དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ བཏོན་གཏང་མི་ཚུགས།\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "རྩིས་ཐོ་དེ་ལུ་ ཟླ་ལུ་འཛུལ་སྤྱོད་འབད་ནི་ ཉན་མ་བཏུབ་པས།\n"
 
@@ -1620,6 +1440,16 @@
 "%s: %s\n"
 "(སྣང་མེད་བཞག་ཡོདཔ་)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: པི་ཨེ་ཨེམ་ བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "ཁྱོད་ ཟླ་%sལུ་ དབང་སྤྲོད་མ་འབད།\n"
+
 msgid "No shell\n"
 msgstr "ཤལ་མེད།\n"
 
@@ -1645,14 +1475,6 @@
 msgstr "རིམ་ལུགས་རྒྱུན་སྐྱོང་ཐབས་ལམ་བཙུགས་དོ།"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: མ་ཤེས་པའི་ཇི་ཨའི་ཌི་ %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: མ་ཤེས་པའི་སྡེ་ཚན་ %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: སྔོན་སྒྲིག་ཡིག་སྣོད་གསརཔ་ གསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
 
@@ -1693,10 +1515,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1742,14 +1566,6 @@
 "འཐབ།\n"
 "\n"
 
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: དུས་མཐུན་སྡེ་ཚན་ནང་ལུ་ དྲན་ཚད་ལས་བརྒལ་བ།\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: དུས་མཐུན་gshadowནང་ལུ་ དྲན་ཚད་ལས་བརྒལ་བ།\n"
-
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: ནུས་མེད་གཞི་རྟེན་སྣོད་ཐོ་'%s'།\n"
@@ -1787,50 +1603,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: ནུས་མེད་ལག་ལེན་པའི་མིང་ '%s'།\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་འདི་ ལོག་འབྲི་མི་བཏུབ།\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་འདི་ ལོག་འབྲི་མི་བཏུབ།\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་འདི་ ལྡེ་མིག་བརྐྱབ་པའི་བསྒང་ལུ་འཛོལ་བ།\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ཁ་ཕྱེ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ལྡེ་མིག་བརྐྱབ་པའི་བསྒང་ལུ་ འཛོལབ།\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ཁ་ཕྱེ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: ཆོག་ཡིག་ཐོ་བཀོད་གསརཔ་ཁ་སྐོང་འབད་བའི་སྐབས་ལུ་འཛོལ་བ།\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཐོ་བཀོད་གསརཔ་ ཁ་སྐོང་འབད་བའི་སྐབས་ལུ་འཛོལ་བ།\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: སྣོད་ཐོ་ %s གསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
 
@@ -1845,8 +1625,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "ཡིག་སྒྲོམ་ཡིག་སྣོད་གྱི་གནང་བ་ གཞི་སྒྲིག་འབད་དོ།"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: ལག་ལེན་པ་ %sཡོདཔ་ཨིན།\n"
 
 #, c-format
@@ -1860,10 +1641,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s: %sགསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: ཡུ་ཨའི་ཌི་ %uའདི་ ཐུན་མོང་མེན།\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: %sགསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1872,10 +1658,6 @@
 "%s: ཉེན་བརྡ་:ཁྱིམ་གྱི་སྣོད་ཐོ་འདི་ཧེ་མ་ལས་རང་ཡོདཔ་ཨིན།\n"
 "འདི་ནང་ལུ་ སི་ཀེལ་སྣོད་ཐོ་ནང་ལས་ ཡིག་སྣོད་ག་ཅི་ཡང་འདྲ་བཤུས་མ་བརྐྱབ་ནི།\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr "%s: ཉེན་བརྡ་: CREATE_HOME རྒྱབ་སྐྱོར་མ་འབད་ དེའི་ཚབ་ལུ་ -mལག་ལེན་འཐབ་གནང་།\n"
-
 #, fuzzy
 msgid ""
 "Usage: userdel [options] LOGIN\n"
@@ -1896,52 +1678,27 @@
 "  -r, --remove\t\t\t  ཁྱིམ་གྱི་སྣོད་ཐོ་དང་ཡིག་འཕྲིན་འཕྲལ་གསོག་རྩ་བསྐྲད་གཏང་།\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: སྡེ་ཚན་ཐོ་བཀོད་དུས་མཐུན་བཟོ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: ལག་ལེན་པ་གཞན་གྱི་དོན་ལུ་ གཞི་རིམ་སྡེ་ཚན་ཅིག་ཨིན་མི་སྡེ་ཚན་ %sའདི་ རྩ་བསྐྲད་གཏང་མི་ཚུགས།\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: སྡེ་ཚན་ཐོ་བཀོད་དུས་མཐུན་བཟོ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: ཆོག་ཡིག་ཐོ་བཀོད་བཏོན་གཏང་པའི་སྐབས་ལུ་ འཛོལ་བ།\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་ཐོ་བཀོད་བོཏན་གཏང་པའི་སྐབས་ལུ་ འཛོལ་བ།\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: ལག་ལེན་པ་  %sའདི་ ད་ལྟོ་རང་ནང་བསྐྱོད་འབད་ཡི།\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: ཉེན་བརྡ་:རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %sགིས་བདག་དབང་མ་བཟུང་མི་ %sའདི་ རྩ་བསྐྲད་གཏང་ནི་མེད།\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: ཉེན་བརྡ་:རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: ལག་ལེན་པ་  %sའདི་ མེད།\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: ལག་ལེན་པ་ %sའདི་ ཨེན་ཨའི་ཨེསི་ ལག་ལེན་པ་ཅིག་ཨིན།\n"
 
@@ -2005,9 +1762,16 @@
 "  -U, --unlock\t\t\t  ལག་ལེན་པའི་རྩིས་ཐོ་ ལྡེ་མིག་ཕྱེ།\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: སྡེ་ཚན་ཐོ་བཀོད་གསརཔ་ཁ་སྐོང་འབད་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: ལག་ལེན་པ་ %sཡོདཔ་ཨིན།\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -2022,22 +1786,10 @@
 msgstr ""
 
 #, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s:  uid %luའདི་ ཐུན་མོང་ཨིན།\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr ""
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: ཆོག་ཡིག་ཐོ་བཀོད་སོར་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: ཆོག་ཡིག་ཐོ་བཀོད་རྩ་བསྐྲད་གཏང་པའི་བསྒང་ལུ་ འཛོལ་བ།\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཐོ་བཀོད་རྩ་བསྐྲད་གཏང་པའི་བསྒང་ལུ་ འཛོལ་བ།\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: སྣོད་ཐོ་  %sའདི་ཡོདཔཨིན།\n"
 
@@ -2059,6 +1811,14 @@
 msgstr "%s: སྣོད་ཐོ་ %s འདི་ %s ལུ་ བསྐྱར་མིང་བཏགས་མི་ཚུགས།\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: ཉེན་བརྡ་: %s འདི་ %s གིས་ བདག་དབང་བཟུངམ་མེན།\n"
 
@@ -2072,7 +1832,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 #, fuzzy
@@ -2097,10 +1857,16 @@
 "  -s, --shadow\t\t\t གྱིབ་མ་ ཡང་ན་  gshadowགནད་སྡུད་གཞི་རྟེན་ ཞུན་དག་འབད།\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: ཁེ་དབང་(%s)ཚུ་བཀོག་ནིའི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %sའདི་ བསྒྱུར་བཅོས་མ་འབད་བས།\n"
@@ -2115,6 +1881,406 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: %sསོར་ཆུད་འབད་མ་ཚུགས་: %s (ཁྱོད་ཀྱི་བསྒྱུར་བཅོས་ཚུ་ %sནང་ཨིན་)།\n"
 
+#~ msgid "%s: can't lock password file\n"
+#~ msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མ་ཚུགས།\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ ལོག་འབྲི་མ་ཚུགས།\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ ལོག་འབྲི་མ་ཚུགས།\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ དུས་མཐུན་བཟོ་མ་ཚུགས།\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ དུས་མཐུན་བཟོ་མ་ཚུགས།\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tམིང་ཆ་ཚང་: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tཁང་མིག་ཨང་: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tལཱ་གི་བརྒྱུད་འཕྲིན་: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tཁྱིམ་གྱི་བརྒྱུད་འཕྲིན་: %s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr "ཆོག་ཡིག་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས་ ཤུལ་ལས་ལོག་སྟེ་འབད་རྩོལ་སྐྱེད།\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "ཆོག་ཡིག་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: སྡེ་ཚན་ལྡེ་མིག་ ཁ་ཕྱེ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: gshadowཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་དུས་མཐུན་བཟོ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: སྡེ་ཚན་ཐོ་བཀོད་དུས་མཐུན་བཟོ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: གྲལ་ཐིག་ %d: མ་ཤེས་པའི་སྡེ་ཚན་  %s\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: གྲལ་ཐིག་ %d: ཐོ་བཀོད་དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་དུས་མཐུན་བཟོ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་དུས་མཐུན་བཟོ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: གྲལ་ཐིག་ %d: མ་ཤེས་པའི་ལག་ལེན་པ་%s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: གྲལ་ཐིག་ %d: ཆོག་ཡིག་ཐོ་བཀོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: མ་ཤེས་པའི་ལག་ལེན་པ།\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "མ་ཤེས་པའི་ལག་ལེན་པ་:%s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "ལག་ལེན་པ་: %s [-r|-R] སྡེ་ཚན།\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a user] སྡེ་ཚན།\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d user] སྡེ་ཚན།\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A user,...] [-M user,...] སྡེ་ཚན།\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M user,...] སྡེ་ཚན།\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: གྱིབ་མ་ལྡེ་མིག་ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: ཡིག་སྣོད་ཁ་ཕྱེ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: ཡིག་སྣོད་ལོག་འབྲི་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་ལོག་འབྲི་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: ཡིག་སྣོད་ལྡེ་མིག་ཕྱེ་མིཚུགས།\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: ཐོ་བཀོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: གྱིབ་མའི་ཐོ་བཀོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "མ་ཤེས་པའི་སྡེ་ཚན་:%s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: ཡིག་སྣོད་ཁ་ཕྱེ་མི་ཚུགས།\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "ཁྱོད་ག་སྨོ?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: མ་ཤེས་པའི་འཐུས་མི་ %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: སྡེ་ཚན་ཐོ་བཀོད་གསརཔ་ཁ་སྐོང་འབད་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ལོག་འབྲི་མི་ཚུགས།\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ ལོག་འབྲི་མི་ཚུགས།\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མ་ཚུགས།\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མ་ཚུགས།\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: ཇི་ཨའི་ཌི་ %uའདི་ ཐུན་མོང་པ་ཨིན།\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: སྡེ་ཚན་ཐོ་བཀོད་རྩ་བསྐྲད་གཏང་པའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཐོ་བཀོད་རྩ་བསྐྲད་གཏང་པའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: ལག་ལེན་པའི་གཞི་རིམ་སྡེ་ཚན་ རྩ་བསྐྲད་གཏང་མི་ཚུགས།\n"
+
+#, fuzzy
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "%s: པི་ཨེ་ཨེམ་ བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
+
+#, fuzzy
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མ་ཚུགས།\n"
+
+#, fuzzy
+#~ msgid "Unable to open group file\n"
+#~ msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།\n"
+
+#, fuzzy
+#~ msgid "Cannot close group file\n"
+#~ msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s འདི་ /etc/groupནང་མི་འཐོབ།\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u འདི་ ཐུན་མོང་གི་ཇི་ཨའི་ཌི་མེན།\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s འདི་ ཐུན་མོང་གི་མིང་མེན།\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་འདི་ ལོག་འབྲི་མི་བཏུབ།\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་འདི་ ལྡེ་མིག་བརྐྱབ་མ་ཚུགས།\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: ཡིག་སྣོད་ %sའདི་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: %sགི་དོན་ལུ་ གྱིབ་མའི་ཐོ་བཀོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: སྡེ་ཚན་ %sགི་དོན་ལུ་ ཐོ་བཀོད་དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ %sབསྐྲད་གཏང་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ བཏོན་གཏང་མི་ཚུགས།\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "མ་ཤེས་པའི་ ཇི་ཨའི་ཌི་:%u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "མ་ཤེས་པའི་ ཇི་ཨའི་ཌི་:%lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: སྡེ་ཚན་ %sམེད།\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: ལག་ལེན་པ་  %sའདི་ མེད།\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: ནུས་མེད་ལག་ལེན་པའི་མིང་ '%s'།\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: /etc/passwd ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: /etc/passwd ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: /etc/passwd ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: /etc/passwd ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: ཡིག་སྣོད་ཚུ་ཁ་ཕྱེ་མི་ཚུགས།\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: ཡིག་སྣོད་དུས་མཐུན་བཟོ་བའི་སྐབས་ལུ་ འཛོལ་བ།\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: གྲལ་ཐིག་ %d:ལག་ལེན་པ་ %sའཚོལ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: %sགི་དོན་ལུ་ ཆོག་ཡིག་ཐོ་བཀོད་དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: %sགི་དོན་ལུ་ གྱིབ་མའི་ཐོ་བཀོད་ རྩ་བསྐྲད་གཏང་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: གྱིབ་མའི་ཡིག་སྣོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: ལག་ལེན་པ་%sགི་དོན་ལུ་ ཐོ་བཀོད་དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ བཏོན་གཏང་མི་ཚུགས།\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: མ་ཤེས་པའི་ཇི་ཨའི་ཌི་ %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: མ་ཤེས་པའི་སྡེ་ཚན་ %s\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: དུས་མཐུན་gshadowནང་ལུ་ དྲན་ཚད་ལས་བརྒལ་བ།\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: ཆོག་ཡིག་ཡིག་སྣོད་འདི་ ལོག་འབྲི་མི་བཏུབ།\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་འདི་ ལོག་འབྲི་མི་བཏུབ།\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ ལྡེ་མིག་བརྐྱབ་མི་ཚུགས།\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་འདི་ ལྡེ་མིག་བརྐྱབ་པའི་བསྒང་ལུ་འཛོལ་བ།\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ཁ་ཕྱེ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ལྡེ་མིག་བརྐྱབ་པའི་བསྒང་ལུ་ འཛོལབ།\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ཁ་ཕྱེ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: ཆོག་ཡིག་ཐོ་བཀོད་གསརཔ་ཁ་སྐོང་འབད་བའི་སྐབས་ལུ་འཛོལ་བ།\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཐོ་བཀོད་གསརཔ་ ཁ་སྐོང་འབད་བའི་སྐབས་ལུ་འཛོལ་བ།\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr "%s: ཉེན་བརྡ་: CREATE_HOME རྒྱབ་སྐྱོར་མ་འབད་ དེའི་ཚབ་ལུ་ -mལག་ལེན་འཐབ་གནང་།\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: སྡེ་ཚན་ཐོ་བཀོད་དུས་མཐུན་བཟོ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: སྡེ་ཚན་ཐོ་བཀོད་དུས་མཐུན་བཟོ་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: གྱིབ་མའི་སྡེ་ཚན་ཡིག་སྣོད་ ཁ་ཕྱེ་མི་ཚུགས།\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: ཆོག་ཡིག་ཐོ་བཀོད་བཏོན་གཏང་པའི་སྐབས་ལུ་ འཛོལ་བ།\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཡིག་ཐོ་བཀོད་བོཏན་གཏང་པའི་སྐབས་ལུ་ འཛོལ་བ།\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: ལག་ལེན་པ་  %sའདི་ མེད།\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: སྡེ་ཚན་ཐོ་བཀོད་གསརཔ་ཁ་སྐོང་འབད་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s:  uid %luའདི་ ཐུན་མོང་ཨིན།\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: ཆོག་ཡིག་ཐོ་བཀོད་སོར་བའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: ཆོག་ཡིག་ཐོ་བཀོད་རྩ་བསྐྲད་གཏང་པའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: གྱིབ་མའི་ཆོག་ཡིག་ཐོ་བཀོད་རྩ་བསྐྲད་གཏང་པའི་བསྒང་ལུ་ འཛོལ་བ།\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: ཐུན་མོང་མ་ཡིན་པའི་ ཇི་ཨའི་ཌི་འཐོབ་མི་ཚུགས།\n"
 
@@ -2124,18 +2290,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr "'%.100s'གུ"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s:ཡིག་སྣོད་ཚུ་ལྡེ་མིག་བརྐྱབ་མི་ཚུགས་ དོ་རུང་ཤུལ་ལས་འབད་རྩོལ་བསྐྱེད།\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: གྲལ་ཐིག་ %d: ཡུ་ཨའི་ཌི་ གསར་བསྐྲུན་འབད་མི་ཚུགས།\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/el.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -58,6 +58,9 @@
 msgid "  Choose a new password."
 msgstr "   Επιλέξτε ένα νέο συνθηματικό."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Το συνθηματικό σας θα λήξει σε %ld μέρες.\n"
@@ -69,7 +72,12 @@
 msgstr "Το συνθηματικό σας θα λήξει σήμερα."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Αδυναμία αλλαγής tty %s"
 
 msgid "Environment overflow\n"
@@ -93,14 +101,14 @@
 "%d αποτυχίες από την τελευταία είσοδο.\n"
 " Η τελευταία ήταν στις %s στο %s.\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\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: Can't get unique UID (no more available UIDs)\n"
 msgstr "%s: αδυναμία λήψης μοναδικού UID\n"
 
-#, fuzzy
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s: αδυναμία λήψης μοναδικού GID\n"
-
 msgid "Too many logins.\n"
 msgstr "Πολλές είσοδοι στο σύστημα.\n"
 
@@ -192,9 +200,18 @@
 msgstr "Δεν είναι δυνατόν να καθοριστεί το όνομα tty."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: δεν υπάρχει ελεύθερη μνήμη\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "Η κλήση malloc(%d) απέτυχε\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "Όχι\n"
+
 msgid "Password: "
 msgstr "Συνθηματικό: "
 
@@ -202,6 +219,11 @@
 msgid "%s's Password: "
 msgstr "Του %s το Συνθηματικό: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: Πολύ μακριά πεδία\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -299,42 +321,33 @@
 msgstr "%s: άδεια απορρίφθηκε\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Δεν είναι δυνατόν να καθοριστεί το όνομα χρήστη σας.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: Αποτυχία εξακρίβωσης PAM\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: αδυναμία κλειδώματος του αρχείου συνθηματικών\n"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: αδυναμία κλειδώματος αρχείων, ξαναδοκιμάστε αργότερα\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: αδυναμία ανοίγματος του αρχείου συνθηματικών\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: αδυναμία ανοίγματος αρχείου %s\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: αποτυχία διχάλωσης: %s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: αδυναμία ανοίγματος του αρχείου σκιωδών συνθηματικών\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: αποτυχία απόρριψης προνομίων (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: αδυναμία επανεγγραφής αρχείου σκιωδών συνθηματικών\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: αδυναμία επανεγγραφής αρχείου συνθηματικών\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: αδυναμία ανανέωσης αρχείου συνθηματικών\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: αδυναμία ανανέωσης του αρχείου σκιωδών συνθηματικών\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: Το αρχείο σκιωδών συνθηματικών δεν υπάρχει\n"
 
@@ -342,9 +355,9 @@
 msgid "%s: failed to drop privileges (%s)\n"
 msgstr "%s: αποτυχία απόρριψης προνομίων (%s)\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: άγνωστος χρήστης %s\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: Ο χρήστης %s δεν υπάρχει\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -371,57 +384,27 @@
 msgid "Full Name"
 msgstr "Πλήρες όνομα"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tΠλήρες Όνομα: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Αριθμός δωματίου"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tΑριθμός δωματίου: %s\n"
-
 msgid "Work Phone"
 msgstr "Τηλέφωνο Εργασίας"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tΤηλέφωνο Εργασίας: %s\n"
-
 msgid "Home Phone"
 msgstr "Τηλέφωνο Οικίας"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tΤηλέφωνο Οικίας: %s\n"
-
 msgid "Other"
 msgstr "Άλλο"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Αδυναμία αλλαγής ταυτότητας χρήστη σε root.\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 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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -453,9 +436,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: \"%s\" περιέχει μη έγκυρους χαρακτήρες\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Δεν είναι δυνατόν να καθοριστεί το όνομα χρήστη σας.\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: Ο χρήστης %s δεν υπάρχει\n"
 
 #, fuzzy, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -507,7 +490,7 @@
 msgstr "%s: Μη έγκυρη αριθμητική παράμετρος `%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: -επιτρέπεται ΜΟΝΟ μια σημαία με τη -G flag\n"
 
 #, c-format
@@ -519,31 +502,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: αδυναμία κλειδώματος του αρχείου ομάδων\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: αδυναμία ανοίγματος του αρχείου ομάδων\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών\n"
-
-#, c-format
-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"
 
@@ -552,38 +510,23 @@
 msgstr "%s: γραμμή %d: έλλειψη νέου συνθηματικού\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: γραμμή %d: άγνωστος χρήστης %s\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: Η ομάδα %s δεν υπάρχει\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: Ο χρήστης %s δεν υπάρχει\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr ""
-"%s: Σφάλμα κατά την ανανέωση καταχωρήσεων στο αρχείο σκιωδών συνθηματικών\n"
-
-#, c-format
-msgid "%s: error updating password 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"
@@ -596,8 +539,9 @@
 msgid "Login Shell"
 msgstr "Κέλυφος Εισόδου"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Δεν μπορείτε να αλλάξετε το φλοιό για το(ν) %s.\n"
 
 #, c-format
@@ -608,24 +552,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Μη έγκυρη καταχώρηση: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s δεν είναι έγκυρος φλοιός.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Χρήση: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: άγνωστος χρήστης\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -659,11 +619,16 @@
 "                                για το χρήστη με LOGIN\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Αποτυχίες Μέγιστο Τελευταία                   Στις\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds απέμειναν]"
 
 #, c-format
@@ -671,77 +636,67 @@
 msgstr " [%lds κλείδωμα]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Άγνωστος χρήστης: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Χρήση: %s [-r|-R] ομάδα\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a χρήστης] ομάδα\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d χρήστης] ομάδα\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Άγνωστος χρήστης: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A χρήστης,...] [-M χρήστης,...] ομάδα\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: αδυναμία ανοίγματος αρχείου %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M χρήστης,...] ομάδα\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: σκιώδη συνθηματικά ομάδων απαιτούνται για το -A\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: Αδυναμία δημιουργίας κλειδώματος\n"
-
-#, c-format
-msgid "%s: can't get shadow lock\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
 msgstr ""
-"%s: Αδυναμία δημιουργίας κλειδώματος του αρχείου σκιωδών συνθηματικών\n"
 
-#, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: αδυναμία ανοίγματος του αρχείου\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Το συνθηματικό για τον %s δεν μπορεί να αλλάξει.\n"
 
 #, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: αδυναμία επανεγγραφής αρχείου\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: σκιώδη συνθηματικά ομάδων απαιτούνται για το -A\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: αδυναμία ανοίγματος του αρχείου\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: Η ομάδα %s δεν υπάρχει\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: αδυναμία ανοίγματος του αρχείου σκιωδών συνθηματικών\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: αποτυχία διχάλωσης: %s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -760,9 +715,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Ξαναδοκιμάστε αργότερα\n"
 
-msgid "Who are you?\n"
-msgstr "Ποιος είσαι;\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Προσθήκη του χρήστη %s στην ομάδα %s\n"
@@ -771,9 +723,9 @@
 msgid "Removing user %s from group %s\n"
 msgstr "Διαγραφή του χρήστη %s από την ομάδα %s\n"
 
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: άγνωστο μέλος %s\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: Ο χρήστης %s δεν υπάρχει\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -808,118 +760,88 @@
 "                                (μη-μοναδικό) GID\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: Σφάλμα κατά την προσθήκη νέας καταχώρησης στο αρχείο ομάδων\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: Το %s δεν είναι έγκυρο όνομα ομάδας\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: αδυναμία επανεγγραφής του αρχείου ομάδων\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "Μη έγκυρο όνομα ομάδας `%s'\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: αδυναμία επανεγγραφής του αρχείου σκιωδών συνθηματικών ομάδων\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: Αδυναμία κλειδώματος του αρχείου ομάδων\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: Αδυναμία ανοίγματος του αρχείου ομάδων\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: Αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών ομάδων\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: Αδυναμία ανοίγματος του αρχείου σκιωδών συνθηματικών ομάδων\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K απαιτεί KEY=VALUE\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 msgstr "%s: Η ομάδα %s υπάρχει\n"
 
 #, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: Το GID %u δεν είναι μοναδικό\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: αδυναμία δημιουργίας του %s\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "Χρήση: groupdel ομάδα\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: Σφάλμα κατά την διαγραφή καταχώρησης ομάδας\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: αδυναμία μετονομασίας του καταλόγου %s σε %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr ""
-"%s: Σφάλμα κατά την αφαίρεση καταχώρησης στο αρχείο σκιωδών συνθηματικών "
-"ομάδων\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: αδυναμία αλλαγής χρήστη `%s' στον NIS εξυπηρετούμενο.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: αδυναμία αφαίρεσης της πρωταρχικής ομάδας του χρήστη.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: Η ομάδα %s δεν υπάρχει\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: Η ομάδα %s είναι NIS ομάδα\n"
+#, fuzzy, c-format
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: Η ομάδα `%s' είναι NIS ομάδα.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: Ο %s είναι ο κύριος διακομιστής NIS\n"
 
-msgid "Member already exists\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: Ο χρήστης %s είναι NIS χρήστης\n"
 
-msgid "Member to remove could not be found\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: δεν υπάρχει ελεύθερη μνήμη στο update_group\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
 
-msgid "Only root can add members to different groups\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
 msgstr ""
 
-msgid "Group access is required\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr ""
-
 #, fuzzy
-msgid "PAM authentication failed for\n"
-msgstr "%s: Αποτυχία εξακρίβωσης PAM\n"
-
-#, fuzzy
-msgid "Unable to lock group file\n"
-msgstr "%s: Αδυναμία κλειδώματος του αρχείου ομάδων\n"
-
-#, fuzzy
-msgid "Unable to open group file\n"
-msgstr "%s: Αδυναμία ανοίγματος του αρχείου ομάδων\n"
-
-#, fuzzy
-msgid "Cannot close group file\n"
-msgstr "%s: αδυναμία ανοίγματος αρχείου ομάδων\n"
-
-#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -945,41 +867,19 @@
 "                                (μη-μοναδικό) GID\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: Ο %s δεν βρέθηκε στο /etc/group\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: Το %u δεν είναι μοναδικό GID\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: Το %s δεν είναι μοναδικό όνομα\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: αδυναμία επανεγγραφής του αρχείου συνθηματικών\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "Μη έγκυρο όνομα ομάδας `%s'\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: Αδυναμία κλειδώματος του αρχείου συνθηματικών\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: Η ομάδα %s είναι NIS ομάδα\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: Αδυναμία ανοίγματος του αρχείου συνθηματικών\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: άγνωστος χρήστης %s\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: αδυναμία αλλαγής χρήστη `%s' στον NIS εξυπηρετούμενο.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Χρήση: %s [-r] [-s] [group [gshadow]]\n"
 
@@ -991,18 +891,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s και -r είναι ασύμβατα\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: αδυναμία κλειδώματος του αρχείου %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-msgstr "%s: αδυναμία ανοίγματος αρχείου %s\n"
-
-#, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: αδυναμία ανανέωσης αρχείου %s\n"
-
 msgid "invalid group file entry"
 msgstr "Μη έγκυρη καταχώρηση στο αρχείο ομάδων"
 
@@ -1017,6 +905,10 @@
 msgid "invalid group name '%s'\n"
 msgstr "Μη έγκυρο όνομα ομάδας `%s'\n"
 
+#, fuzzy, c-format
+msgid "invalid group ID '%lu'\n"
+msgstr "Μη έγκυρο όνομα ομάδας `%s'\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "ομάδα %s: δεν υπάρχει χρήστης %s\n"
@@ -1030,19 +922,9 @@
 msgstr "Δεν βρέθηκε καταχώρηση στο αρχείο ομάδων που να ταιριάζει\n"
 
 #, fuzzy, c-format
-msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "σκιώδης ομάδα %s: δεν υπάρχει χρήστης %s\n"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr ""
-"%s: αδυναμία ανανέωσης καταχώρησης στο αρχείο σκιωδών συνθηματικών για τον %"
-"s\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: αδυναμία ανανέωσης καταχώρησης για την ομάδα %s\n"
-
 msgid "invalid shadow group file entry"
 msgstr "Μη έγκυρη καταχώρηση στο αρχείο σκιωδών συνθηματικών ομάδων"
 
@@ -1069,33 +951,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: καμιά αλλαγή\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών ομάδων\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Χρήση: groupdel ομάδα\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: αδυναμία ανοίγματος του αρχείου σκιωδών συνθηματικών ομάδων\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Χρήση: groupdel ομάδα\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr ""
-"%s: αδυναμία αφαίρεσης  της ομάδας %s, από το αρχείο σκιωδών συνθηματικών\n"
-"ομάδων\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: αδυναμία ανανέωσης αρχείου %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: αδυναμία ανανέωσης του αρχείου σκιωδών συνθηματικών ομάδων\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: αδυναμία ανανέωσης για το αρχείο ομάδων\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr ""
-"%s: Δεν είναι δυνατόν να διαγραφεί το αρχείο σκιωδών συνθηματικών ομάδων\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Χρήση: id [-a]\n"
 
@@ -1129,6 +999,10 @@
 "                                χρήστη με καθορισμένο LOGIN\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Όνομα_Χρήστη     Θύρα     Από              Τελευταία"
 
@@ -1138,15 +1012,15 @@
 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 ""
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Χρήση: %s [-p] [όνομα]\n"
 
@@ -1244,6 +1118,11 @@
 "υπέρβαση ορίου χρόνου εισόδου\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Χρήση: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Χρήση: newgrp [-] [ομάδα]\n"
 
@@ -1258,14 +1137,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: αποτυχία διχάλωσης: %s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "άγνωστο UID: %u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: Ο χρήστης %s δεν υπάρχει\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "άγνωστο GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "πάρα πολλές ομάδες\n"
 
@@ -1279,60 +1154,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: Η ομάδα %s δεν υπάρχει\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "Μη έγκυρο όνομα ομάδας `%s'\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: Μη έγκυρο όνομα χρήστη `%s'\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: Ο χρήστης %s δεν υπάρχει\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: Ο χρήστης %s δεν υπάρχει\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: Μη έγκυρο όνομα χρήστη `%s'\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: αδυναμία κλειδώματος του /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: αδυναμία κλειδώματος του /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: αδυναμία κλειδώματος του /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: αδυναμία κλειδώματος του /etc/passwd.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1348,9 +1182,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: γραμμή %d: αδυναμία δημιουργίας GID\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: γραμμή %d: αδυναμία εύρεσης χρήστη %s\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: Ο χρήστης %s δεν υπάρχει\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1381,15 +1215,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1468,13 +1302,10 @@
 msgstr "Το συνθηματικό για τον %s δεν μπορεί να αλλάξει.\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: δεν υπάρχει ελεύθερη μνήμη\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1517,16 +1348,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "Μη έγκυρο όνομα χρήστη '%s'\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "Μη έγκυρο όνομα χρήστη '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "χρήστης %s: καμιά ομάδα %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "χρήστης %s: ο κατάλογος %s δεν υπάρχει\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "χρήστης %s: το πρόγραμμα %s δεν υπάρχει\n"
 
 #, fuzzy, c-format
@@ -1537,10 +1376,6 @@
 msgid "add user '%s' in %s? "
 msgstr "σκιώδης ομάδα %s: δεν υπάρχει χρήστης %s\n"
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: αδυναμία ανανέωσης καταχώρησης συνθηματικού για τον %s\n"
-
 msgid "invalid shadow password file entry"
 msgstr "Μη έγκυρη καταχώριση στο αρχείο σκιωδών συνθηματικών"
 
@@ -1551,35 +1386,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "χρήστης %s: τελευταία αλλαγή συνθηματικού στο μέλλον\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: αδυναμία κλειδώματος του αρχείου συνθηματικών\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: αδυναμία ανοίγματος αρχείου %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: αδυναμία ανοίγματος του αρχείου συνθηματικών\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Χρήση: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
-"%s: αδυναμία απομάκρυνσης καταχώρησης σκιώδους συνθηματικού για τον %s\n"
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: αδυναμία ανανέωσης καταχώρησης του αρχείου σκιωδών συνθηματικών\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Χρήση: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: αδυναμία ανανέωσης αρχείου συνθηματικών\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: αδυναμία ανανέωσης καταχώρησης για τον χρήστη %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: Δεν είναι δυνατόν να διαγραφεί το αρχείο σκιωδών συνθηματικών\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Πρόσβαση στη su σε αυτόν τον λογαριασμό ΑΡΝΗΘΗΚΕ.\n"
 
@@ -1648,6 +1473,16 @@
 "%s: %s\n"
 "(Αγνοήθηκε)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: Αποτυχία εξακρίβωσης PAM\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Δεν έχετε άδεια για su %s\n"
+
 msgid "No shell\n"
 msgstr "Δεν υπάρχει φλοιός\n"
 
@@ -1673,14 +1508,6 @@
 msgstr "Έναρξη Κατάστασης Συντήρησης Συστήματος"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: άγνωστο GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: άγνωστη ομάδα %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: αδυναμία δημιουργίας νέου αρχείου προκαθορισμένων ρυθμίσεων\n"
 
@@ -1721,10 +1548,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1774,14 +1603,6 @@
 "\n"
 
 #, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: δεν υπάρχει ελεύθερη μνήμη στο update_group\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s:  στο update_gshadow\n"
-
-#, fuzzy, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: Μη έγκυρος κατάλογος βάσης `%s'\n"
 
@@ -1818,51 +1639,12 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: Μη έγκυρο όνομα χρήστη `%s'\n"
-
-#, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: αδυναμία επανεγγραφής του αρχείου συνθηματικών\n"
-
-#, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: αδυναμία επανεγγραφής του αρχείου σκιωδών συνθηματικών\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: αδυναμία ανοίγματος αρχείου σκιωδών συνθηματικών\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: Σφάλμα κατά το κλείδωμα του αρχείου ομάδων\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: Σφάλμα κατά το άνοιγμα του αρχείου ομάδων\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: Σφάλμα κατά το κλείδωμα του αρχείου σκιωδών συνθηματικών ομάδων\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: Σφάλμα κατά το άνοιγμα του αρχείου σκιωδών συνθηματικών ομάδων\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
-"%s: Σφάλμα κατά την προσθήκη νέας καταχώρησης στο αρχείο συνθηματικών\n"
 
 #, c-format
-msgid "%s: error adding new shadow password entry\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
 msgstr ""
-"%s: Σφάλμα κατά την προσθήκη νέας καταχώρησης στο αρχείο σκιωδών "
-"συνθηματικών\n"
 
 #, c-format
 msgid "%s: cannot create directory %s\n"
@@ -1878,8 +1660,9 @@
 msgid "Setting mailbox file permissions"
 msgstr ""
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: Ο χρήστης %s υπάρχει\n"
 
 #, c-format
@@ -1893,10 +1676,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s: αδυναμία δημιουργίας του %s\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: Το UID %u δεν είναι μοναδικό\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: αδυναμία δημιουργίας του %s\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1905,12 +1693,6 @@
 "%s: προειδοποίηση: ο αρχικός κατάλογος χρήστη υπάρχει ήδη.\n"
 "Δεν έγινε αντιγραφή σε αυτό οποιουδήποτε καταλόγου skel.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr ""
-"%s: προειδοποίηση: το CREATE_HOME δεν υποστηρίζεται, παρακαλώ χρησιμοποιήστε "
-"το -m.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1922,54 +1704,28 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: Σφάλμα κατά την ανανέωση καταχώρισης ομάδας\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Αδυναμία αφαίρεσης της ομάδας %s ή οποία είναι πρωταρχική ομάδα για άλλο "
 "χρήστη.\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: Σφάλμα κατά την ανανέωση καταχώρισης ομάδας\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: αδυναμία ανοίγματος αρχείου ομάδων\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: αδυναμία ανοίγματος αρχείου σκιωδών συνθηματικών ομάδων\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: Σφάλμα κατά την διαγραφή καταχώρησης στο αρχείο συνθηματικών\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr ""
-"%s: Σφάλμα κατά την διαγραφή καταχώρησης στο αρχείο σκιωδών συνθηματικών\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: Ο χρήστης %s βρίσκεται στο σύστημα\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: προειδοποίηση: αδυναμία διαγραφής "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: Το %s δεν ανήκει στον %s, δεν αφαιρείται\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: προειδοποίηση: αδυναμία διαγραφής "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: Ο χρήστης %s δεν υπάρχει\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: Ο χρήστης %s είναι NIS χρήστης\n"
 
@@ -2040,9 +1796,16 @@
 "  -U, --unlock                  ξεκλείδωμα του λογαριασμού χρήστη\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: Σφάλμα κατά την προσθήκη νέας καταχώρησης στο αρχείο ομάδων\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: Ο χρήστης %s υπάρχει\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -2057,21 +1820,8 @@
 msgstr ""
 
 #, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: Το uid %lu δεν είναι μοναδικό\n"
-
-#, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: Σφάλμα κατά την αλλαγή καταχώρησης συνθηματικού\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: Σφάλμα κατά την αφαίρεση καταχώρησης στο αρχείο συνθηματικών\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
+msgid "%s: UID '%lu' already exists\n"
 msgstr ""
-"%s: Σφάλμα κατά την αφαίρεση καταχώρησης στο αρχείο σκιωδών συνθηματικών\n"
 
 #, c-format
 msgid "%s: directory %s exists\n"
@@ -2096,6 +1846,14 @@
 msgstr "%s: αδυναμία μετονομασίας του καταλόγου %s σε %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: προειδοποίηση: Το %s δεν ανήκει στον %s\n"
 
@@ -2109,7 +1867,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -2134,10 +1892,16 @@
 "gshadow\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: αποτυχία απόρριψης προνομίων (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: Το %s δεν άλλαξε\n"
@@ -2152,6 +1916,434 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: αδυναμία επαναφοράς %s: %s (οι αλλαγές είναι στο %s)\n"
 
+#~ msgid "%s: can't lock password file\n"
+#~ msgstr "%s: αδυναμία κλειδώματος του αρχείου συνθηματικών\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: αδυναμία ανοίγματος του αρχείου συνθηματικών\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: αδυναμία ανοίγματος του αρχείου σκιωδών συνθηματικών\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: αδυναμία επανεγγραφής αρχείου σκιωδών συνθηματικών\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: αδυναμία επανεγγραφής αρχείου συνθηματικών\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: αδυναμία ανανέωσης αρχείου συνθηματικών\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: αδυναμία ανανέωσης του αρχείου σκιωδών συνθηματικών\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tΠλήρες Όνομα: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tΑριθμός δωματίου: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tΤηλέφωνο Εργασίας: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tΤηλέφωνο Οικίας: %s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr ""
+#~ "Αδυναμία κλειδώματος του αρχείου συνθηματικών. Δοκιμάστε αργότερα.\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Αδυναμία ανοίγματος του αρχείου συνθηματικών.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: αδυναμία κλειδώματος του αρχείου ομάδων\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: αδυναμία ανοίγματος του αρχείου ομάδων\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: αδυναμία ανοίγματος του αρχείου σκιωδών συνθηματικών\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr ""
+#~ "%s: Σφάλμα κατά την ανανέωση καταχωρήσεων στο αρχείο σκιωδών "
+#~ "συνθηματικών\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: Σφάλμα κατά την ανανέωση καταχώρισης ομάδας\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: γραμμή %d: άγνωστος χρήστης %s\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: γραμμή %d: αδυναμία ανανέωσης καταχώρησης\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr ""
+#~ "%s: Σφάλμα κατά την ανανέωση καταχωρήσεων στο αρχείο σκιωδών "
+#~ "συνθηματικών\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: Σφάλμα κατά την ανανέωση καταχωρήσεων στο αρχείο συνθηματικών\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: γραμμή %d: άγνωστος χρήστης %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: γραμμή %d: αδυναμία ανανέωσης καταχώρησης συνθηματικού\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: άγνωστος χρήστης\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Άγνωστος χρήστης: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Χρήση: %s [-r|-R] ομάδα\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a χρήστης] ομάδα\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d χρήστης] ομάδα\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A χρήστης,...] [-M χρήστης,...] ομάδα\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M χρήστης,...] ομάδα\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: Αδυναμία δημιουργίας κλειδώματος\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr ""
+#~ "%s: Αδυναμία δημιουργίας κλειδώματος του αρχείου σκιωδών συνθηματικών\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: αδυναμία ανοίγματος του αρχείου\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: αδυναμία επανεγγραφής αρχείου\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: αδυναμία επανεγγραφής αρχείου σκιωδών συνθηματικών\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: αδυναμία ξεκλειδώματος αρχείου\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: αδυναμία ανανέωσης καταχώρησης\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr ""
+#~ "%s: αδυναμία ανανέωσης καταχώρησης στο αρχείο σκιωδών συνθηματικών\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "άγνωστη ομάδα: %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: αδυναμία ανοίγματος του αρχείου\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: αδυναμία ανοίγματος του αρχείου σκιωδών συνθηματικών\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Ποιος είσαι;\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: άγνωστο μέλος %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: Σφάλμα κατά την προσθήκη νέας καταχώρησης στο αρχείο ομάδων\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: αδυναμία επανεγγραφής του αρχείου ομάδων\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: αδυναμία επανεγγραφής του αρχείου σκιωδών συνθηματικών ομάδων\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: Αδυναμία κλειδώματος του αρχείου ομάδων\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: Αδυναμία ανοίγματος του αρχείου ομάδων\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: Αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών ομάδων\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: Αδυναμία ανοίγματος του αρχείου σκιωδών συνθηματικών ομάδων\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: Το GID %u δεν είναι μοναδικό\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: Σφάλμα κατά την διαγραφή καταχώρησης ομάδας\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr ""
+#~ "%s: Σφάλμα κατά την αφαίρεση καταχώρησης στο αρχείο σκιωδών συνθηματικών "
+#~ "ομάδων\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: αδυναμία αφαίρεσης της πρωταρχικής ομάδας του χρήστη.\n"
+
+#, fuzzy
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "%s: Αποτυχία εξακρίβωσης PAM\n"
+
+#, fuzzy
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "%s: Αδυναμία κλειδώματος του αρχείου ομάδων\n"
+
+#, fuzzy
+#~ msgid "Unable to open group file\n"
+#~ msgstr "%s: Αδυναμία ανοίγματος του αρχείου ομάδων\n"
+
+#, fuzzy
+#~ msgid "Cannot close group file\n"
+#~ msgstr "%s: αδυναμία ανοίγματος αρχείου ομάδων\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: Ο %s δεν βρέθηκε στο /etc/group\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: Το %u δεν είναι μοναδικό GID\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: Το %s δεν είναι μοναδικό όνομα\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: αδυναμία επανεγγραφής του αρχείου συνθηματικών\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: Αδυναμία κλειδώματος του αρχείου συνθηματικών\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: Αδυναμία ανοίγματος του αρχείου συνθηματικών\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: αδυναμία κλειδώματος του αρχείου %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr ""
+#~ "%s: αδυναμία ανανέωσης καταχώρησης στο αρχείο σκιωδών συνθηματικών για "
+#~ "τον %s\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: αδυναμία ανανέωσης καταχώρησης για την ομάδα %s\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών ομάδων\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: αδυναμία ανοίγματος του αρχείου σκιωδών συνθηματικών ομάδων\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr ""
+#~ "%s: αδυναμία αφαίρεσης  της ομάδας %s, από το αρχείο σκιωδών "
+#~ "συνθηματικών\n"
+#~ "ομάδων\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: αδυναμία ανανέωσης του αρχείου σκιωδών συνθηματικών ομάδων\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: αδυναμία ανανέωσης για το αρχείο ομάδων\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr ""
+#~ "%s: Δεν είναι δυνατόν να διαγραφεί το αρχείο σκιωδών συνθηματικών ομάδων\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "άγνωστο UID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "άγνωστο GID: %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: Η ομάδα %s δεν υπάρχει\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: Ο χρήστης %s δεν υπάρχει\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: Μη έγκυρο όνομα χρήστη `%s'\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: αδυναμία κλειδώματος του /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: αδυναμία κλειδώματος του /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: αδυναμία κλειδώματος του /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: αδυναμία κλειδώματος του /etc/passwd.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: αδυναμία ανοίγματος των αρχείων\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: Σφάλμα κατά την ενημέρωση αρχείων\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: γραμμή %d: αδυναμία εύρεσης χρήστη %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: αδυναμία ανανέωσης καταχώρησης συνθηματικού για τον %s\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: αδυναμία κλειδώματος του αρχείου συνθηματικών\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: αδυναμία ανοίγματος του αρχείου συνθηματικών\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr ""
+#~ "%s: αδυναμία απομάκρυνσης καταχώρησης σκιώδους συνθηματικού για τον %s\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr ""
+#~ "%s: αδυναμία ανανέωσης καταχώρησης του αρχείου σκιωδών συνθηματικών\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: αδυναμία ανανέωσης αρχείου συνθηματικών\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: αδυναμία ανανέωσης καταχώρησης για τον χρήστη %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: Δεν είναι δυνατόν να διαγραφεί το αρχείο σκιωδών συνθηματικών\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: άγνωστο GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: άγνωστη ομάδα %s\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s:  στο update_gshadow\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: αδυναμία επανεγγραφής του αρχείου συνθηματικών\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: αδυναμία επανεγγραφής του αρχείου σκιωδών συνθηματικών\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: αδυναμία ανοίγματος αρχείου σκιωδών συνθηματικών\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: Σφάλμα κατά το κλείδωμα του αρχείου ομάδων\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: Σφάλμα κατά το άνοιγμα του αρχείου ομάδων\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr ""
+#~ "%s: Σφάλμα κατά το κλείδωμα του αρχείου σκιωδών συνθηματικών ομάδων\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr ""
+#~ "%s: Σφάλμα κατά το άνοιγμα του αρχείου σκιωδών συνθηματικών ομάδων\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr ""
+#~ "%s: Σφάλμα κατά την προσθήκη νέας καταχώρησης στο αρχείο συνθηματικών\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr ""
+#~ "%s: Σφάλμα κατά την προσθήκη νέας καταχώρησης στο αρχείο σκιωδών "
+#~ "συνθηματικών\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr ""
+#~ "%s: προειδοποίηση: το CREATE_HOME δεν υποστηρίζεται, παρακαλώ "
+#~ "χρησιμοποιήστε το -m.\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: Σφάλμα κατά την ανανέωση καταχώρισης ομάδας\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: Σφάλμα κατά την ανανέωση καταχώρισης ομάδας\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: αδυναμία ανοίγματος αρχείου ομάδων\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: αδυναμία ανοίγματος αρχείου σκιωδών συνθηματικών ομάδων\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: Σφάλμα κατά την διαγραφή καταχώρησης στο αρχείο συνθηματικών\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr ""
+#~ "%s: Σφάλμα κατά την διαγραφή καταχώρησης στο αρχείο σκιωδών συνθηματικών\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: Ο χρήστης %s δεν υπάρχει\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: Σφάλμα κατά την προσθήκη νέας καταχώρησης στο αρχείο ομάδων\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: Το uid %lu δεν είναι μοναδικό\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: Σφάλμα κατά την αλλαγή καταχώρησης συνθηματικού\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: Σφάλμα κατά την αφαίρεση καταχώρησης στο αρχείο συνθηματικών\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr ""
+#~ "%s: Σφάλμα κατά την αφαίρεση καταχώρησης στο αρχείο σκιωδών συνθηματικών\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: αδυναμία λήψης μοναδικού GID\n"
 
@@ -2163,18 +2355,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " στο `%.100s'"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: αδυναμία κλειδώματος αρχείων, ξαναδοκιμάστε αργότερα\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: γραμμή %d: αδυναμία δημιουργίας UID\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/es.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -55,6 +55,9 @@
 msgid "  Choose a new password."
 msgstr "  Elija una contraseña nueva."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Su contraseña caducará en %ld días.\n"
@@ -66,7 +69,12 @@
 msgstr "Su contraseña caducará hoy."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Incapaz de cambiar tty %s"
 
 msgid "Environment overflow\n"
@@ -90,14 +98,14 @@
 "%d fallos desde la última entrada.\n"
 "La última fue %s en %s.\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\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"
+
+#, 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
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s: no se puede obtener un GID único\n"
-
 msgid "Too many logins.\n"
 msgstr "Demasiados accesos.\n"
 
@@ -187,9 +195,18 @@
 msgstr "No se pudo determinar el nombre de su tty."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: sin memoria\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "falló malloc(%d)\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "No\n"
+
 msgid "Password: "
 msgstr "Contraseña: "
 
@@ -197,6 +214,11 @@
 msgid "%s's Password: "
 msgstr "Contraseña de %s: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: campos demasiado largos\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -293,42 +315,33 @@
 msgstr "%s: Permiso denegado.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: no puedo determinar su nombre de usuario.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 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"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: no se pueden bloquear los ficheros, pruebe de nuevo más tarde\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: no puedo abrir el fichero de contraseñas\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: no se puede abrir el fichero %s\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: no puedo bloquear el fichero de contraseñas ocultas\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: fallo en la llamada a fork: %s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: no puedo abrir el fichero de contraseñas ocultas\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: no fue posible desprenderse de los privilegios (%s)\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"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: no se puede reescribir el fichero de contraseñas\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: no puedo actualizar el fichero de contraseñas\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: no puedo actualizar el fichero de contraseñas ocultas\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"
 
@@ -336,9 +349,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: el usuario %s no existe\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -365,57 +378,27 @@
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tNombre completo: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Número de habitación"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tNúmero de habitación: %s\n"
-
 msgid "Work Phone"
 msgstr "Teléfono del trabajo"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tTeléfono del trabajo:% s\n"
-
 msgid "Home Phone"
 msgstr "Teléfono de casa"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tTeléfono de casa: %s\n"
-
 msgid "Other"
 msgstr "Otro"
 
 msgid "Cannot change ID to root.\n"
 msgstr "No se puede cambiar el ID al del superusuario.\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"
-
-msgid "Cannot open the password file.\n"
-msgstr "No se puede abrir el fichero de contraseñas.\n"
-
 #, c-format
-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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -448,9 +431,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: «%s» contiene caracteres ilegales\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: no puedo determinar su nombre de usuario.\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: el usuario %s no existe\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -500,7 +483,7 @@
 msgstr "%s: argumento numérico inválido «%s»\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: SÓLO se puede usar la opción -a junto con la opción -G\n"
 
 #, c-format
@@ -512,30 +495,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: no se puede bloquear el fichero de grupos\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: no se puede abrir el fichero de grupos\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: no se puede abrir el fichero de contraseñas ocultas (shadow)\n"
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-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"
 
@@ -543,38 +502,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: línea %d: falta la nueva contraseña\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: línea %d: grupo desconocido %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: el grupo %s no existe\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: el usuario %s no existe\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: error actualizando el fichero de contraseñas ocultas (shadow)\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: error actualizando el fichero de contraseñas\n"
-
-#, c-format
-msgid "%s: line %d: unknown user %s\n"
-msgstr "%s: línea %d: usuario 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
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
@@ -596,8 +541,9 @@
 msgid "Login Shell"
 msgstr "Shell de acceso"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "No debe cambiar la shell para %s.\n"
 
 #, c-format
@@ -608,24 +554,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: entrada inválida: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s no es una shell válida.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Modo de uso: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: usuario desconocido\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -656,11 +618,16 @@
 "                                para el usuario USUARIO\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Usuario     Fallos Máximo Último                   Activo\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr "[faltan %lds]"
 
 #, c-format
@@ -668,76 +635,67 @@
 msgstr "[bloqueados %lds]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Usuario desconocido: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Modo de uso: %s [-r|-R] grupo\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a usuario] grupo\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d usuario] grupo\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Usuario desconocido: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A usuario,...] [-M usuario,...] grupo\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: no se puede abrir el fichero %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M usuario,...] grupo\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: se requieren contraseñas de grupo ocultas (shadow) para -A\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: no se puede obtener el bloqueo\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: no se puede obtener el bloqueo de shadow\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "No puede cambiarse la contraseña para %s.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: no se puede abrir el fichero\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: se requieren contraseñas de grupo ocultas (shadow) para -A\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: no se puede abrir el fichero\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: el grupo %s no existe\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: no se puede abrir el fichero de contraseñas ocultas (shadow)\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: fallo en la llamada a fork: %s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -756,9 +714,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Pruebe otra vez más tarde\n"
 
-msgid "Who are you?\n"
-msgstr "¿Quién es?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Añadiendo al usuario %s al grupo %s\n"
@@ -767,9 +722,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: el usuario %s no existe\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -804,116 +759,89 @@
 "                                (que no es único)\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: error añadiendo entrada nueva de grupo\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s no es un nombre de grupo válido\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: no se puede reescribir el fichero grupos\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "nombre de grupo «%s» inválido\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: no se puede reescribir el fichero de grupos oculto (shadow)\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: incapaz de bloquear el fichero de grupos\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: incapaz de abrir el fichero de grupos\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: incapaz de bloquear el fichero de grupos oculto (shadow)\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: incapaz de abrir el fichero de grupos oculto (shadow)\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K requiere NOMBRE=VALOR\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 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 "%s: GID '%lu' already exists\n"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: no se puede crear %s\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "Modo de uso: groupdel grupo\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: error eliminando la entrada del grupo\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: no se puede renombrar el directorio %s a %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: error eliminando entrada del grupo oculto (shadow)\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: no se pudo cambiar el usuario «%s» en el cliente NIS.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: no se puede eliminar el grupo primario del usuario.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: el grupo %s no existe\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: el grupo %s es un grupo NIS\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: el grupo «%s» es un grupo NIS.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s es el maestro NIS\n"
 
-msgid "Member already exists\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: el usuario %s es un usuario NIS\n"
 
-msgid "Member to remove could not be found\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: sin memoria en update_group\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
 
-msgid "Only root can add members to different groups\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
 msgstr ""
 
-msgid "Group access is required\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr ""
-
 #, fuzzy
-msgid "PAM authentication failed for\n"
-msgstr "%s: Autenticación PAM fallida\n"
-
-#, fuzzy
-msgid "Unable to lock group file\n"
-msgstr "%s: incapaz de bloquear el fichero de grupos\n"
-
-#, fuzzy
-msgid "Unable to open group file\n"
-msgstr "%s: incapaz de abrir el fichero de grupos\n"
-
-#, fuzzy
-msgid "Cannot close group file\n"
-msgstr "%s: no se puede abrir el fichero de grupos\n"
-
-#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -939,41 +867,19 @@
 "                                (que no es único)\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: no se encontró %s en /etc/group\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u no es un GID único\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s no es un nombre único\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: no se puede reescribir el fichero de contraseñas\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "nombre de grupo «%s» inválido\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: incapaz de bloquear el fichero de contraseñas\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: el grupo %s es un grupo NIS\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: incapaz de abrir el fichero de contraseñas\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: usuario desconocido %s\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: no se pudo cambiar el usuario «%s» en el cliente NIS.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Modo de uso: %s [-r] [-s] [grupo [gshadow]]\n"
 
@@ -985,18 +891,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s y -r son incompatibles\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: no se puede bloquear el fichero %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "entrada del fichero de grupos inválida"
 
@@ -1011,6 +905,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "nombre de grupo «%s» inválido\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "nombre de grupo «%s» inválido\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "grupo %s: no existe el usuario %s\n"
@@ -1023,18 +922,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "no hay entradas coincidentes en el fichero de grupos en «%s»\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "¿añadir grupo «%s» a «%s»?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: no se puede actualizar la entrada oculta (shadow) para %s\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: no se puede actualizar la entrada para el grupo %s\n"
-
 msgid "invalid shadow group file entry"
 msgstr "entrada del fichero de grupos oculto (shadow) inválida"
 
@@ -1061,30 +953,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: sin cambios\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: no se puede bloquear el fichero de grupos oculto (shadow)\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Modo de uso: groupdel grupo\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: no se puede abrir el fichero de grupos oculto (shadow)\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Modo de uso: groupdel grupo\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: no se puede eliminar el grupo oculto (shadow) %s\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: no se puede actualizar el fichero %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: no se puede actualizar el fichero de grupos oculto (shadow)\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: no se puede actualizar el fichero de grupo\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: no se puede eliminar el fichero de grupos oculto\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Modo de uso: id [-a]\n"
 
@@ -1116,6 +999,10 @@
 "  -u, --user USUARIO            muestra el registro lastlog para el usuario\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Nombre           Puerto   De               Último"
 
@@ -1125,15 +1012,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Modo de uso: %s [-p] [nombre]\n"
 
@@ -1230,6 +1117,11 @@
 "tiempo de acceso excedido\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Modo de uso: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Modo de uso: newgrp [-] [grupo]\n"
 
@@ -1244,14 +1136,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: fallo en la llamada a fork: %s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "UID desconocido: %u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: el usuario %s no existe\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "GID desconocido: %lu\n"
-
 msgid "too many groups\n"
 msgstr "demasiados grupos\n"
 
@@ -1265,60 +1153,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: el grupo %s no existe\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "nombre de grupo «%s» inválido\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: nombre de usuario `%s' inválido\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: el usuario %s no existe\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: el usuario %s no existe\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: nombre de usuario `%s' inválido\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: no se puede bloquear /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: no se puede bloquear /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: no se puede bloquear /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: no se puede bloquear /etc/passwd.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1334,9 +1181,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: línea %d: no se puede crear GID\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: línea %d: no se puede encontrar el usuario %s\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: el usuario %s no existe\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1369,15 +1216,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1450,13 +1297,10 @@
 msgstr "No puede cambiarse la contraseña para %s.\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: sin memoria\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1499,16 +1343,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "nombre de usuario '%s' inválido\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "nombre de usuario '%s' inválido\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "usuario %s: no existe el grupo %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "usuario %s: el directorio %s no existe\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "usuario %s: el programa %s no existe\n"
 
 #, c-format
@@ -1519,10 +1371,6 @@
 msgid "add user '%s' in %s? "
 msgstr "¿añadir usuario «%s» a «%s»?"
 
-#, c-format
-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"
-
 msgid "invalid shadow password file entry"
 msgstr "entrada de contraseña oculta (shadow) inválida"
 
@@ -1534,34 +1382,25 @@
 msgstr ""
 "usuario %s: el último cambio de la contraseña se produjo en el futuro\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: no se puede bloquear el fichero passwd\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: no se puede abrir el fichero %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: no se puede abrir el fichero passwd\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Modo de uso: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: no se puede eliminar la entrada oculta (shadow) para %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: no se puede actualizar el fichero oculto (shadow)\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Modo de uso: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: no se puede actualizar el fichero passwd\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: no se puede actualizar la entrada para el usuario %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: no se puede eliminar el fichero de contraseñas ocultas (shadow)\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Acceso a \"su\" a esa cuenta DENEGADO.\n"
 
@@ -1629,6 +1468,16 @@
 "%s: %s\n"
 "(Ignorado)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: Autenticación PAM fallida\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "No está autorizado a usar su %s\n"
+
 msgid "No shell\n"
 msgstr "Sin shell\n"
 
@@ -1654,14 +1503,6 @@
 msgstr "Entrando en el Modo de Mantenimiento del Sistema"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: GID %s desconocido\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: grupo %s desconocido\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr ""
 "%s: no se puede crear un nuevo fichero de preferencias predeterminadas\n"
@@ -1704,10 +1545,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1755,14 +1598,6 @@
 "                                de usuario\n"
 "\n"
 
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: sin memoria en update_group\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: sin memoria en update_gshadow\n"
-
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: directorio base «%s» inválido\n"
@@ -1800,51 +1635,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: nombre de usuario `%s' inválido\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: no se puede reescribir el fichero de contraseñas\n"
-
-#, c-format
-msgid "%s: cannot rewrite shadow password file\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
 msgstr ""
-"%s: no se puede reescribir el fichero de contraseñas ocultas (shadow)\n"
 
 #, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: no se puede bloquear el fichero de contraseñas ocultas (shadow)\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: no se puede abrir el fichero de contraseñas ocultas (shadow)\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: error bloqueando el fichero de grupos\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: error abriendo el fichero de grupos\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: error bloqueando el fichero de grupos oculto (shadow)\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: error abriendo el fichero de grupos oculto (shadow)\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: error añadiendo entrada de contraseña nueva\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: error añadiendo entrada de contraseña oculta (shadow) nueva\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: no se puede crear el directorio %s\n"
 
@@ -1860,8 +1658,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Estableciendo los permisos del buzón de correo"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: el usuario %s existe\n"
 
 #, c-format
@@ -1874,10 +1673,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s: no se puede crear %s\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: el UID %u no es único\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: no se puede crear %s\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1886,11 +1690,6 @@
 "%s: aviso: el directorio personal ya existe.\n"
 "No se copia ningún fichero del directorio skel en él.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr ""
-"%s: aviso: CREATE_HOME no está soportado, por favor, use -m en su lugar.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1910,53 +1709,28 @@
 "  -r, --remove                  elimina el directorio y el buzón de correo\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: error actualizando la entrada del grupo\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: no se puede eliminar el grupo %s, que es un prupo primario\n"
 "para otro usuario.\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: error actualizando la entrada del grupo\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: no se puede abrir el fichero de grupos\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: no se puede abrir el fichero de grupos oculto (shadow)\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: error eliminando la entrada de contraseña\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: error eliminando la entrada de contraseña oculta (shadow)\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: el usuario %s está actualmente dentro del sistema\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: aviso: no se puede eliminar "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s no pertenece a %s, no se elimina\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: aviso: no se puede eliminar "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: el usuario %s no existe\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: el usuario %s es un usuario NIS\n"
 
@@ -2027,9 +1801,16 @@
 "  -U, --unlock                  desbloque la cuenta de usuario\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: error añadiendo entrada nueva de grupo\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: el usuario %s existe\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -2044,22 +1825,10 @@
 msgstr ""
 
 #, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: el uid %lu no es único\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr ""
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: error cambiando la entrada de la contraseña\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: error eliminando la entrada de la contraseña\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: error eliminando entrada de contraseña oculta (shadow)\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: el directorio %s existe\n"
 
@@ -2081,6 +1850,14 @@
 msgstr "%s: no se puede renombrar el directorio %s a %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: aviso: %s no pertenece a %s\n"
 
@@ -2094,7 +1871,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -2118,10 +1895,16 @@
 "  -s, --shadow                  edita la base de datos shadow o gshadow\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: no fue posible desprenderse de los privilegios (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s no se cambia\n"
@@ -2136,6 +1919,412 @@
 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: can't lock password file\n"
+#~ msgstr "%s: no puedo bloquear el fichero de contraseñas\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: no puedo abrir el fichero de contraseñas\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: no puedo bloquear el fichero de contraseñas ocultas\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: no puedo abrir el fichero de contraseñas ocultas\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: no se puede reescribir el fichero de contraseñas ocultas\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: no se puede reescribir el fichero de contraseñas\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: no puedo actualizar el fichero de contraseñas\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: no puedo actualizar el fichero de contraseñas ocultas\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tNombre completo: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tNúmero de habitación: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tTeléfono del trabajo:% s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tTeléfono de casa: %s\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"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "No se puede abrir el fichero de contraseñas.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: no se puede bloquear el fichero de grupos\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: no se puede abrir el fichero de grupos\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: no se puede abrir el fichero de contraseñas ocultas (shadow)\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: no se puede abrir el fichero de contraseñas ocultas (shadow)\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: error actualizando el fichero de contraseñas ocultas (shadow)\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: error actualizando la entrada del grupo\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: línea %d: grupo desconocido %s\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: línea %d: no se puede actualizar la entrada\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr ""
+#~ "%s: no se puede bloquear el fichero de contraseñas ocultas (shadow)\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: error actualizando el fichero de contraseñas ocultas (shadow)\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: error actualizando el fichero de contraseñas\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: línea %d: usuario desconocido %s\n"
+
+#~ 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"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: usuario desconocido\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Usuario desconocido: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Modo de uso: %s [-r|-R] grupo\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a usuario] grupo\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d usuario] grupo\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A usuario,...] [-M usuario,...] grupo\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M usuario,...] grupo\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: no se puede obtener el bloqueo\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: no se puede obtener el bloqueo de shadow\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: no se puede abrir el fichero\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: no se puede reescribir el fichero\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: no se puede reescribir el fichero oculto (shadow)\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: no se puede desbloquear el fichero\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: no se puede actualizar la entrada\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: no se puede actualizar la entrada oculta (shadow)\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "grupo desconocido: %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: no se puede abrir el fichero\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: no se puede abrir el fichero de contraseñas ocultas (shadow)\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "¿Quién es?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: miembro desconocido %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: error añadiendo entrada nueva de grupo\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: no se puede reescribir el fichero grupos\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: no se puede reescribir el fichero de grupos oculto (shadow)\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: incapaz de bloquear el fichero de grupos\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: incapaz de abrir el fichero de grupos\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: incapaz de bloquear el fichero de grupos oculto (shadow)\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: incapaz de abrir el fichero de grupos oculto (shadow)\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: el GID %u no es único\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: error eliminando la entrada del grupo\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: error eliminando entrada del grupo oculto (shadow)\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: no se puede eliminar el grupo primario del usuario.\n"
+
+#, fuzzy
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "%s: Autenticación PAM fallida\n"
+
+#, fuzzy
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "%s: incapaz de bloquear el fichero de grupos\n"
+
+#, fuzzy
+#~ msgid "Unable to open group file\n"
+#~ msgstr "%s: incapaz de abrir el fichero de grupos\n"
+
+#, fuzzy
+#~ msgid "Cannot close group file\n"
+#~ msgstr "%s: no se puede abrir el fichero de grupos\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: no se encontró %s en /etc/group\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u no es un GID único\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s no es un nombre único\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: no se puede reescribir el fichero de contraseñas\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: incapaz de bloquear el fichero de contraseñas\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: incapaz de abrir el fichero de contraseñas\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: no se puede bloquear el fichero %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: no se puede actualizar la entrada oculta (shadow) para %s\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: no se puede actualizar la entrada para el grupo %s\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: no se puede bloquear el fichero de grupos oculto (shadow)\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: no se puede abrir el fichero de grupos oculto (shadow)\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: no se puede eliminar el grupo oculto (shadow) %s\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: no se puede actualizar el fichero de grupos oculto (shadow)\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: no se puede actualizar el fichero de grupo\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: no se puede eliminar el fichero de grupos oculto\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "UID desconocido: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "GID desconocido: %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: el grupo %s no existe\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: el usuario %s no existe\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: nombre de usuario `%s' inválido\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: no se puede bloquear /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: no se puede bloquear /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: no se puede bloquear /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: no se puede bloquear /etc/passwd.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: no se pueden abrir los ficheros\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: error actualizando los ficheros\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: línea %d: no se puede encontrar el usuario %s\n"
+
+#~ 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"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: no se puede bloquear el fichero passwd\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: no se puede abrir el fichero passwd\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: no se puede eliminar la entrada oculta (shadow) para %s\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: no se puede actualizar el fichero oculto (shadow)\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: no se puede actualizar el fichero passwd\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: no se puede actualizar la entrada para el usuario %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr ""
+#~ "%s: no se puede eliminar el fichero de contraseñas ocultas (shadow)\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: GID %s desconocido\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: grupo %s desconocido\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: sin memoria en update_gshadow\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: no se puede reescribir el fichero de contraseñas\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr ""
+#~ "%s: no se puede reescribir el fichero de contraseñas ocultas (shadow)\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr ""
+#~ "%s: no se puede bloquear el fichero de contraseñas ocultas (shadow)\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: no se puede abrir el fichero de contraseñas ocultas (shadow)\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: error bloqueando el fichero de grupos\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: error abriendo el fichero de grupos\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: error bloqueando el fichero de grupos oculto (shadow)\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: error abriendo el fichero de grupos oculto (shadow)\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: error añadiendo entrada de contraseña nueva\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: error añadiendo entrada de contraseña oculta (shadow) nueva\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr ""
+#~ "%s: aviso: CREATE_HOME no está soportado, por favor, use -m en su lugar.\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: error actualizando la entrada del grupo\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: error actualizando la entrada del grupo\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: no se puede abrir el fichero de grupos\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: no se puede abrir el fichero de grupos oculto (shadow)\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: error eliminando la entrada de contraseña\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: error eliminando la entrada de contraseña oculta (shadow)\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: el usuario %s no existe\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: error añadiendo entrada nueva de grupo\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: el uid %lu no es único\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: error cambiando la entrada de la contraseña\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: error eliminando la entrada de la contraseña\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: error eliminando entrada de contraseña oculta (shadow)\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: no se puede obtener un GID único\n"
 
@@ -2145,18 +2334,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " en «%.100s»"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: no se pueden bloquear los ficheros, pruebe de nuevo más tarde\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: línea %d: no se puede crear UID\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/eu.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\n"
 "PO-Revision-Date: 2008-03-31 12:50+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque at lists.debian.org>\n"
@@ -59,6 +59,9 @@
 msgid "  Choose a new password."
 msgstr "  Aukeratu pasahitz berria."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Pasahitza %ld egun barru iraungi egingo da.\n"
@@ -70,7 +73,12 @@
 msgstr "Pasahitza gaur iraungi egingo da."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Ezin da %s tty aldatu"
 
 msgid "Environment overflow\n"
@@ -94,12 +102,16 @@
 "%d hutsegite azken saio hasieratik.\n"
 "Azkena %s izan zen %s(e)n.\n"
 
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+#| msgid "Can't get unique GID (no more available GIDs)\n"
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "%s: ezin da GID bakarra lortu (ez dago GID erabilgarri gehiago)\n"
+
+#, fuzzy, c-format
+#| msgid "Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "%s: ezin da UID bakarra lortu (ez dago UID erabilgarri gehiago)\n"
 
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s: ezin da GID bakarra lortu (ez dago GID erabilgarri gehiago)\n"
-
 msgid "Too many logins.\n"
 msgstr "Gehiegizko saio hasierak.\n"
 
@@ -193,9 +205,16 @@
 msgstr "Ezin da zure tty izena zehaztu."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: memoriarik ez\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) huts egin du\n"
 
+msgid "No"
+msgstr ""
+
 msgid "Password: "
 msgstr "Pasahitza: "
 
@@ -203,6 +222,11 @@
 msgid "%s's Password: "
 msgstr "%s (r)en pasahitza: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: eremu luzegiak\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -297,42 +321,34 @@
 msgstr "%s: baimena ukatua.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Ezin da Erabiltzaile izena zehaztu.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 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"
+#, fuzzy, c-format
+#| msgid "Cannot lock the password file; try again later.\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "Ezin izan da pasahitzen fitxategia blokeatu; saiatu geroago.\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: ezin da pasahitzen fitxategia ireki\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: ezin da %s fitxategia ireki\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: ezin da itzalpeko (shadow) pasahitz fitxategia blokeatu\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: huts zatitzerakoan: %s\n"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: ezin da itzalpeko (shadow) pasahitz fitxategia ireki\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: huts baimenak kentzerakoan (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s:ezin da itzalpeko pasahitz fitxategia berridatzi\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: ezin da pasahitzen fitxategia berridatzi\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: ezin da pasahitzen fitxategia eguneratu\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: ezin da itzalpeko (shadow) pasahitz fitxategia eguneratu\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: ezin da itzalpeko (shadow) pasahitz fitxategia ez dago\n"
 
@@ -340,9 +356,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: `%s' erabiltzailea ez da existitzen\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -367,57 +384,27 @@
 msgid "Full Name"
 msgstr "Izen osoa"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tIzen osoa: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Gela zenbakia"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tGela zenbakia: %s\n"
-
 msgid "Work Phone"
 msgstr "Laneko telefonoa"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tLaneko telefonoa: %s\n"
-
 msgid "Home Phone"
 msgstr "Etxeko telefonoa"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tEtxeko telefonoa: %s\n"
-
 msgid "Other"
 msgstr "Bestelakoa"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Ezin izan da IDa root-era aldatu.\n"
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Ezin izan da pasahitzen fitxategia blokeatu; saiatu geroago.\n"
-
-msgid "Cannot open the password file.\n"
-msgstr "Ezin izan da pasahitzen fitxategia ireki.\n"
-
 #, c-format
-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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -450,9 +437,10 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s'(e)k karaktere baliogabeak ditu\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Ezin da Erabiltzaile izena zehaztu.\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: `%s' erabiltzailea ez da existitzen\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -504,8 +492,9 @@
 msgid "%s: invalid numeric argument '%s'\n"
 msgstr "%s:baliogabeko zenbakizko '%s' argumentua\n"
 
-#, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+#, fuzzy, c-format
+#| msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: %s bandera BAKARRIK %s banderarekin onartzen da\n"
 
 #, c-format
@@ -517,30 +506,6 @@
 msgstr "%s: onartzen ez den kriptografia metodoa: %s\n"
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: ezin da talde-fitxategia blokeatu\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: ezin da talde-fitxategia ireki\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: ezin da gshadow fitxategia blokeatu\n"
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-msgstr "%s ezin da 'shadow' fitxategia ireki\n"
-
-#, c-format
-msgid "%s: error updating gshadow file\n"
-msgstr "%s: errorea gshadow fitxategia eguneratzean\n"
-
-#, c-format
-msgid "%s: error updating group file\n"
-msgstr "%s: errorea talde fitxategia eguneratzean\n"
-
-#, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: %d. lerroa: lerro luzegia\n"
 
@@ -548,38 +513,25 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: %d. lerroa: pasahitz berria falta da\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: %d. lerroa: %s talde ezezaguna\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: %s taldea ez da existitzen\n"
 
-#, c-format
-msgid "%s: line %d: cannot update group entry\n"
-msgstr "%s: %d lerroa: ezin da talde sarrera eguneratu\n"
+#, fuzzy, c-format
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: `%s' erabiltzailea ez da existitzen\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: errorea 'shadow' fitxategia eguneratzean\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: errorea pasahitzen fitxategia eguneratzean\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"
@@ -598,8 +550,9 @@
 msgid "Login Shell"
 msgstr "Saio-hasierako shell-a"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Ez zenuke %s(r)en shell-a aldatu behar.\n"
 
 #, c-format
@@ -610,24 +563,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: baliogabeko sarrera: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s shell baliogabea da.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Erabilera: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: erabiltzaile ezezaguna\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -661,11 +630,16 @@
 "                                aukerekin erabiltzen bada) mantentzeko.\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Saio-hasiera    Hutsegiteak Gehienezkoa Azkena     Aktiboa\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds falta]"
 
 #, c-format
@@ -673,78 +647,71 @@
 msgstr " [%lds blokeatuta]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Erabiltzaile ezezaguna: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Erabilera: %s [-r|-R] taldea\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "           %s [-a erabiltzailea] taldea\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "           %s [-d erabiltzailea] taldea\n"
+#, fuzzy, c-format
+#| msgid "Unknown user or range: %s\n"
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Erabiltzaile edo eremu ezezaguna: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "           %s [-A erab,...] [-M erab,...] taldea\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: ezin da %s fitxategia ireki\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "           %s [-M erab,...] taldea\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: -A erabiltzeko itzalpeko talde-pasahitza eskatzen da\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: ezin da blokeatu\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: ezin da 'shadow' blokeatu\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "%s(r)en pasahitzak ezin dira aldatu.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: ezin da fitxategia ireki\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: -A erabiltzeko itzalpeko talde-pasahitza eskatzen da\n"
 
-#, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: ezin da fitxategia berridatzi\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: %s taldea ez da existitzen\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: ezin da 'shadow' fitxategia berridatzi\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: huts zatitzerakoan: %s\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"
-
-#, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: ezin da fitxategia itxi\n"
-
-#, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s ezin da shadow fitxategia itxi\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "%s taldearen pasahitza aldatzen\n"
 
@@ -761,9 +728,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Saiatu geroago\n"
 
-msgid "Who are you?\n"
-msgstr "Zer moduz zaude?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "%s erabiltzailea %s taldean gehitzen\n"
@@ -772,9 +736,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: `%s' erabiltzailea ez da existitzen\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -810,113 +775,92 @@
 "  -r, --system                  sistema kontu bat sortu\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: errorea talde sarrera berria gehitzean\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s ez da baliozko talde-izena\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: ezin da 'group' fitxategia berridatzi\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group ID '%s'\n"
+msgstr "%s: `%s' talde izen baliogabea\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: ezin da itzalpeko talde-fitxategia berridatzi\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: ezin da talde-fitxategia blokeatu\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: ezin da talde-fitxategia ireki\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: ezin da itzalpeko talde-fitxategia blokeatu\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: ezin da itzalpeko talde-fitxategia ireki\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K KEY=BALIOA eskatzen du\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 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"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "Partaidea dagoeneko badago\n"
 
-#, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: ezin da taldea sortu\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "Erabilera: groupdel taldea\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: errorea taldearen sarrera ezabatzean\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: ezin da %s direktorioa %s gisa izenez aldatu\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: errorea itzalpeko taldearen sarrera ezabatzean\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: Ezin da '%s' erabiltzailearen talde nagusia %u-tik %u-ra aldatu.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s ezin da erabiltzailearen talde nagusia ezabatu\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: %s taldea ez da existitzen\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: %s taldea NIS talde bat da\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: taldea '%s' NIS talde bat da.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s NIS nagusia da\n"
 
-msgid "Member already exists\n"
-msgstr "Partaidea dagoeneko badago\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s:  %s erabiltzailea NIS erabiltzaile bat da\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Ezabatzeko partaidea ez da aurkitu\n"
+#, fuzzy, c-format
+#| msgid "%s: Out of memory. Cannot update the group database.\n"
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: memoriarik ez. Ezin da talde datubasea eguneratu\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
-"Erabilera: groupmems -a erabiltzailea | -d erabiltzailea | -D | -l [-g "
-"taldea]\n"
 
-msgid "Only root can add members to different groups\n"
-msgstr "Root-ekbakarri gehitu ditzake partaideak talde ezberdinetara\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "Talde sarrera beharrezkoa da\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Ez da taldearen jabe nagusia\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "PAM autentifikazioak huts egin du\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Ezin da talde-fitxategia blokeatu\n"
-
-msgid "Unable to open group file\n"
-msgstr "Ezin da talde fitxategia ireki\n"
-
-msgid "Cannot close group file\n"
-msgstr "Ezin da talde fitxategia ireki\n"
-
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -942,43 +886,20 @@
 "berrirako\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s ez da aurkitu /etc/group-en\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "%s: `%s' talde izen baliogabea\n"
 
 #, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u ez da GID bakarra\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: %s taldea NIS talde bat da\n"
 
 #, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s ez da izen bakarra\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: %s erabiltzaile ezezaguna\n"
 
 #, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: ezin da passwd fitxategia berridatzi\n"
-
-#, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: ezin da pasahitz-fitxategia blokeatu\n"
-
-#, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: ezin da pasahitz-fitxategia ireki\n"
-
-#, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-"%s: Ezin da '%s' erabiltzailearen talde nagusia %u-tik %u-ra aldatu, berau "
-"ez dago passwd fitxategian eta.\n"
-
-#, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: Ezin da '%s' erabiltzailearen talde nagusia %u-tik %u-ra aldatu.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Erabilera: %s [-r] [-s] [taldea [gshadow]]\n"
 
@@ -990,18 +911,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s eta -r ezin dira batera erabili\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: ezin da %s fitxategia blokeatu\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "baliogabeko talde-fitxategiko sarrera"
 
@@ -1016,6 +925,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "'%s' baliogabeko talde-izena\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "'%s' baliogabeko talde-izena\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "%s taldea: %s erabiltzailea ez dago\n"
@@ -1028,18 +942,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "ez dago bat datorren talde fitxategi sarrerarik %s-(e)n\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "'%s' taldea %s(e)n gehitu?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: ezin da %s-ren itzalpeko sarrera eguneratu\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: ezin da %s taldearen sarrera eguneratu\n"
-
 msgid "invalid shadow group file entry"
 msgstr "Baliogabeko itzalpeko talde-fitxategiko sarrera"
 
@@ -1066,30 +973,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: aldaketarik gabe\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: ezin da itzalpeko talde-fitxategia blokeatu\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Erabilera: groupdel taldea\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: ezin da itzalpeko talde-fitxategia ireki\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Erabilera: groupdel taldea\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: ezin da itzalpeko %s taldea ezabatu\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: ezin da %s fitxategia eguneratu\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: ezin da itzalpeko talde-fitxategia eguneratu\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: ezin da talde-fitxategia eguneratu\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: ezin da itzalpeko talde-fitxategia ezabatu\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Erabilera: id [-a]\n"
 
@@ -1123,6 +1021,10 @@
 "                                erregistroa bistaratzen du\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Erabiltzaile-izena        Ataka      Nondik           Azkena"
 
@@ -1133,14 +1035,14 @@
 msgstr "**Inoiz ez du saiorik hasi**"
 
 #, c-format
-msgid "Unknown user or range: %s\n"
-msgstr "Erabiltzaile edo eremu ezezaguna: %s\n"
-
-#, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: argumentu esperogabea: %s\n"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Erabilera: %s [-p] [izena]\n"
 
@@ -1238,6 +1140,11 @@
 "saio hasiera denbora pasa da\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Erabilera: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Erabilera: newgrp [-] [taldea]\n"
 
@@ -1251,14 +1158,11 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: huts zatitzerakoan: %s\n"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "UID ezezaguna: %u\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: `%s' erabiltzailea ez da existitzen\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "GID ezezaguna: %lu\n"
-
 msgid "too many groups\n"
 msgstr "talde gehiegi\n"
 
@@ -1276,61 +1180,21 @@
 "  -r, --system                  sortu sistema kontuak\n"
 "%s\n"
 
-#, c-format
-msgid "%s: group ID `%s' is not valid\n"
-msgstr "%s: `%s' taldea IDa ez da baliozkoa\n"
-
-#, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "%s: `%s' talde izen baliogabea\n"
-
-#, c-format
-msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: %s taldea itzalpeko talde bat da, baina ez dago /etc/group-en\n"
 
-#, c-format
-msgid ""
-"%s: group %s created, failure during the creation of the corresponding "
-"gshadow group\n"
-msgstr "%s: %s taldea sortua, huts dagokion gshadow taldea sortzerakoan\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: '%s' erabiltzaile-izen baliogabea\n"
 
 #, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: `%s' erabiltzaile IDa ez da baliozkoa\n"
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: '%s' erabiltzaile-izen baliogabea\n"
 
 #, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: `%s' erabiltzailea ez da existitzen\n"
-
-#, c-format
-msgid "%s: invalid user name `%s'\n"
-msgstr "%s: `%s' erabiltzaile-izen baliogabea\n"
-
-#, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: ezin da '/etc/passwd' blokeatu.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: ezin da /etc/shadow blokeatu.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: ezin da /etc/group blokeatu.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: ezin da /etc/gshadow blokeatu.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1348,9 +1212,10 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: %d lerroa: ezin da taldea sortu\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: %d lerroa: ezin da %s erabiltzailea aurkitu\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: `%s' erabiltzailea ez da existitzen\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1368,6 +1233,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: %d lerroa: ezin da sarrera eguneratu\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1380,15 +1273,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1464,14 +1357,14 @@
 msgid "The password for %s cannot be changed yet.\n"
 msgstr "%s(r)en pasahitza ezin dira aldatu oraindik.\n"
 
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: memoriarik ez\n"
-
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 "%s: taldea desblokeatzeak pasahitz gabeko kontu baten emaitza izan dezake\n"
 "Erabiltzaile hau desblokeatzeko usermod -p erabiliaz pasahitz bat ezarri "
@@ -1517,16 +1410,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "%s erabiltzaile-izen baliogabea\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "%s erabiltzaile-izen baliogabea\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "%s erabiltzailea: ez da %u taldea\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "%s erabiltzailea: %s direktorioa ez da existitzen\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "%s erabiltzailea: %s programa ez da existitzen\n"
 
 #, c-format
@@ -1537,10 +1438,6 @@
 msgid "add user '%s' in %s? "
 msgstr "'%s' erabiltzailea %s(e)n gehitu?"
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: ezin da %s(r)en pasahitzaren sarrera eguneratu\n"
-
 msgid "invalid shadow password file entry"
 msgstr "baliogabeko itzalpeko pasahitz-fitxategiko sarrera"
 
@@ -1551,34 +1448,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "%s erabiltzailea: pasahitza etorkizunean aldatu zen azken aldiz\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: ezin da pasahitz-fitxategia blokeatu\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: ezin da %s fitxategia ireki\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: ezin da pasahitz-fitxategia ireki\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Erabilera: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: ezin da %s(r)en itzalpeko sarrera kendu\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: ezin da 'shadow' fitxategia eguneratu\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Erabilera: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: ezin da 'passwd' fitxategia eguneratu\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: ezin da %s erabiltzailearen sarrera eguneratu\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: ezin da itzalpeko pasahitz-fitxategia ezabatu\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "kontu honentzako 'su' sarbidea UKATUTA.\n"
 
@@ -1645,6 +1533,16 @@
 "%s: %s\n"
 "(Ez ikusi egin zaio)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: PAM autentifikazioak huts egin du\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Ez duzu 'su %s' exekutatzeko baimenik\n"
+
 msgid "No shell\n"
 msgstr "Ez dago shell-a\n"
 
@@ -1670,14 +1568,6 @@
 msgstr "Sistemaren mantentze-lanetako moduan sartzen"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: %s GID ezezaguna\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: %s talde ezezaguna\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: ezin da lehenespen fitxategi berria sortu\n"
 
@@ -1697,6 +1587,46 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: talde gehiegi zehaztu dira (geh. %d).\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: useradd [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
+#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#| "                                home directory\n"
+#| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#| "account\n"
+#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#| "  -D, --defaults                print or save modified default useradd\n"
+#| "                                configuration\n"
+#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#| "EXPIRE_DATE\n"
+#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#| "                                user account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#| "  -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"
+#| "  -N, --no-user-group           do not create a group with the same name "
+#| "as\n"
+#| "                                the user\n"
+#| "  -o, --non-unique              allow create user with duplicate\n"
+#| "                                (non-unique) UID\n"
+#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#| "                                account\n"
+#| "  -r, --system                  create a system account\n"
+#| "  -s, --shell SHELL             the login shell for the new user account\n"
+#| "  -u, --uid UID                 force use the UID for the new user "
+#| "account\n"
+#| "  -U, --user-group              create a group with the same name as the "
+#| "user\n"
+#| "\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1717,10 +1647,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1773,14 +1705,6 @@
 "\n"
 
 #, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: memoriarik ez. Ezin da talde datubasea eguneratu\n"
-
-#, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: memoriarik ez. Ezin da shadow talde datubasea eguneratu\n"
-
-#, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: oinarrizko '%s' direktorio baliogabea\n"
 
@@ -1817,50 +1741,14 @@
 msgstr "%s: %s eta %s aukerak elkar-jotzen dute\n"
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: '%s' erabiltzaile-izen baliogabea\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: ezin da pasahitz-fitxategia berridatzi\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: ezin da itzalpeko pasahitz-fitxategia berridatzi\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: ezin da itzalpeko pasahitz-fitxategia blokeatu\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: ezin da itzalpeko pasahitz-fitxategia ireki\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: errorea talde-fitxategia blokeatzean\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: errorea talde-fitxategia irekitzean\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: errorea itzalpeko talde-fitxategia blokeatzean\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: errorea itzalpeko talde-fitxategia irekitzean\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: errorea pasahitzaren sarrera berria gehitzean\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: errorea itzalpeko pasahitzaren sarrera berria gehitzean\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: ezin da %s direktorioa sortu\n"
 
@@ -1876,8 +1764,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Postakutxa fitxategi baimenak ezartzen"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: %s erabiltzailea badago dagoeneko\n"
 
 #, c-format
@@ -1890,11 +1779,16 @@
 msgid "%s: can't create user\n"
 msgstr "%s: ezin da erabiltzailea sortu\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: %u UID-a ez da bakarra\n"
 
 #, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: ezin da taldea sortu\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1902,10 +1796,6 @@
 "%s: abisua: etxe direktorioa badago dagoeneko.\n"
 "Ez da bertara skel direktorioko fitxategirik kopiatuko.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr "%s: abisua: CREATE_HOME ez da onartzen, erabili '-m' aukera.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1925,53 +1815,28 @@
 "  -r, --remove                  etxe direktorioa eta posta hilara ezabatu\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: errorea taldearen sarrera eguneratzean\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: ezin da %s taldea ezabatu beste erabiltzaile baten talde nagusia bait "
 "da.\n"
 
 #, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: errorea itzalpeko taldearen sarrera eguneratzean\n"
-
-#, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: ezin da talde-fitxategia ireki\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: ezin da itzalpeko talde-fitxategia ireki\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: errorea pasahitzaren sarrera ezabatzean\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: errorea itzalpeko pasahitzaren sarrera ezabatzean\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: une honetan %s erabiltzaileak saioan sartuta dago\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: abisua: ezin da ezabatu "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s ez dago %s(r)en jabetzan. ez da ezabatuko\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: abisua: ezin da ezabatu "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: %s erabiltzailea ez da existitzen\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s:  %s erabiltzailea NIS erabiltzaile bat da\n"
 
@@ -2036,10 +1901,23 @@
 "  -U, --unlock                  erabiltzaile kontua desblokeatu\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: errorea itzalpeko talde sarrera berria gehitzean\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+"%s: taldea desblokeatzeak pasahitz gabeko kontu baten emaitza izan dezake\n"
+"Erabiltzaile hau desblokeatzeko usermod -p erabiliaz pasahitz bat ezarri "
+"behar duzu.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: %s erabiltzailea badago dagoeneko\n"
+
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: ez da banderarik eman\n"
@@ -2052,23 +1930,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr "%s: -L, -p, eta -U banderak esklusiboak dira\n"
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s:  %lu ez da uid bakarra\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "Partaidea dagoeneko badago\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: errorea pasahitzaren sarrera aldatzean\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: errorea pasahitzaren sarrera ezabatzean\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: errorea itzalpeko pasahitzaren sarrera ezabatzean\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: %s direktorioa badago\n"
 
@@ -2089,6 +1956,14 @@
 msgstr "%s: ezin da %s direktorioa %s gisa izenez aldatu\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: abisua: %s ez dago %s(r)en jabegoan\n"
 
@@ -2098,11 +1973,15 @@
 msgid "failed to rename mailbox"
 msgstr "huts egin du postontzia izenez aldatzean"
 
-#, c-format
+#, fuzzy, 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"
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 "%s eraldatu duzu\n"
 "Konsistetziagatik %s eraldatu behar duzu.\n"
@@ -2129,10 +2008,16 @@
 "  -s, --shadow                  shadow edo gshadow datubasea editatu\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: huts baimenak kentzerakoan (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s ez da aldatu\n"
@@ -2146,3 +2031,411 @@
 #, c-format
 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: can't lock password file\n"
+#~ msgstr "%s: ezin da pasahitzen fitxategia blokeatu\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: ezin da pasahitzen fitxategia ireki\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: ezin da itzalpeko (shadow) pasahitz fitxategia blokeatu\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: ezin da itzalpeko (shadow) pasahitz fitxategia ireki\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s:ezin da itzalpeko pasahitz fitxategia berridatzi\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: ezin da pasahitzen fitxategia berridatzi\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: ezin da pasahitzen fitxategia eguneratu\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: ezin da itzalpeko (shadow) pasahitz fitxategia eguneratu\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tIzen osoa: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tGela zenbakia: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tLaneko telefonoa: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tEtxeko telefonoa: %s\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Ezin izan da pasahitzen fitxategia ireki.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: ezin da talde-fitxategia blokeatu\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: ezin da talde-fitxategia ireki\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: ezin da gshadow fitxategia blokeatu\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s ezin da 'shadow' fitxategia ireki\n"
+
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: errorea gshadow fitxategia eguneratzean\n"
+
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: errorea talde fitxategia eguneratzean\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: %d. lerroa: %s talde ezezaguna\n"
+
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: %d lerroa: ezin da talde sarrera eguneratu\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: ezin da 'shadow' fitxategia blokeatu\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: errorea 'shadow' fitxategia eguneratzean\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: errorea pasahitzen fitxategia eguneratzean\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: %d. lerroa: %s erabiltzaile ezezaguna\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: %d. lerroa: ezin da pasahitzaren sarerra eguneratu\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: erabiltzaile ezezaguna\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Erabiltzaile ezezaguna: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Erabilera: %s [-r|-R] taldea\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "           %s [-a erabiltzailea] taldea\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "           %s [-d erabiltzailea] taldea\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "           %s [-A erab,...] [-M erab,...] taldea\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "           %s [-M erab,...] taldea\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: ezin da blokeatu\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: ezin da 'shadow' blokeatu\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: ezin da fitxategia ireki\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: ezin da fitxategia berridatzi\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: ezin da 'shadow' fitxategia berridatzi\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: ezin da fitxategia desblokeatu\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: ezin da sarrera eguneratu\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: ezin da 'shadow'-eko sarrera eguneratu\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "talde ezezaguna: %s\n"
+
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: ezin da fitxategia itxi\n"
+
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s ezin da shadow fitxategia itxi\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Zer moduz zaude?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: %s kide ezezaguna\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: errorea talde sarrera berria gehitzean\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: ezin da 'group' fitxategia berridatzi\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: ezin da itzalpeko talde-fitxategia berridatzi\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: ezin da talde-fitxategia blokeatu\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: ezin da talde-fitxategia ireki\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: ezin da itzalpeko talde-fitxategia blokeatu\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: ezin da itzalpeko talde-fitxategia ireki\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: %u GID-a ez da bakarra\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: errorea taldearen sarrera ezabatzean\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: errorea itzalpeko taldearen sarrera ezabatzean\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s ezin da erabiltzailearen talde nagusia ezabatu\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Ezabatzeko partaidea ez da aurkitu\n"
+
+#~ msgid ""
+#~ "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+#~ msgstr ""
+#~ "Erabilera: groupmems -a erabiltzailea | -d erabiltzailea | -D | -l [-g "
+#~ "taldea]\n"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "Root-ekbakarri gehitu ditzake partaideak talde ezberdinetara\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "Talde sarrera beharrezkoa da\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Ez da taldearen jabe nagusia\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "PAM autentifikazioak huts egin du\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Ezin da talde-fitxategia blokeatu\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Ezin da talde fitxategia ireki\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Ezin da talde fitxategia ireki\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s ez da aurkitu /etc/group-en\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u ez da GID bakarra\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s ez da izen bakarra\n"
+
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: ezin da passwd fitxategia berridatzi\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: ezin da pasahitz-fitxategia blokeatu\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: ezin da pasahitz-fitxategia ireki\n"
+
+#~ msgid ""
+#~ "%s: cannot change the primary group of user '%s' from %u to %u, since it "
+#~ "is not in the passwd file.\n"
+#~ msgstr ""
+#~ "%s: Ezin da '%s' erabiltzailearen talde nagusia %u-tik %u-ra aldatu, "
+#~ "berau ez dago passwd fitxategian eta.\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: ezin da %s fitxategia blokeatu\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: ezin da %s-ren itzalpeko sarrera eguneratu\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: ezin da %s taldearen sarrera eguneratu\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: ezin da itzalpeko talde-fitxategia blokeatu\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: ezin da itzalpeko talde-fitxategia ireki\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: ezin da itzalpeko %s taldea ezabatu\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: ezin da itzalpeko talde-fitxategia eguneratu\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: ezin da talde-fitxategia eguneratu\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: ezin da itzalpeko talde-fitxategia ezabatu\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "UID ezezaguna: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "GID ezezaguna: %lu\n"
+
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: `%s' taldea IDa ez da baliozkoa\n"
+
+#~ msgid ""
+#~ "%s: group %s created, failure during the creation of the corresponding "
+#~ "gshadow group\n"
+#~ msgstr "%s: %s taldea sortua, huts dagokion gshadow taldea sortzerakoan\n"
+
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: `%s' erabiltzaile IDa ez da baliozkoa\n"
+
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: `%s' erabiltzaile-izen baliogabea\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: ezin da '/etc/passwd' blokeatu.\n"
+
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: ezin da /etc/shadow blokeatu.\n"
+
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: ezin da /etc/group blokeatu.\n"
+
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: ezin da /etc/gshadow blokeatu.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: ezin dira fitxategiak ireki\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: errorea fitxategiak eguneratzean\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: %d lerroa: ezin da %s erabiltzailea aurkitu\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: ezin da %s(r)en pasahitzaren sarrera eguneratu\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: ezin da pasahitz-fitxategia blokeatu\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: ezin da pasahitz-fitxategia ireki\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: ezin da %s(r)en itzalpeko sarrera kendu\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: ezin da 'shadow' fitxategia eguneratu\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: ezin da 'passwd' fitxategia eguneratu\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: ezin da %s erabiltzailearen sarrera eguneratu\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: ezin da itzalpeko pasahitz-fitxategia ezabatu\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: %s GID ezezaguna\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: %s talde ezezaguna\n"
+
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: memoriarik ez. Ezin da shadow talde datubasea eguneratu\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: ezin da pasahitz-fitxategia berridatzi\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: ezin da itzalpeko pasahitz-fitxategia berridatzi\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: ezin da itzalpeko pasahitz-fitxategia blokeatu\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: ezin da itzalpeko pasahitz-fitxategia ireki\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: errorea talde-fitxategia blokeatzean\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: errorea talde-fitxategia irekitzean\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: errorea itzalpeko talde-fitxategia blokeatzean\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: errorea itzalpeko talde-fitxategia irekitzean\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: errorea pasahitzaren sarrera berria gehitzean\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: errorea itzalpeko pasahitzaren sarrera berria gehitzean\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr "%s: abisua: CREATE_HOME ez da onartzen, erabili '-m' aukera.\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: errorea taldearen sarrera eguneratzean\n"
+
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: errorea itzalpeko taldearen sarrera eguneratzean\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: ezin da talde-fitxategia ireki\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: ezin da itzalpeko talde-fitxategia ireki\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: errorea pasahitzaren sarrera ezabatzean\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: errorea itzalpeko pasahitzaren sarrera ezabatzean\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: %s erabiltzailea ez da existitzen\n"
+
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: errorea itzalpeko talde sarrera berria gehitzean\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s:  %lu ez da uid bakarra\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: errorea pasahitzaren sarrera aldatzean\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: errorea pasahitzaren sarrera ezabatzean\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: errorea itzalpeko pasahitzaren sarrera ezabatzean\n"

Modified: upstream/trunk/po/fi.po
===================================================================
--- upstream/trunk/po/fi.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/fi.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -53,6 +53,9 @@
 msgid "  Choose a new password."
 msgstr "  Valitse uusi salasana."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Salasanasi vanhenee %ld päivässä.\n"
@@ -64,7 +67,12 @@
 msgstr "Salasanasi vanhenee tänään."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Päätettä %s ei voi vaihtaa"
 
 msgid "Environment overflow\n"
@@ -88,14 +96,14 @@
 "Edellisen kirjautumisen jälkeen %d epäonnistunutta yritystä.\n"
 "Viimeisin oli %s päätteellä %s.\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "%s: ei saa ainutkertaista GID:iä\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
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s: ei saa ainutkertaista GID:iä\n"
-
 msgid "Too many logins.\n"
 msgstr "Liian monta sisäänkirjautumista.\n"
 
@@ -185,9 +193,18 @@
 msgstr "Tty-päätteesi nimeä ei voi selvittää."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: muisti loppui\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) epäonnistui\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "Ei\n"
+
 msgid "Password: "
 msgstr "Salasana: "
 
@@ -195,6 +212,11 @@
 msgid "%s's Password: "
 msgstr "Käyttäjän %s salasana: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: kentät liian pitkiä\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -292,42 +314,33 @@
 msgstr "%s: Lupa evätty.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Käyttäjätunnusta ei voi selvittää.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM-todennus epäonnistui\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: salasanatiedostoa ei voi lukita\n"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: tiedostoja ei voi lukita, yritä myöhemmin uudelleen\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: salasanatiedostoa ei voi avata\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: tiedostoa %s ei voi lukita\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: varjosalasanatiedostoa ei voi lukita\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: fork-kutsu epäonnistui: %s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: varjosalasanatiedostoa ei voi avata\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: Oikeuksien pudottaminen epäonnistui (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: varjosalasanatiedostoa ei voi uudelleenkirjoittaa\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: salasanatiedostoa ei voi uudelleenkirjoittaa\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: salasanatiedostoa ei voi päivittää\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: varjosalasanatiedostoa ei voi päivittää\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: varjosalasanatiedostoa ei ole\n"
 
@@ -335,9 +348,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: käyttäjää %s ei ole olemassa\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -362,57 +375,27 @@
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tKoko nimi: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Huonenumero"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tHuonenumero: %s\n"
-
 msgid "Work Phone"
 msgstr "Työpuhelin"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tTyöpuhelin: %s\n"
-
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tKotipuhelin: %s\n"
-
 msgid "Other"
 msgstr "Muu"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Ei voi vaihtaa tunnusta pääkäyttäjäksi.\n"
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Salasanatiedostoa ei voi lukita. Yritä myöhemmin uudelleen.\n"
-
-msgid "Cannot open the password file.\n"
-msgstr "Salasanatiedostoa ei voi avata.\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 "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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -445,9 +428,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: \"%s\" sisältää ei-sallittuja merkkejä\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Käyttäjätunnusta ei voi selvittää.\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: käyttäjää %s ei ole olemassa\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -495,7 +478,7 @@
 msgstr "%s: virheellinen numeroargumentti \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: Valitsinta -a voi käyttää VAIN yhdessä valitsimen -G kanssa\n"
 
 #, c-format
@@ -507,30 +490,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: ryhmätiedostoa ei voi lukita\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: ryhmätiedostoa ei voi avata\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: gshadow-tiedostoa ei voi lukita\n"
-
-#, c-format
-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"
 
@@ -538,38 +497,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: rivi %d: uusi salasana puuttuu\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: rivi %d: tuntematon ryhmä %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: ryhmää %s ei ole olemassa\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: käyttäjää %s ei ole olemassa\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: virhe päivitettäessä varjotiedostoa\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: virhe päivitettäessä salasanatiedostoa\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"
@@ -589,8 +534,9 @@
 msgid "Login Shell"
 msgstr "Sisäänkirjautumiskuori"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Et voi muuttaa käyttäjän %s kuorta.\n"
 
 #, c-format
@@ -601,24 +547,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Virheellinen tietue: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s on virheellinen kuori.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Käyttö: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: tuntematon käyttäjä\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -648,11 +610,16 @@
 "                                vain käyttäjälle TUNNUS\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Tunnus      Epäonn.  Enint.  Edellinen                Päätteellä\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds jäljellä]"
 
 #, c-format
@@ -660,76 +627,67 @@
 msgstr " [%lds lukittu]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Tuntematon käyttäjä: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Käyttö: %s [-r|-R] ryhmä\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a käyttäjä] ryhmä\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d käyttäjä] ryhmä\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Tuntematon käyttäjä: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A käyttäjä,...] [-M käyttäjä,...] ryhmä\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: tiedostoa %s ei voi lukita\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M käyttäjä,...] ryhmä\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: varjoryhmäsalanat vaaditaan valitsimelle -A\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: ei voi lukita\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: varjoa ei voi lukita\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Käyttäjän %s salasanaa ei voi vaihtaa.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: tiedosta ei voi avata\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: varjoryhmäsalanat vaaditaan valitsimelle -A\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: tiedosta ei voi avata\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: ryhmää %s ei ole olemassa\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: varjotiedostoa ei voi avata\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: fork-kutsu epäonnistui: %s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -748,9 +706,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Yritä myöhemmin uudelleen\n"
 
-msgid "Who are you?\n"
-msgstr "Kuka olet?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Lisätään käyttäjä %s ryhmään %s\n"
@@ -759,9 +714,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: käyttäjää %s ei ole olemassa\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -795,111 +750,89 @@
 "                                kopio-RYHMÄID:llä\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: virhe lisättäessä uutta ryhmätietuetta\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s ei ole kelpo ryhmänimi\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: ryhmätiedostoa ei voi uudelleenkirjoittaa\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "virheellinen ryhmänimi \"%s\"\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: varjoryhmätiedostoa ei voi uudelleenkirjoittaa\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: ryhmätiedostoa ei voi lukita\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: ryhmätiedostoa ei voi avata\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: varjoryhmätiedostoa ei voi lukita\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: varjoryhmätiedostoa ei voi avata\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K vaatii AVAIN=ARVO\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 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"
-
 #, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: tiedostoa %s ei voi luoda\n"
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "Jäsen on jo olemassa\n"
 
 msgid "Usage: groupdel group\n"
 msgstr "Käyttö: groupdel ryhmä\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: virhe poistettaessa ryhmätietuetta\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: hakemistoa %s ei voi uudelleennimetä hakemistoksi %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: virhe poistettaessa varjoryhmätietuetta\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: ei voi vaihtaa käyttäjää \"%s\" NIS-asiakkaalla.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: käyttäjän ensisijaista ryhmää ei voi poistaa\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: ryhmää %s ei ole olemassa\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: ryhmä %s on NIS-ryhmä\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: ryhmä \"%s\" on NIS-ryhmä.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: isäntä %s on NIS-palvelin\n"
 
-msgid "Member already exists\n"
-msgstr "Jäsen on jo olemassa\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: käyttäjä %s on NIS-käyttäjä\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Poistettavaa jäsentä ei löytynyt\n"
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: muisti loppui funktiossa update_group\n"
 
-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"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
 
-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 "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "Ryhmäoikeus vaaditaan\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Et ole nykyisen ryhmän ensisijainen omistaja\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "PAM-todennus epäonnistui\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Ryhmätiedostoa ei voi lukita\n"
-
-msgid "Unable to open group file\n"
-msgstr "Ryhmätiedostoa ei voi avata\n"
-
-msgid "Cannot close group file\n"
-msgstr "Ryhmätiedostoa ei voi avata\n"
-
 #, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
@@ -922,41 +855,19 @@
 "  -o, --non-unique              salli saman RYHMÄID:n käyttäminen RYHMÄlle\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: Ryhmää %s ei löydy tiedostosta /etc/group\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u ei ole ainutkertainen GID\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s ei ole ainutkertainen nimi\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: salasanatiedostoa ei voi uudelleenkirjoittaa\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "virheellinen ryhmänimi \"%s\"\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: salasanatiedostoa ei voi lukita\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: ryhmä %s on NIS-ryhmä\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: salasanatiedostoa ei voi avata\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: Tuntematon käyttäjä %s\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: ei voi vaihtaa käyttäjää \"%s\" NIS-asiakkaalla.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Käyttö: %s [-r] [-s] [ryhmä [ryhmävarjo]]\n"
 
@@ -968,18 +879,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: valitsimet -s ja -r eivät sovi yhteen\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: tiedostoa %s ei voi lukita\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "virheellinen ryhmätiedostotietue"
 
@@ -994,6 +893,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "virheellinen ryhmänimi \"%s\"\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "virheellinen ryhmänimi \"%s\"\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "ryhmä %s: ei käyttäjää %s\n"
@@ -1006,18 +910,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "ei täsmäävää ryhmätiedostotietuetta tiedostossa %s\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "lisää ryhmä \"%s\" tiedostoon %s?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: varjotietuetta ryhmälle %s ei voi päivittää\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: ryhmän %s tietuetta ei voi päivittää\n"
-
 msgid "invalid shadow group file entry"
 msgstr "virheellinen tietue varjoryhmätiedostossa"
 
@@ -1044,30 +941,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: ei muutoksia\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: varjoryhmätiedostoa ei voi lukita\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Käyttö: groupdel ryhmä\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: varjoryhmätiedostoa ei voi avata\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Käyttö: groupdel ryhmä\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: varjoryhmää %s ei voi poistaa\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: tiedostoa %s ei voi päivittää\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: varjoryhmätiedostoa ei voi päivittää\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: ryhmätiedostoa ei voi päivittää\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: varjoryhmätiedostoa ei voi poistaa\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Käyttö: id [-a]\n"
 
@@ -1099,6 +987,10 @@
 "  -h, --help                 Näytä tämä ohje ja lopeta\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Käyttäjä         Portti   Mistä            Viimeksi"
 
@@ -1108,15 +1000,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Käyttö: %s [-p] [nimi]\n"
 
@@ -1214,6 +1106,11 @@
 "sisäänkirjautumisaika ylitetty\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Käyttö: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Käyttö: newgrp [-] [ryhmä]\n"
 
@@ -1228,14 +1125,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: fork-kutsu epäonnistui: %s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "tuntematon UID: %u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: käyttäjää %s ei ole olemassa\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "tuntematon GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "liian monta ryhmää\n"
 
@@ -1249,60 +1142,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: ryhmää %s ei ole olemassa\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "virheellinen ryhmänimi \"%s\"\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: virheellinen käyttäjätunnus \"%s\"\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: käyttäjää %s ei ole olemassa\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: käyttäjää %s ei ole olemassa\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: virheellinen käyttäjätunnus \"%s\"\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: tiedostoa /etc/passwd ei voi lukita.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: tiedostoa /etc/passwd ei voi lukita.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: tiedostoa /etc/passwd ei voi lukita.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: tiedostoa /etc/passwd ei voi lukita.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1318,9 +1170,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: rivi %d: GIDiä ei voi luoda\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: rivi %d: käyttäjää %s ei löydy\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: käyttäjää %s ei ole olemassa\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1338,6 +1190,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: rivi %d: tietuetta ei voi päivittää\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1350,15 +1230,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1430,13 +1310,10 @@
 msgstr "Käyttäjän %s salasanaa ei voi vaihtaa.\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: muisti loppui\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1479,16 +1356,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "virheellinen käyttäjätunnus \"%s\"\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "virheellinen käyttäjätunnus \"%s\"\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "käyttäjä %s: ei ryhmää %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "käyttäjä %s: hakemistoa %s ei ole olemassa\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "käyttäjä %s: kuorta %s ei ole olemassa\n"
 
 #, c-format
@@ -1499,10 +1384,6 @@
 msgid "add user '%s' in %s? "
 msgstr "lisää käyttäjä \"%s\" tiedostoon %s? "
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: salasanatietuetta %s ei voi päivittää\n"
-
 msgid "invalid shadow password file entry"
 msgstr "virheellinen tietue varjosalasanatiedostossa"
 
@@ -1513,34 +1394,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "käyttäjä %s: viimeisin salasanan vaihto tapahtunut tulevaisuudessa\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: passwd-tiedostoa ei voi lukita\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: tiedostoa %s ei voi lukita\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: passwd-tiedostoa ei voi avata\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Käyttö: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: varjotietuetta %s ei voi poistaa\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: varjotiedostoa ei voi päivittää\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Käyttö: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: salasanatiedostoa ei voi päivittää\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: käyttäjän %s tietuetta ei voi päivittää\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: varjosalasanatiedostoa ei voi poistaa\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Tunnuksen vaihtaminen täksi käyttäjäksi EVÄTTY.\n"
 
@@ -1607,6 +1479,16 @@
 "%s: %s\n"
 "(Ohitettu)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: PAM-todennus epäonnistui\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Sinulla ei ole lupaa asettua käyttäjäksi %s\n"
+
 msgid "No shell\n"
 msgstr "Ei kuorta\n"
 
@@ -1632,14 +1514,6 @@
 msgstr "Siirrytään järjestelmän ylläpitotilaan"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: tuntematon GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: tuntematon ryhmä %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: uutta defaults-tiedostoa ei voi luoda\n"
 
@@ -1681,10 +1555,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1731,14 +1607,6 @@
 "käyttäjätunnukselle\n"
 "\n"
 
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: muisti loppui funktiossa update_group\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: muisti loppui funktiossa update_gshadow\n"
-
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: virheellinen perushakemisto \"%s\"\n"
@@ -1776,50 +1644,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: virheellinen käyttäjätunnus \"%s\"\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: salasanatiedostoa ei voi uudelleenkirjoittaa\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: varjosalasanatiedostoa ei voi uudelleenkirjoittaa\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: varjosalasanatiedostoa ei voi lukita\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: varjosalasanatiedostoa ei voi avata\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: virhe lukittaessa ryhmätiedostoa\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: virhe avattaessa ryhmätiedostoa\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: virhe lukittaessa varjoryhmätiedostoa\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: virhe avattaessa varjoryhmätiedostoa\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: virhe lisättäessä uutta salasanatietuetta\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: virhe lisättäessä uutta varjosalasanatietuetta\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: hakemistoa %s ei voi luoda\n"
 
@@ -1835,8 +1667,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Asetetaan postilaatikkotiedoston oikeudet"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: käyttäjä %s on olemassa\n"
 
 #, c-format
@@ -1850,10 +1683,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s: tiedostoa %s ei voi luoda\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u ei ole ainutkertainen\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: tiedostoa %s ei voi luoda\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1862,10 +1700,6 @@
 "%s: varoitus: kotihakemisto on jo olemassa.\n"
 "Ei kopioida yhtään tiedostoa sinne skel-hakemistosta.\n"
 
-#, c-format
-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
 msgid ""
 "Usage: userdel [options] LOGIN\n"
@@ -1886,53 +1720,28 @@
 "  -r, --remove                  Poista kotihakemistoja ja postilaatikko\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: virhe päivitettäessä ryhmätietuetta\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Ryhmää %s ei voi poistaa, koska se on toisen käyttäjän ensisijainen "
 "ryhmä.\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: virhe päivitettäessä ryhmätietuetta\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: ryhmätiedostoa ei voi avata\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: varjoryhmätiedostoa ei voi avata\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: virhe poistettaessa salasanatietuetta\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: virhe poistettaessa varjosalasanatietuetta\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: käyttäjä %s on nyt sisäänkirjautuneena\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: varoitus: ei voi poistaa tiedostoa "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: tiedoston %s omistaja ei ole %s, ei poisteta\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: varoitus: ei voi poistaa tiedostoa "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: käyttäjää %s ei ole olemassa\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: käyttäjä %s on NIS-käyttäjä\n"
 
@@ -2000,9 +1809,16 @@
 "  -U, --unlock                  Avaa annetun tunnuksen lukitus\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: virhe lisättäessä uutta ryhmätietuetta\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: käyttäjä %s on olemassa\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -2016,23 +1832,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: uid %lu ei ole ainutkertainen\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "Jäsen on jo olemassa\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: virhe muutettaessa salasanatietuetta\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: virhe poistettaessa salasanatietuetta\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: virhe poistettaessa varjosalasanatietuetta\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: hakemisto %s on olemassa\n"
 
@@ -2054,6 +1859,14 @@
 msgstr "%s: hakemistoa %s ei voi uudelleennimetä hakemistoksi %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: varoitus: tiedoston %s omistaja ei ole %s\n"
 
@@ -2067,7 +1880,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -2091,10 +1904,16 @@
 "  -s, --shadow                  Muokkaa shadow- tai gshadow-tietokantaa\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: Oikeuksien pudottaminen epäonnistui (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: tiedostoa %s ei muutettu\n"
@@ -2110,6 +1929,418 @@
 msgstr ""
 "%s: tiedostoa %s ei voi palauttaa: %s (muutoksesi ovat tiedostossa %s)\n"
 
+#~ msgid "%s: can't lock password file\n"
+#~ msgstr "%s: salasanatiedostoa ei voi lukita\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: salasanatiedostoa ei voi avata\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: varjosalasanatiedostoa ei voi lukita\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: varjosalasanatiedostoa ei voi avata\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: varjosalasanatiedostoa ei voi uudelleenkirjoittaa\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: salasanatiedostoa ei voi uudelleenkirjoittaa\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: salasanatiedostoa ei voi päivittää\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: varjosalasanatiedostoa ei voi päivittää\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tKoko nimi: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tHuonenumero: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tTyöpuhelin: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tKotipuhelin: %s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr "Salasanatiedostoa ei voi lukita. Yritä myöhemmin uudelleen.\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Salasanatiedostoa ei voi avata.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: ryhmätiedostoa ei voi lukita\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: ryhmätiedostoa ei voi avata\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: gshadow-tiedostoa ei voi lukita\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: varjotiedostoa ei voi avata\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: virhe päivitettäessä varjotiedostoa\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: virhe päivitettäessä ryhmätietuetta\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: rivi %d: tuntematon ryhmä %s\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: rivi %d: tietuetta ei voi päivittää\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: varjotiedostoa ei voi lukita\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: virhe päivitettäessä varjotiedostoa\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: virhe päivitettäessä salasanatiedostoa\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: rivi %d: tuntematon käyttäjä %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: rivi %d: salasanatietuetta ei voi päivittää\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: tuntematon käyttäjä\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Tuntematon käyttäjä: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Käyttö: %s [-r|-R] ryhmä\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a käyttäjä] ryhmä\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d käyttäjä] ryhmä\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A käyttäjä,...] [-M käyttäjä,...] ryhmä\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M käyttäjä,...] ryhmä\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: ei voi lukita\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: varjoa ei voi lukita\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: tiedosta ei voi avata\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: tiedostoa ei voi uudelleenkirjoittaa\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: varjotiedostoa ei voi uudelleenkirjoittaa\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: tiedoston lukkoa ei voi avata\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: tietuetta ei voi päivittää\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: varjotietuetta ei voi päivittää\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "tuntematon ryhmä: %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: tiedosta ei voi avata\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: varjotiedostoa ei voi avata\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Kuka olet?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: tuntematon jäsen %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: virhe lisättäessä uutta ryhmätietuetta\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: ryhmätiedostoa ei voi uudelleenkirjoittaa\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: varjoryhmätiedostoa ei voi uudelleenkirjoittaa\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: ryhmätiedostoa ei voi lukita\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: ryhmätiedostoa ei voi avata\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: varjoryhmätiedostoa ei voi lukita\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: varjoryhmätiedostoa ei voi avata\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u ei ole ainutkertainen\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: virhe poistettaessa ryhmätietuetta\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: virhe poistettaessa varjoryhmätietuetta\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: käyttäjän ensisijaista ryhmää ei voi poistaa\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Poistettavaa jäsentä ei löytynyt\n"
+
+#~ 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"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "Vain pääkäyttäjä voi lisätä jäseniä eri ryhmiin\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "Ryhmäoikeus vaaditaan\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Et ole nykyisen ryhmän ensisijainen omistaja\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "PAM-todennus epäonnistui\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Ryhmätiedostoa ei voi lukita\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Ryhmätiedostoa ei voi avata\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Ryhmätiedostoa ei voi avata\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: Ryhmää %s ei löydy tiedostosta /etc/group\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u ei ole ainutkertainen GID\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s ei ole ainutkertainen nimi\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: salasanatiedostoa ei voi uudelleenkirjoittaa\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: salasanatiedostoa ei voi lukita\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: salasanatiedostoa ei voi avata\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: tiedostoa %s ei voi lukita\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: varjotietuetta ryhmälle %s ei voi päivittää\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: ryhmän %s tietuetta ei voi päivittää\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: varjoryhmätiedostoa ei voi lukita\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: varjoryhmätiedostoa ei voi avata\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: varjoryhmää %s ei voi poistaa\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: varjoryhmätiedostoa ei voi päivittää\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: ryhmätiedostoa ei voi päivittää\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: varjoryhmätiedostoa ei voi poistaa\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "tuntematon UID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "tuntematon GID: %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: ryhmää %s ei ole olemassa\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: käyttäjää %s ei ole olemassa\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: virheellinen käyttäjätunnus \"%s\"\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: tiedostoa /etc/passwd ei voi lukita.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: tiedostoa /etc/passwd ei voi lukita.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: tiedostoa /etc/passwd ei voi lukita.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: tiedostoa /etc/passwd ei voi lukita.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: tiedostoja ei voi avata\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: virhe päivitettäessä tiedostoja\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: rivi %d: käyttäjää %s ei löydy\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: salasanatietuetta %s ei voi päivittää\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: passwd-tiedostoa ei voi lukita\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: passwd-tiedostoa ei voi avata\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: varjotietuetta %s ei voi poistaa\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: varjotiedostoa ei voi päivittää\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: salasanatiedostoa ei voi päivittää\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: käyttäjän %s tietuetta ei voi päivittää\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: varjosalasanatiedostoa ei voi poistaa\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: tuntematon GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: tuntematon ryhmä %s\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: muisti loppui funktiossa update_gshadow\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: salasanatiedostoa ei voi uudelleenkirjoittaa\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: varjosalasanatiedostoa ei voi uudelleenkirjoittaa\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: varjosalasanatiedostoa ei voi lukita\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: varjosalasanatiedostoa ei voi avata\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: virhe lukittaessa ryhmätiedostoa\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: virhe avattaessa ryhmätiedostoa\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: virhe lukittaessa varjoryhmätiedostoa\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: virhe avattaessa varjoryhmätiedostoa\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: virhe lisättäessä uutta salasanatietuetta\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: virhe lisättäessä uutta varjosalasanatietuetta\n"
+
+#~ 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"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: virhe päivitettäessä ryhmätietuetta\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: virhe päivitettäessä ryhmätietuetta\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: ryhmätiedostoa ei voi avata\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: varjoryhmätiedostoa ei voi avata\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: virhe poistettaessa salasanatietuetta\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: virhe poistettaessa varjosalasanatietuetta\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: käyttäjää %s ei ole olemassa\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: virhe lisättäessä uutta ryhmätietuetta\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: uid %lu ei ole ainutkertainen\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: virhe muutettaessa salasanatietuetta\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: virhe poistettaessa salasanatietuetta\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: virhe poistettaessa varjosalasanatietuetta\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: ei saa ainutkertaista GID:iä\n"
 
@@ -2119,18 +2350,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " päätteeltä \"%.100s\""
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: tiedostoja ei voi lukita, yritä myöhemmin uudelleen\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: rivi %d: UID:tä ei voi luoda\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/fr.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\n"
 "PO-Revision-Date: 2008-04-02 23:51+0200\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon at wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -62,6 +62,9 @@
 msgid "  Choose a new password."
 msgstr "  Choisissez un nouveau mot de passe."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Votre mot de passe arrivera en fin de validité dans %ld jours.\n"
@@ -73,7 +76,12 @@
 msgstr "Votre mot de passe arrive aujourd'hui en fin de validité."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Impossible de modifier le tty %s"
 
 msgid "Environment overflow\n"
@@ -97,16 +105,20 @@
 "%d échecs depuis la dernière connexion.\n"
 "Le dernier échec était le %s sur %s.\n"
 
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+#| msgid "Can't get unique GID (no more available GIDs)\n"
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr ""
+"Impossible d'obtenir un identifiant de groupe (GID) unique\n"
+"(plus de GID disponible)\n"
+
+#, fuzzy, c-format
+#| msgid "Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
+msgstr ""
 "Impossible d'obtenir un identifiant d'utilisateur (UID) unique\n"
 "(plus d'UID disponible)\n"
 
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr ""
-"Impossible d'obtenir un identifiant de groupe (GID) unique\n"
-"(plus de GID disponible)\n"
-
 msgid "Too many logins.\n"
 msgstr "Trop de connexions.\n"
 
@@ -200,9 +212,16 @@
 msgstr "Impossible de déterminer le nom de votre tty."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s : plus de mémoire\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "échec de malloc(%d)\n"
 
+msgid "No"
+msgstr ""
+
 msgid "Password: "
 msgstr "Mot de passe : "
 
@@ -210,6 +229,11 @@
 msgid "%s's Password: "
 msgstr "Mot de passe de %s : "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s : champs trop longs\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -312,50 +336,34 @@
 msgstr "%s : permission refusée.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s : Impossible de déterminer votre nom d'utilisateur.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 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"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s : impossible de verrouiller les fichiers, réessayez plus tard\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"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s : impossible d'ouvrir le fichier %s\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/"
-"shadow\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s : échec lors du clonage (« forking ») : %s\n"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr ""
-"%s : impossible d'ouvrir le fichier des mots de passe cachés /etc/shadow\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s : échec lors de l'abandon des privilèges (%s)\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"
-
-#, 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"
-
-#, 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"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr ""
-"%s : impossible de mettre à jour le fichier des mots de passe cachés /etc/"
-"shadow\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"
 
@@ -363,9 +371,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s : l'utilisateur « %s » n'existe pas\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -392,61 +401,27 @@
 msgid "Full Name"
 msgstr "Nom complet"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tNom complet : %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s : %s\n"
 
 msgid "Room Number"
 msgstr "N° de bureau"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tN° de bureau : %s\n"
-
 msgid "Work Phone"
 msgstr "Téléphone professionnel"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tTéléphone professionnel : %s\n"
-
 msgid "Home Phone"
 msgstr "Téléphone personnel"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tTéléphone personnel : %s\n"
-
 msgid "Other"
 msgstr "Autre"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Impossible de devenir superutilisateur.\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"
-
-msgid "Cannot open the password file.\n"
-msgstr "Impossible d'ouvrir le fichier des mots de passe /etc/passwd.\n"
-
 #, c-format
-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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -479,9 +454,10 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s : « %s » contient des caractères incorrects\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s : Impossible de déterminer votre nom d'utilisateur.\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s : l'utilisateur « %s » n'existe pas\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -533,8 +509,9 @@
 msgid "%s: invalid numeric argument '%s'\n"
 msgstr "%s : argument numérique « %s » incorrect\n"
 
-#, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+#, fuzzy, c-format
+#| msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s : l'indicateur %s n'est autorisé QU'AVEC l'indicateur %s\n"
 
 #, c-format
@@ -546,34 +523,6 @@
 msgstr "%s : méthode de chiffrement non gérée : %s\n"
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s : impossible de verrouiller le fichier des groupes /etc/group\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s : impossible d'ouvrir le fichier des groupes /etc/group\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr ""
-"%s : impossible de verrouiller le fichier des groupes cachés /etc/gshadow\n"
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-msgstr ""
-"%s : impossible d'ouvrir le fichier des mots de passe cachés /etc/shadow\n"
-
-#, 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 de "
-"groupe\n"
-
-#, c-format
-msgid "%s: error updating group file\n"
-msgstr "%s : erreur lors de la mise à jour du fichier des groupes\n"
-
-#, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s : ligne %d : ligne trop longue\n"
 
@@ -581,44 +530,25 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s : ligne %d : nouveau mot de passe manquant\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s : ligne %d : groupe %s inconnu\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s : le groupe %s n'existe pas\n"
 
-#, c-format
-msgid "%s: line %d: cannot update group entry\n"
-msgstr "%s : ligne %d : impossible de mettre l'entrée de groupe à jour\n"
+#, fuzzy, c-format
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s : l'utilisateur « %s » n'existe pas\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/"
-"shadow\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr ""
-"%s : erreur lors de la mise à jour du fichier des mots de passe /etc/passwd\n"
-
-#, c-format
-msgid "%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"
@@ -638,8 +568,9 @@
 msgid "Login Shell"
 msgstr "Interpréteur de commandes initial"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Vous ne pouvez pas changer l'interpréteur de commandes de %s.\n"
 
 #, c-format
@@ -650,24 +581,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s : entrée non valable : %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s n'est pas un interpréteur de commandes valable.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Syntaxe : expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s : utilisateur inconnu\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -700,11 +647,16 @@
 "                                dont le compte est LOGIN\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Identifiant Échecs   Maximum Dernier                 Sur\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds restants]"
 
 #, c-format
@@ -712,83 +664,72 @@
 msgstr " [%lds verrou]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Utilisateur %s inconnu\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Syntaxe : %s [-r|-R] groupe\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a utilisateur] groupe\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d utilisateur] groupe\n"
+#, fuzzy, c-format
+#| msgid "Unknown user or range: %s\n"
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Utilisateur inconnu ou plage inconnue : %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A utilisateur,...] [-M utilisateur,...] groupe\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s : impossible d'ouvrir le fichier %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M utilisateur,...] groupe\n"
-
-#, c-format
-msgid "%s: shadow group passwords required for -A\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
 msgstr ""
-"%s : mots de passe cachés dans /etc/gshadow nécessaires avec l'option -A\n"
 
 #, c-format
-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"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\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"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
 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"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Le mot de passe pour %s ne peut être changé.\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"
+msgid "%s: shadow group passwords required for -A\n"
 msgstr ""
-"%s : impossible de mettre à jour l'entrée dans le fichier /etc/shadow\n"
+"%s : mots de passe cachés dans /etc/gshadow nécessaires avec l'option -A\n"
 
-#, c-format
-msgid "unknown group: %s\n"
-msgstr "groupe inconnu : %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s : le groupe %s n'existe pas\n"
 
-#, c-format
-msgid "%s: can't close file\n"
-msgstr "%s : impossible de fermer le fichier\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s : échec lors du clonage (« forking ») : %s\n"
 
 #, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s : impossible de fermer le fichier des mots de passe cachés\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Changement du mot de passe pour le groupe %s\n"
 
@@ -805,9 +746,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s : réessayez plus tard\n"
 
-msgid "Who are you?\n"
-msgstr "Qui êtes-vous ?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Ajout de l'utilisateur %s au groupe %s\n"
@@ -816,9 +754,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s : l'utilisateur « %s » n'existe pas\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -855,121 +794,96 @@
 "  -r, --system                  créer un compte système\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s : erreur lors de l'ajout du nouveau groupe\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s : %s n'est pas un nom de groupe valable\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s : impossible de réécrire le fichier des mots de passe /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group ID '%s'\n"
+msgstr "%s : nom de groupe « %s » non valable\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr ""
-"%s : impossible de réécrire le fichier des mots de passe cachés /etc/"
-"gshadow\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr ""
-"%s : impossible de verrouiller le fichier des mots de passe /etc/group\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s : impossible d'ouvrir le fichier des mots de passe /etc/group\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr ""
-"%s : impossible de verrouiller le fichier des mots de passe cachés /etc/"
-"gshadow\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr ""
-"%s : impossible d'ouvrir le fichier des mots de passe cachés /etc/gshadow\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s : -K exige CLÉ=VALEUR\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 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"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "Ce membre existe déjà\n"
 
-#, c-format
-msgid "%s: can't create group\n"
-msgstr "%s : impossible de créer le groupe\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "Syntaxe : groupdel groupe\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s : erreur lors de la suppression de l'entrée dans /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s : impossible de renommer le répertoire %s en %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s : erreur lors de la suppression de l'entrée dans /etc/gshadow\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr ""
+"%s : impossible de changer le groupe primaire de l'utilisateur de « %s » de %"
+"u vers %u.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s : impossible d'enlever le groupe primaire de l'utilisateur.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s : le groupe %s n'existe pas\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s : le groupe %s est un groupe NIS\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s : le groupe « %s » est un groupe NIS.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s : %s est le maître NIS\n"
 
-msgid "Member already exists\n"
-msgstr "Ce membre existe déjà\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s : le compte %s est un compte NIS\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Le membre à supprimer est introuvable\n"
+#, fuzzy, c-format
+#| msgid "%s: Out of memory. Cannot update the group database.\n"
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr ""
+"%s : mémoire insuffisante. Impossible de mettre à jour la base\n"
+"de données des groupes.\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
-"Syntaxe : groupmems -a nom_utilisateur | -d nom_utilisateur | -D | -l [-g "
-"nom_groupe]\n"
 
-msgid "Only root can add members to different groups\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
 msgstr ""
-"Seul le superutilisateur (root) peut ajouter des membres à différents "
-"groupes\n"
 
-msgid "Group access is required\n"
-msgstr "L'accès de groupe est nécessaire\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Ce n'est pas le propriétaire principal du groupe actuel\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "Échec de la méthode d'authentification PAM pour\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Impossible de verrouiller le fichier des groupes /etc/group\n"
-
-msgid "Unable to open group file\n"
-msgstr "Impossible d'ouvrir le fichier des groupes /etc/group\n"
-
-msgid "Cannot close group file\n"
-msgstr "Impossible de fermer le fichier des groupes /etc/group\n"
-
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -997,46 +911,20 @@
 "                                nouveau mot de passe\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s : %s non trouvé dans /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "%s : nom de groupe « %s » non valable\n"
 
 #, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s : %u n'est pas un identifiant de groupe (GID) unique\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s : le groupe %s est un groupe NIS\n"
 
 #, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s : %s n'est pas un nom unique\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s : utilisateur %s inconnu\n"
 
 #, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s : impossible de réécrire le fichier des mots de passe /etc/passwd\n"
-
-#, c-format
-msgid "%s: unable to lock password file\n"
-msgstr ""
-"%s : impossible de verrouiller le fichier des mots de passe /etc/passwd\n"
-
-#, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s : impossible d'ouvrir le fichier des mots de passe /etc/passwd\n"
-
-#, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-"%s : impossible de changer le groupe primaire de l'utilisateur « %s » de %u "
-"vers %u car il ne se trouve pas dans le fichier des mots de passes.\n"
-
-#, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr ""
-"%s : impossible de changer le groupe primaire de l'utilisateur de « %s » de %"
-"u vers %u.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Syntaxe : %s [-r] [-s] [groupe [gshadow]]\n"
 
@@ -1048,18 +936,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s : -s et -r sont incompatibles\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s : impossible de verrouiller le fichier %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "entrée non valable dans le fichier /etc/group"
 
@@ -1074,6 +950,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "nom de groupe « %s » non valable\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "nom de groupe « %s » non valable\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "groupe %s : pas d'utilisateur %s\n"
@@ -1086,18 +967,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "aucune entrée correspondante dans le fichier de groupe %s\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "ajouter le groupe « %s » dans %s "
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s : impossible de mettre à jour l'entrée %s dans /etc/shadow\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s : impossible de mettre à jour l'entrée %s dans /etc/group\n"
-
 msgid "invalid shadow group file entry"
 msgstr ""
 "entrée non valable dans le fichier des mots de passe cachés /etc/gshadow"
@@ -1125,38 +999,21 @@
 msgid "%s: no changes\n"
 msgstr "%s : aucun changement\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr ""
-"%s : impossible de verrouiller le fichier des mots de passe cachés /etc/"
-"gshadow\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Syntaxe : groupdel groupe\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr ""
-"%s : impossible d'ouvrir le fichier des mots de passe cachés /etc/gshadow\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Syntaxe : groupdel groupe\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s : impossible de supprimer %s dans /etc/gshadow\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s : impossible de mettre à jour le fichier %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr ""
-"%s : impossible de mettre à jour le fichier des mots de passe cachés /etc/"
-"gshadow\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr ""
-"%s : impossible de mettre à jour le fichier des mots de passe /etc/group\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr ""
-"%s : impossible de supprimer le fichier des mots de passe cachés /etc/"
-"gshadow\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Syntaxe : id [-a]\n"
 
@@ -1189,6 +1046,10 @@
 "                                l'utilisateur dont le compte est LOGIN\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Utilisateur      Port     Venant de        Dernière"
 
@@ -1199,14 +1060,14 @@
 msgstr "**Jamais connecté**"
 
 #, c-format
-msgid "Unknown user or range: %s\n"
-msgstr "Utilisateur inconnu ou plage inconnue : %s\n"
-
-#, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog : paramètre inattendu : %s\n"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Syntaxe : %s [-p] [nom]\n"
 
@@ -1305,6 +1166,11 @@
 "Dépassement de temps lors de la connexion\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Syntaxe : id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Syntaxe : newgrp [-] [groupe]\n"
 
@@ -1318,14 +1184,11 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s : échec lors du clonage (« forking ») : %s\n"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "L'identifiant d'utilisateur (UID) %u est inconnu\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s : l'utilisateur « %s » n'existe pas\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "L'identifiant de groupe (GID) %lu est inconnu\n"
-
 msgid "too many groups\n"
 msgstr "trop de groupes\n"
 
@@ -1343,64 +1206,22 @@
 "  -r, --system                  créer des comptes système\n"
 "%s\n"
 
-#, c-format
-msgid "%s: group ID `%s' is not valid\n"
-msgstr "%s : l'identificateur de groupe « %s » n'est pas valable\n"
-
-#, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "%s : nom de groupe « %s » non valable\n"
-
-#, c-format
-msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr ""
 "%s : le groupe %s est un groupe caché, mais il n'existe pas dans /etc/group\n"
 
-#, c-format
-msgid ""
-"%s: group %s created, failure during the creation of the corresponding "
-"gshadow group\n"
-msgstr ""
-"%s : le groupe %s a été créé, échec lors de la création du group gshadow "
-"correspondant\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s : nom d'utilisateur « %s » non valable\n"
 
 #, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s : l'identifiant d'utilisateur « %s » n'est pas valable\n"
-
-#, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s : l'utilisateur « %s » n'existe pas\n"
-
-#, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s : nom d'utilisateur « %s » non valable\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s : impossible de verrouiller /etc/passwd.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s : impossible de verrouiller /etc/shadow.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s : impossible de verrouiller /etc/group.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s : impossible de verrouiller /etc/gshadow.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1418,9 +1239,10 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s : ligne %d : impossible de créer le groupe\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s : ligne %d : impossible de trouver l'utilisateur %s\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s : l'utilisateur « %s » n'existe pas\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1438,6 +1260,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s : ligne %d : impossible de mettre l'entrée à jour\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1450,15 +1300,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1533,14 +1383,14 @@
 msgid "The password for %s cannot be changed yet.\n"
 msgstr "Le mot de passe de %s ne peut être changé maintenant.\n"
 
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s : plus de mémoire\n"
-
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 "%s : le déverrouillage de l'utilisateur produirait un compte sans mot de "
 "passe.\n"
@@ -1589,16 +1439,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "nom d'utilisateur « %s » non valable\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "nom d'utilisateur « %s » non valable\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "utilisateur %s : aucun groupe %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "utilisateur %s : le répertoire %s n'existe pas\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "utilisateur %s : le programme %s n'existe pas\n"
 
 #, c-format
@@ -1609,10 +1467,6 @@
 msgid "add user '%s' in %s? "
 msgstr "ajouter l'utilisateur « %s » dans %s ? "
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s : impossible de mettre à jour l'entrée %s dans /etc/shadow\n"
-
 msgid "invalid shadow password file entry"
 msgstr ""
 "entrée non valable dans le fichier des mots de passe cachés /etc/shadow"
@@ -1624,39 +1478,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "utilisateur %s : changement du dernier mot de passe à venir\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr ""
-"%s : impossible de verrouiller le fichier des mots de passe /etc/passwd\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s : impossible d'ouvrir le fichier %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s : impossible d'ouvrir le fichier des mots de passe /etc/passwd\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Syntaxe : id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s : impossible d'enlever l'entrée %s dans /etc/shadow\n"
-
-#, c-format
-msgid "%s: can't update shadow file\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
-"%s : impossible de mettre à jour le fichier des mots de passe cachés /etc/"
-"shadow\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr ""
-"%s : impossible de mettre à jour le fichier des mots de passe /etc/passwd\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Syntaxe : id\n"
 
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s : impossible de mettre à jour l'entrée pour l'utilisateur %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr ""
-"%s : impossible d'effacer le fichier des mots de passe cachés /etc/shadow\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Accès à « su » à partir de ce compte REFUSÉ.\n"
 
@@ -1727,6 +1567,16 @@
 "%s : %s\n"
 "(Ignoré)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s : échec de la méthode d'authentification PAM\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Vous n'êtes pas autorisé à utiliser « su » %s\n"
+
 msgid "No shell\n"
 msgstr "Pas d'interpréteur de commandes\n"
 
@@ -1753,14 +1603,6 @@
 msgstr "Entrée dans le mode de maintenance du système"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s : l'identifiant de groupe (GID) %s est inconnu\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s : groupe %s inconnu\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s : impossible de créer le nouveau fichier des valeurs par défaut\n"
 
@@ -1780,6 +1622,46 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s : trop de groupes spécifiés (max %d).\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: useradd [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
+#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#| "                                home directory\n"
+#| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#| "account\n"
+#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#| "  -D, --defaults                print or save modified default useradd\n"
+#| "                                configuration\n"
+#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#| "EXPIRE_DATE\n"
+#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#| "                                user account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#| "  -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"
+#| "  -N, --no-user-group           do not create a group with the same name "
+#| "as\n"
+#| "                                the user\n"
+#| "  -o, --non-unique              allow create user with duplicate\n"
+#| "                                (non-unique) UID\n"
+#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#| "                                account\n"
+#| "  -r, --system                  create a system account\n"
+#| "  -s, --shell SHELL             the login shell for the new user account\n"
+#| "  -u, --uid UID                 force use the UID for the new user "
+#| "account\n"
+#| "  -U, --user-group              create a group with the same name as the "
+#| "user\n"
+#| "\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1800,10 +1682,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1861,18 +1745,6 @@
 "\n"
 
 #, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr ""
-"%s : mémoire insuffisante. Impossible de mettre à jour la base\n"
-"de données des groupes.\n"
-
-#, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr ""
-"%s : mémoire insuffisante. Impossible de mettre à jour la base\n"
-"de données des mots de passe cachés des groupes.\n"
-
-#, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s : répertoire de base non valable « %s »\n"
 
@@ -1909,58 +1781,14 @@
 msgstr "%s : les options %s et %s sont en conflit\n"
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s : nom d'utilisateur « %s » non valable\n"
-
-#, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s : impossible de réécrire le fichier des mots de passe /etc/passwd\n"
-
-#, c-format
-msgid "%s: cannot rewrite shadow password file\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
-"%s : impossible de réécrire le fichier des mots de passe cachés /etc/shadow\n"
 
 #, c-format
-msgid "%s: cannot lock shadow password file\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
 msgstr ""
-"%s : impossible de verrouiller le fichier des mots de passe cachés /etc/"
-"shadow\n"
 
 #, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr ""
-"%s : impossible d'ouvrir le fichier des mots de passe cachés /etc/shadow\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s : erreur lors du verrouillage du fichier /etc/group\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s : erreur lors d'ouverture du fichier /etc/group\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr ""
-"%s : erreur lors du verrouillage du fichier des mots de passe cachés /etc/"
-"gshadow\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr ""
-"%s : erreur lors de l'ouverture du fichier des mots de passe cachés /etc/"
-"gshadow\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s : erreur lors de l'ajout de la nouvelle entrée dans /etc/passwd\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s : erreur lors de l'ajout de la nouvelle entrée dans /etc/shadow\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s : impossible de créer le répertoire %s\n"
 
@@ -1976,8 +1804,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Définition des permissions de la boîte à lettres"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s : l'utilisateur %s existe\n"
 
 #, c-format
@@ -1991,11 +1820,16 @@
 msgid "%s: can't create user\n"
 msgstr "%s : impossible de créer l'utilisateur\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s : l'identifiant d'utilisateur (UID) %u n'est pas unique\n"
 
 #, c-format
+msgid "%s: can't create group\n"
+msgstr "%s : impossible de créer le groupe\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -2003,12 +1837,6 @@
 "%s : attention, le répertoire personnel existe déjà.\n"
 "Aucun fichier du répertoire « skels » n'y sera copié.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr ""
-"%s : attention : CREATE_HOME n'est pas pris en charge, veuillez utiliser -"
-"m.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -2029,56 +1857,28 @@
 "                                spool du courrier\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s : erreur lors de la mise à jour de l'entrée dans /etc/group\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s : impossible d'enlever le groupe %s qui est un groupe primaire pour un "
 "autre utilisateur.\n"
 
 #, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr ""
-"%s : erreur lors de la mise à jour de l'entrée de mots de passe cachés\n"
-"de groupes\n"
-
-#, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s : impossible d'ouvrir le fichier des groupes /etc/group\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr ""
-"%s : impossible d'ouvrir le fichier des mots de passe cachés /etc/gshadow\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s : erreur lors de la suppression de l'entrée dans /etc/passwd\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s : erreur lors de la suppression de l'entrée dans /etc/shadow\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s : l'utilisateur %s est connecté\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s : attention : suppression impossible "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s : %s n'appartient pas à %s, non supprimé\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s : attention : suppression impossible "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s : l'utilisateur %s n'existe pas\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s : le compte %s est un compte NIS\n"
 
@@ -2153,10 +1953,24 @@
 "  -U, --unlock                  déverrouiller le compte de l'utilisateur\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s : erreur lors de l'ajout de la nouvelle entrée cachée de groupe\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+"%s : le déverrouillage de l'utilisateur produirait un compte sans mot de "
+"passe.\n"
+"Vous devriez définir un mot de passe avec usermod -p pour déverrouiller ce "
+"compte d'utilisateur.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s : l'utilisateur %s existe\n"
+
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s : aucun indicateur n'a été précisé\n"
@@ -2169,23 +1983,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr "%s : les indicateurs -L, -p et -U s'excluent mutuellement\n"
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s : l'identifiant d'utilisateur (UID) %lu n'est pas unique\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "Ce membre existe déjà\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s : erreur lors du changement de l'entrée dans /etc/passwd\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s : erreur lors de l'effacement du mot de passe\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s : erreur lors de la suppression de l'entrée dans /etc/shadow\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s : le répertoire %s existe\n"
 
@@ -2207,6 +2010,14 @@
 msgstr "%s : impossible de renommer le répertoire %s en %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s : attention : %s n'appartient pas à %s\n"
 
@@ -2216,11 +2027,15 @@
 msgid "failed to rename mailbox"
 msgstr "échec du changement de nom de la boîte à lettres"
 
-#, c-format
+#, fuzzy, 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"
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 "Vous avez modifié %s.\n"
 "Pour des raisons de cohérence, vous devriez modifier %s.\n"
@@ -2251,10 +2066,16 @@
 "                                shadow ou gshadow\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s : échec lors de l'abandon des privilèges (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s : %s est inchangé\n"
@@ -2270,6 +2091,500 @@
 msgstr ""
 "%s : impossible de restaurer %s : %s (vos modifications sont dans %s)\n"
 
+#~ msgid "%s: can't lock password file\n"
+#~ msgstr ""
+#~ "%s : impossible de verrouiller le fichier des mots de passe /etc/passwd\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s : impossible d'ouvrir le fichier des mots de passe /etc/passwd\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr ""
+#~ "%s : impossible de verrouiller le fichier des mots de passe cachés /etc/"
+#~ "shadow\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr ""
+#~ "%s : impossible d'ouvrir le fichier des mots de passe cachés /etc/shadow\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"
+
+#~ 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: can't update password file\n"
+#~ msgstr ""
+#~ "%s : impossible de mettre à jour le fichier des mots de passe /etc/"
+#~ "passwd\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr ""
+#~ "%s : impossible de mettre à jour le fichier des mots de passe cachés /etc/"
+#~ "shadow\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tNom complet : %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tN° de bureau : %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tTéléphone professionnel : %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tTéléphone personnel : %s\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"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Impossible d'ouvrir le fichier des mots de passe /etc/passwd.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s : impossible de verrouiller le fichier des groupes /etc/group\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s : impossible d'ouvrir le fichier des groupes /etc/group\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr ""
+#~ "%s : impossible de verrouiller le fichier des groupes cachés /etc/"
+#~ "gshadow\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr ""
+#~ "%s : impossible d'ouvrir le fichier des mots de passe cachés /etc/shadow\n"
+
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr ""
+#~ "%s : erreur lors de la mise à jour du fichier des mots de passe cachés de "
+#~ "groupe\n"
+
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s : erreur lors de la mise à jour du fichier des groupes\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s : ligne %d : groupe %s inconnu\n"
+
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s : ligne %d : impossible de mettre l'entrée de groupe à jour\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr ""
+#~ "%s : impossible de verrouiller le fichier des mots de passe cachés /etc/"
+#~ "shadow\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr ""
+#~ "%s : erreur lors de la mise à jour du fichier des mots de passe cachés /"
+#~ "etc/shadow\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr ""
+#~ "%s : erreur lors de la mise à jour du fichier des mots de passe /etc/"
+#~ "passwd\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s : ligne %d : utilisateur %s inconnu\n"
+
+#~ 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 "%s: unknown user\n"
+#~ msgstr "%s : utilisateur inconnu\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Utilisateur %s inconnu\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Syntaxe : %s [-r|-R] groupe\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a utilisateur] groupe\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d utilisateur] groupe\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A utilisateur,...] [-M utilisateur,...] groupe\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M utilisateur,...] groupe\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s : impossible d'obtenir le verrou\n"
+
+#~ 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 "%s: can't open file\n"
+#~ msgstr "%s : impossible d'ouvrir le fichier\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s : impossible de réécrire le fichier\n"
+
+#~ 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"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s : impossible de déverrouiller le fichier\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s : impossible de mettre à jour l'entrée\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr ""
+#~ "%s : impossible de mettre à jour l'entrée dans le fichier /etc/shadow\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "groupe inconnu : %s\n"
+
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s : impossible de fermer le fichier\n"
+
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s : impossible de fermer le fichier des mots de passe cachés\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Qui êtes-vous ?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s : membre %s inconnu\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s : erreur lors de l'ajout du nouveau groupe\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr ""
+#~ "%s : impossible de réécrire le fichier des mots de passe /etc/group\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr ""
+#~ "%s : impossible de réécrire le fichier des mots de passe cachés /etc/"
+#~ "gshadow\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr ""
+#~ "%s : impossible de verrouiller le fichier des mots de passe /etc/group\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s : impossible d'ouvrir le fichier des mots de passe /etc/group\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr ""
+#~ "%s : impossible de verrouiller le fichier des mots de passe cachés /etc/"
+#~ "gshadow\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr ""
+#~ "%s : impossible d'ouvrir le fichier des mots de passe cachés /etc/"
+#~ "gshadow\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s : l'identifiant de groupe (GID) %u n'est pas unique\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s : erreur lors de la suppression de l'entrée dans /etc/group\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s : erreur lors de la suppression de l'entrée dans /etc/gshadow\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s : impossible d'enlever le groupe primaire de l'utilisateur.\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Le membre à supprimer est introuvable\n"
+
+#~ 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"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr ""
+#~ "Seul le superutilisateur (root) peut ajouter des membres à différents "
+#~ "groupes\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "L'accès de groupe est nécessaire\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Ce n'est pas le propriétaire principal du groupe actuel\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "Échec de la méthode d'authentification PAM pour\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Impossible de verrouiller le fichier des groupes /etc/group\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Impossible d'ouvrir le fichier des groupes /etc/group\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Impossible de fermer le fichier des groupes /etc/group\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s : %s non trouvé dans /etc/group\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s : %u n'est pas un identifiant de groupe (GID) unique\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s : %s n'est pas un nom unique\n"
+
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr ""
+#~ "%s : impossible de réécrire le fichier des mots de passe /etc/passwd\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr ""
+#~ "%s : impossible de verrouiller le fichier des mots de passe /etc/passwd\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s : impossible d'ouvrir le fichier des mots de passe /etc/passwd\n"
+
+#~ msgid ""
+#~ "%s: cannot change the primary group of user '%s' from %u to %u, since it "
+#~ "is not in the passwd file.\n"
+#~ msgstr ""
+#~ "%s : impossible de changer le groupe primaire de l'utilisateur « %s » de %"
+#~ "u vers %u car il ne se trouve pas dans le fichier des mots de passes.\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s : impossible de verrouiller le fichier %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s : impossible de mettre à jour l'entrée %s dans /etc/shadow\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s : impossible de mettre à jour l'entrée %s dans /etc/group\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr ""
+#~ "%s : impossible de verrouiller le fichier des mots de passe cachés /etc/"
+#~ "gshadow\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr ""
+#~ "%s : impossible d'ouvrir le fichier des mots de passe cachés /etc/"
+#~ "gshadow\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s : impossible de supprimer %s dans /etc/gshadow\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr ""
+#~ "%s : impossible de mettre à jour le fichier des mots de passe cachés /etc/"
+#~ "gshadow\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr ""
+#~ "%s : impossible de mettre à jour le fichier des mots de passe /etc/group\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr ""
+#~ "%s : impossible de supprimer le fichier des mots de passe cachés /etc/"
+#~ "gshadow\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "L'identifiant d'utilisateur (UID) %u est inconnu\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "L'identifiant de groupe (GID) %lu est inconnu\n"
+
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s : l'identificateur de groupe « %s » n'est pas valable\n"
+
+#~ msgid ""
+#~ "%s: group %s created, failure during the creation of the corresponding "
+#~ "gshadow group\n"
+#~ msgstr ""
+#~ "%s : le groupe %s a été créé, échec lors de la création du group gshadow "
+#~ "correspondant\n"
+
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s : l'identifiant d'utilisateur « %s » n'est pas valable\n"
+
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s : nom d'utilisateur « %s » non valable\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s : impossible de verrouiller /etc/passwd.\n"
+
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s : impossible de verrouiller /etc/shadow.\n"
+
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s : impossible de verrouiller /etc/group.\n"
+
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s : impossible de verrouiller /etc/gshadow.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s : impossible d'ouvrir les fichiers\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s : erreur lors de la mise à jour des fichiers\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s : ligne %d : impossible de trouver l'utilisateur %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s : impossible de mettre à jour l'entrée %s dans /etc/shadow\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr ""
+#~ "%s : impossible de verrouiller le fichier des mots de passe /etc/passwd\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s : impossible d'ouvrir le fichier des mots de passe /etc/passwd\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s : impossible d'enlever l'entrée %s dans /etc/shadow\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr ""
+#~ "%s : impossible de mettre à jour le fichier des mots de passe cachés /etc/"
+#~ "shadow\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr ""
+#~ "%s : impossible de mettre à jour le fichier des mots de passe /etc/"
+#~ "passwd\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s : impossible de mettre à jour l'entrée pour l'utilisateur %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr ""
+#~ "%s : impossible d'effacer le fichier des mots de passe cachés /etc/"
+#~ "shadow\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s : l'identifiant de groupe (GID) %s est inconnu\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s : groupe %s inconnu\n"
+
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr ""
+#~ "%s : mémoire insuffisante. Impossible de mettre à jour la base\n"
+#~ "de données des mots de passe cachés des groupes.\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr ""
+#~ "%s : impossible de réécrire le fichier des mots de passe /etc/passwd\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr ""
+#~ "%s : impossible de réécrire le fichier des mots de passe cachés /etc/"
+#~ "shadow\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr ""
+#~ "%s : impossible de verrouiller le fichier des mots de passe cachés /etc/"
+#~ "shadow\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr ""
+#~ "%s : impossible d'ouvrir le fichier des mots de passe cachés /etc/shadow\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s : erreur lors du verrouillage du fichier /etc/group\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s : erreur lors d'ouverture du fichier /etc/group\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr ""
+#~ "%s : erreur lors du verrouillage du fichier des mots de passe cachés /etc/"
+#~ "gshadow\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr ""
+#~ "%s : erreur lors de l'ouverture du fichier des mots de passe cachés /etc/"
+#~ "gshadow\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr ""
+#~ "%s : erreur lors de l'ajout de la nouvelle entrée dans /etc/passwd\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr ""
+#~ "%s : erreur lors de l'ajout de la nouvelle entrée dans /etc/shadow\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr ""
+#~ "%s : attention : CREATE_HOME n'est pas pris en charge, veuillez utiliser -"
+#~ "m.\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s : erreur lors de la mise à jour de l'entrée dans /etc/group\n"
+
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr ""
+#~ "%s : erreur lors de la mise à jour de l'entrée de mots de passe cachés\n"
+#~ "de groupes\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s : impossible d'ouvrir le fichier des groupes /etc/group\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr ""
+#~ "%s : impossible d'ouvrir le fichier des mots de passe cachés /etc/"
+#~ "gshadow\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s : erreur lors de la suppression de l'entrée dans /etc/passwd\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s : erreur lors de la suppression de l'entrée dans /etc/shadow\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s : l'utilisateur %s n'existe pas\n"
+
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr ""
+#~ "%s : erreur lors de l'ajout de la nouvelle entrée cachée de groupe\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s : l'identifiant d'utilisateur (UID) %lu n'est pas unique\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s : erreur lors du changement de l'entrée dans /etc/passwd\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s : erreur lors de l'effacement du mot de passe\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s : erreur lors de la suppression de l'entrée dans /etc/shadow\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s : impossible d'obtenir un identifiant de groupe (GID) unique\n"
 
@@ -2279,9 +2594,6 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " sur « %.100s »"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s : impossible de verrouiller les fichiers, réessayez plus tard\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr ""
 #~ "%s : ligne %d : impossible de créer l'identifiant d'utilisateur (UID)\n"

Modified: upstream/trunk/po/gl.po
===================================================================
--- upstream/trunk/po/gl.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/gl.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -55,6 +55,9 @@
 msgid "  Choose a new password."
 msgstr " Escolla un novo contrasinal."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "O seu contrasinal ha caducar en %ld días.\n"
@@ -66,7 +69,12 @@
 msgstr "O seu contrasinal ha caducar hoxe."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Non se puido cambiar o tty %s"
 
 msgid "Environment overflow\n"
@@ -90,14 +98,14 @@
 "%d fallos desde a última entrada.\n"
 "O último foi o %s en %s.\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\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"
+
+#, 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
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s: non se pode obter un GID único\n"
-
 msgid "Too many logins.\n"
 msgstr "Entrou demasiadas veces.\n"
 
@@ -189,9 +197,18 @@
 msgstr "Non se pode determinar o nome do seu tty."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: memoria esgotada\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "A chamada a malloc(%d) fallou\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "Non\n"
+
 msgid "Password: "
 msgstr "Contrasinal: "
 
@@ -199,6 +216,11 @@
 msgid "%s's Password: "
 msgstr "Contrasinal de %s: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: campos longos de máis\n"
+
 #, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
@@ -295,42 +317,33 @@
 msgstr "%s: Permiso denegado.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Non se pode determinar o seu nome de usuario.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 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"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: non se pode bloquear ficheiros, volva tentalo despois\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: non se pode abrir o ficheiro de contrasinais\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: non se pode abrir o ficheiro %s\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: non se pode bloquear o ficheiro de contrasinais shadow\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: fallo ao lanzar o proceso: %s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: non se pode abrir o ficheiro de contrasinais shadow\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: non se puido deixar os privilexios (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: non se pode rescribir o ficheiro de contrasinais shadow\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: non se pode rescribir o ficheiro de contrasinais\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: non se pode actualizar o ficheiro de contrasinais\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: non se pode actualizar o ficheiro de contrasinais shadow\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: o ficheiro de contrasinais shadow non está presente\n"
 
@@ -338,9 +351,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: o usuario %s non existe\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -366,58 +379,27 @@
 msgid "Full Name"
 msgstr "Nome completo"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tNome completo: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Número de cuarto"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tNúmero de cuarto: %s\n"
-
 msgid "Work Phone"
 msgstr "Teléfono do traballo"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tTeléfono do traballo: %s\n"
-
 msgid "Home Phone"
 msgstr "Teléfono da casa"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tTeléfono da casa: %s\n"
-
 msgid "Other"
 msgstr "Outro"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Non se pode cambiar o ID a root.\n"
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr ""
-"Non se pode bloquear o ficheiro de contrasinais; volva tentalo despois.\n"
-
-msgid "Cannot open the password file.\n"
-msgstr "Non se pode abrir o ficheiro de contrasinais.\n"
-
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr "%s: non se atopou %s en /etc/passwd\n"
-
-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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -450,9 +432,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: \"%s\" contén caracteres non válidos\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Non se pode determinar o seu nome de usuario.\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: o usuario %s non existe\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -501,7 +483,7 @@
 msgstr "%s: argumento numérico \"%s\" non válido\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: o modificador -a SÓ se admite co modificador -G\n"
 
 #, c-format
@@ -513,30 +495,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: non se pode bloquear o ficheiro de grupos\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: non se pode abrir o ficheiro de grupos\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: non se pode bloquear o ficheiro gshadow\n"
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-msgstr "%s: non se pode abrir o ficheiro shadow\n"
-
-#, 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"
 
@@ -544,38 +502,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: liña %d: falla o novo contrasinal\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: liña %d: grupo %s descoñecido\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: o grupo %s non existe\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: o usuario %s non existe\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: erro ao actualizar o ficheiro shadow\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: erro ao actualizar o ficheiro de contrasinais\n"
-
-#, c-format
-msgid "%s: line %d: unknown user %s\n"
-msgstr "%s: liña %d: usuario %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
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
@@ -595,8 +539,9 @@
 msgid "Login Shell"
 msgstr "Intérprete de ordes"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Non pode cambiar o intérprete de ordes de %s.\n"
 
 #, c-format
@@ -607,17 +552,14 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Entrada non válida: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s non é un intérprete de ordes válido.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Emprego: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: usuario descoñecido\n"
-
 #, fuzzy
 msgid ""
 "Usage: faillog [options]\n"
@@ -625,7 +567,7 @@
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -654,11 +596,16 @@
 "\t\t\topcións -r, -m ou -l) só do USUARIO\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Usuario     Fallos   Máximo  Último                   O\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [fallan %lds]"
 
 #, c-format
@@ -666,76 +613,67 @@
 msgstr " [bloqueado %lds]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Usuario descoñecido: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Emprego: %s [-r|-R] grupo\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "         %s [-a usuario] grupo\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "         %s [-d usuario] grupo\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Usuario descoñecido: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "         %s [-A usuario,...] [-M usuario,...] grupo\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: non se pode abrir o ficheiro %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "         %s [-M usuario,...] grupo\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: precísase de contrasinais de grupo shadow para -A\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: non se pode obter un bloqueo\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: non se pode obter o bloqueo de shadow\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Non se pode cambiar o contrasinal de %s.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: non se pode abrir o ficheiro\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: precísase de contrasinais de grupo shadow para -A\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: non se pode abrir o ficheiro\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: o grupo %s non existe\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: non se pode abrir o ficheiro shadow\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: fallo ao lanzar o proceso: %s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -754,9 +692,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Volva tentalo despois\n"
 
-msgid "Who are you?\n"
-msgstr "¿Quen é vostede?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "A engadir o usuario %s ao grupo %s\n"
@@ -765,9 +700,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: o usuario %s non existe\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -799,111 +734,89 @@
 "  -o, --non-unique\tpermite crear un grupo cun GID duplicado (non único)\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: erro ao engadir a entrada do novo grupo\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s non é un nome de grupo válido\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: non se pode rescribir o ficheiro de grupos\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "nome de grupo \"%s\" non válido\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: non se pode rescribir o ficheiro de grupos shadow\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: non se pode bloquear o ficheiro de grupos\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: non se pode abrir o ficheiro de grupos\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: non se pode bloquear o ficheiro de grupos shadow\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: non se pode abrir o ficheiro de grupos shadow\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K precisa de CLAVE=VALOR\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 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"
-
 #, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: non se pode crear %s\n"
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "O membro xa existe\n"
 
 msgid "Usage: groupdel group\n"
 msgstr "Emprego: groupdel grupo\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: erro ao eliminar a entrada do grupo\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: non se pode cambiar o nome do directorio %s a %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: erro ao eliminar a entrada do grupo shadow\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: non se pode cambiar o usuario \"%s\" no cliente NIS.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: non se pode eliminar o grupo primario do usuario.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: o grupo %s non existe\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: o grupo %s é un grupo NIS\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: o grupo \"%s\" é un grupo NIS.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s é o mestre NIS\n"
 
-msgid "Member already exists\n"
-msgstr "O membro xa existe\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: o usuario %s é un usuario NIS\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Non se atopou o membro a eliminar\n"
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: esgotouse a memoria en update_group\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
-msgstr "Emprego: groupmems -a usuario | -d usuario | -D | -l [-g grupo]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
 
-msgid "Only root can add members to different groups\n"
-msgstr "Só o administrador pode engadir membros a distintos grupos\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "Precísase de acceso a grupos\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Non é o propietario primario do grupo actual\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "A autenticación con PAM fallou para\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Non se pode bloquear o ficheiro de grupos\n"
-
-msgid "Unable to open group file\n"
-msgstr "Non se pode abrir o ficheiro de grupos\n"
-
-msgid "Cannot close group file\n"
-msgstr "Non se pode pechar o ficheiro de grupos\n"
-
 #, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
@@ -926,41 +839,19 @@
 "  -o, --non-unique\t\tpermite crear un grupo cun GID duplicado\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: non se atopou %s en /etc/group\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u non é un GID único\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s non é un nome único\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: non se pode rescribir o ficheiro de contrasinais\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "nome de grupo \"%s\" non válido\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: non se pode bloquear o ficheiro de contrasinais\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: o grupo %s é un grupo NIS\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: non se pode abrir o ficheiro de contrasinais\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: usuario %s descoñecido\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: non se pode cambiar o usuario \"%s\" no cliente NIS.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Emprego: %s [-r] [-s] [grupo [gshadow]]\n"
 
@@ -972,18 +863,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s e -r son incompatibles\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: non se pode bloquear o ficheiro %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-msgstr "%s: non se pode abrir o ficheiro %s\n"
-
-#, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: non se pode actualizar o ficheiro %s\n"
-
 msgid "invalid group file entry"
 msgstr "entrada do ficheiro de grupos non válida"
 
@@ -998,6 +877,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "nome de grupo \"%s\" non válido\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "nome de grupo \"%s\" non válido\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "grupo %s: non existe o usuario %s\n"
@@ -1010,18 +894,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "non hai unha entrada do ficheiro de grupos que coincida en %s\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "¿engadir o grupo \"%s\" en %s? "
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: non se pode actualizar a entrada shadow para %s\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: non se pode actualizar a entrada do grupo %s\n"
-
 msgid "invalid shadow group file entry"
 msgstr "entrada do ficheiro de grupos shadow non válida"
 
@@ -1048,30 +925,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: non hai cambios\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: non se pode bloquear o ficheiro de grupos shadow\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Emprego: groupdel grupo\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: non se pode abrir o ficheiro de grupos shadow\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Emprego: groupdel grupo\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: non se pode eliminar o grupo shadow %s\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: non se pode actualizar o ficheiro %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: non se pode actualizar o ficheiro de grupos shadow\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: non se pode actualizar o ficheiro de grupos\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: non se pode borrar o ficheiro de grupos shadow\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Emprego: id [-a]\n"
 
@@ -1104,6 +972,10 @@
 "  -u, --user USUARIO\tamosa o rexistro de última entrada do USUARIO\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Usuario          Porto    Desde            Última"
 
@@ -1113,15 +985,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Emprego: %s [-p] [nome]\n"
 
@@ -1218,6 +1090,11 @@
 "superouse o tempo de entrada\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Emprego: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Emprego: newgrp [-] [grupo]\n"
 
@@ -1232,14 +1109,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: fallo ao lanzar o proceso: %s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "UID descoñecido: %u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: o usuario %s non existe\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "GID descoñecido: %lu\n"
-
 msgid "too many groups\n"
 msgstr "hai grupos de máis\n"
 
@@ -1253,60 +1126,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: o grupo %s non existe\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "nome de grupo \"%s\" non válido\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: nome de usuario \"%s\" non válido\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: o usuario %s non existe\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: o usuario %s non existe\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: nome de usuario \"%s\" non válido\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: non se pode bloquear /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: non se pode bloquear /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: non se pode bloquear /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: non se pode bloquear /etc/passwd.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1322,9 +1154,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: liña %d: non se pode crear o GID\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: liña %d: non se pode atopar o usuario %s\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: o usuario %s non existe\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1355,15 +1187,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1434,13 +1266,10 @@
 msgstr "Non se pode cambiar o contrasinal de %s.\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: memoria esgotada\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1483,16 +1312,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "nome de usuario \"%s\" non válido\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "nome de usuario \"%s\" non válido\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "usuario %s: non existe o grupo %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "usuario %s: o directorio %s non existe\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "usuario %s: o programa %s non existe\n"
 
 #, c-format
@@ -1503,10 +1340,6 @@
 msgid "add user '%s' in %s? "
 msgstr "¿engadir o usuario \"%s\" en %s? "
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: non se pode actualizar a entrada de contrasinal para %s\n"
-
 msgid "invalid shadow password file entry"
 msgstr "entrada do ficheiro de contrasinais shadow non válida"
 
@@ -1517,34 +1350,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "usuario %s: último cambio de contrasinal no futuro\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: non se pode bloquear o ficheiro de contrasinais\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: non se pode abrir o ficheiro %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: non se pode abrir o ficheiro de contrasinais\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Emprego: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: non se pode eliminar a entrada shadow para %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: non se pode actualizar o ficheiro shadow\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Emprego: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: non se pode actualizar o ficheiro de contrasinais\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: non se pode actualizar a entrada do usuario %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: non se pode borrar o ficheiro de contrasinais shadow\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "O acceso a su para esa conta está DENEGADO.\n"
 
@@ -1611,6 +1435,16 @@
 "%s: %s\n"
 "(Ignórase)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: a autenticación con PAM fallou\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Non está autorizado para facer su %s\n"
+
 msgid "No shell\n"
 msgstr "Non hai un intérprete de ordes\n"
 
@@ -1636,14 +1470,6 @@
 msgstr "A entrar no modo de mantemento do sistema"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: GID %s descoñecido\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: grupo %s descoñecido\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: non se pode crear o novo ficheiro de valores por defecto\n"
 
@@ -1684,10 +1510,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1729,14 +1557,6 @@
 "  -u, --uid UID\t\t\tusa o UID para a nova conta de usuario\n"
 "\n"
 
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: esgotouse a memoria en update_group\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: esgotouse a memoria en update_gshadow\n"
-
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: directorio base \"%s\" non válido\n"
@@ -1774,50 +1594,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: nome de usuario \"%s\" non válido\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: non se pode rescribir o ficheiro de contrasinais\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: non se pode rescribir o ficheiro de contrasinais shadow\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: non se pode bloquear o ficheiro de contrasinais shadow\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: non se pode abrir o ficheiro de contrasinais shadow\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: erro ao bloquear o ficheiro de grupos\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: erro ao abrir o ficheiro de grupos\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: erro ao bloquear o ficheiro de grupos shadow\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: erro ao abrir o ficheiro de grupos shadow\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: erro ao engadir a nova entrada de contrasinal\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: erro ao engadir a nova entrada de contrasinal shadow\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: non se pode crear o directorio %s\n"
 
@@ -1833,8 +1617,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "A estabrecer os permisos do ficheiro da caixa do correo"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: o usuario %s existe\n"
 
 #, c-format
@@ -1848,10 +1633,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s: non se pode crear %s\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: o UID %u non é único\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: non se pode crear %s\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1860,10 +1650,6 @@
 "%s: aviso: o directorio inicial xa existe.\n"
 "Non se copia nel ningún ficheiro do directorio skel.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr "%s: aviso: CREATE_HOME non está soportado, empregue -m no seu canto.\n"
-
 #, fuzzy
 msgid ""
 "Usage: userdel [options] LOGIN\n"
@@ -1883,53 +1669,28 @@
 "  -r, --remove\t\t\telimina o directorio inicial e o correo\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: erro ao actualizar a entrada do grupo\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Non se pode eliminar o grupo %s, que é o grupo primario de outro "
 "usuario.\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: erro ao actualizar a entrada do grupo\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: non se pode abrir o ficheiro de grupos\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: non se pode abrir o ficheiro de grupos shadow\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: erro ao eliminar a entrada de contrasinal\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: erro ao eliminar a entrada de contrasinal shadow\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: o usuario %s está conectado\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: aviso: non se pode eliminar "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s non pertence a %s, non se elimina\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: aviso: non se pode eliminar "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: o usuario %s non existe\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: o usuario %s é un usuario NIS\n"
 
@@ -1995,9 +1756,16 @@
 "  -U, --unlock\t\t\tdesbloquea a conta do usuario\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: erro ao engadir a entrada do novo grupo\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: o usuario %s existe\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -2011,23 +1779,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: o uid %lu non é único\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "O membro xa existe\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: erro ao cambiar a entrada de contrasinal\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: erro ao eliminar a entrada de contrasinal\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: erro ao eliminar a entrada de contrasinal shadow\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: o directorio %s existe\n"
 
@@ -2049,6 +1806,14 @@
 msgstr "%s: non se pode cambiar o nome do directorio %s a %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: aviso: %s non pertence a %s\n"
 
@@ -2062,7 +1827,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 #, fuzzy
@@ -2087,10 +1852,16 @@
 "  -s, --shadow\t\tedita a base de datos shadow ou gshadow\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: non se puido deixar os privilexios (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s non ten cambios\n"
@@ -2105,6 +1876,420 @@
 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: can't lock password file\n"
+#~ msgstr "%s: non se pode bloquear o ficheiro de contrasinais\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: non se pode abrir o ficheiro de contrasinais\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: non se pode bloquear o ficheiro de contrasinais shadow\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: non se pode abrir o ficheiro de contrasinais shadow\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: non se pode rescribir o ficheiro de contrasinais shadow\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: non se pode rescribir o ficheiro de contrasinais\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: non se pode actualizar o ficheiro de contrasinais\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: non se pode actualizar o ficheiro de contrasinais shadow\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tNome completo: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tNúmero de cuarto: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tTeléfono do traballo: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tTeléfono da casa: %s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr ""
+#~ "Non se pode bloquear o ficheiro de contrasinais; volva tentalo despois.\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Non se pode abrir o ficheiro de contrasinais.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: non se pode bloquear o ficheiro de grupos\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: non se pode abrir o ficheiro de grupos\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: non se pode bloquear o ficheiro gshadow\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: non se pode abrir o ficheiro shadow\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: erro ao actualizar o ficheiro shadow\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: erro ao actualizar a entrada do grupo\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: liña %d: grupo %s descoñecido\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: liña %d: non se pode actualizar a entrada\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: non se pode bloquear o ficheiro shadow\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: erro ao actualizar o ficheiro shadow\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: erro ao actualizar o ficheiro de contrasinais\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: liña %d: usuario %s descoñecido\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: liña %d: non se pode actualizar a entrada de contrasinal\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: usuario descoñecido\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Usuario descoñecido: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Emprego: %s [-r|-R] grupo\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "         %s [-a usuario] grupo\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "         %s [-d usuario] grupo\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "         %s [-A usuario,...] [-M usuario,...] grupo\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "         %s [-M usuario,...] grupo\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: non se pode obter un bloqueo\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: non se pode obter o bloqueo de shadow\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: non se pode abrir o ficheiro\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: non se pode rescribir o ficheiro\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: non se pode rescribir o ficheiro de shadow\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: non se pode desbloquear o ficheiro\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: non se pode actualizar a entrada\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: non se pode actualizar a entrada de shadow\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "grupo descoñecido: %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: non se pode abrir o ficheiro\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: non se pode abrir o ficheiro shadow\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "¿Quen é vostede?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: membro %s descoñecido\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: erro ao engadir a entrada do novo grupo\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: non se pode rescribir o ficheiro de grupos\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: non se pode rescribir o ficheiro de grupos shadow\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: non se pode bloquear o ficheiro de grupos\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: non se pode abrir o ficheiro de grupos\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: non se pode bloquear o ficheiro de grupos shadow\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: non se pode abrir o ficheiro de grupos shadow\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: o GID %u non é único\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: erro ao eliminar a entrada do grupo\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: erro ao eliminar a entrada do grupo shadow\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: non se pode eliminar o grupo primario do usuario.\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Non se atopou o membro a eliminar\n"
+
+#~ msgid ""
+#~ "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+#~ msgstr "Emprego: groupmems -a usuario | -d usuario | -D | -l [-g grupo]\n"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "Só o administrador pode engadir membros a distintos grupos\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "Precísase de acceso a grupos\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Non é o propietario primario do grupo actual\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "A autenticación con PAM fallou para\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Non se pode bloquear o ficheiro de grupos\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Non se pode abrir o ficheiro de grupos\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Non se pode pechar o ficheiro de grupos\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: non se atopou %s en /etc/group\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u non é un GID único\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s non é un nome único\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: non se pode rescribir o ficheiro de contrasinais\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: non se pode bloquear o ficheiro de contrasinais\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: non se pode abrir o ficheiro de contrasinais\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: non se pode bloquear o ficheiro %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: non se pode actualizar a entrada shadow para %s\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: non se pode actualizar a entrada do grupo %s\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: non se pode bloquear o ficheiro de grupos shadow\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: non se pode abrir o ficheiro de grupos shadow\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: non se pode eliminar o grupo shadow %s\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: non se pode actualizar o ficheiro de grupos shadow\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: non se pode actualizar o ficheiro de grupos\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: non se pode borrar o ficheiro de grupos shadow\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "UID descoñecido: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "GID descoñecido: %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: o grupo %s non existe\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: o usuario %s non existe\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: nome de usuario \"%s\" non válido\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: non se pode bloquear /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: non se pode bloquear /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: non se pode bloquear /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: non se pode bloquear /etc/passwd.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: non se pode abrir ficheiros\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: erro ao actualizar os ficheiros\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: liña %d: non se pode atopar o usuario %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: non se pode actualizar a entrada de contrasinal para %s\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: non se pode bloquear o ficheiro de contrasinais\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: non se pode abrir o ficheiro de contrasinais\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: non se pode eliminar a entrada shadow para %s\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: non se pode actualizar o ficheiro shadow\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: non se pode actualizar o ficheiro de contrasinais\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: non se pode actualizar a entrada do usuario %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: non se pode borrar o ficheiro de contrasinais shadow\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: GID %s descoñecido\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: grupo %s descoñecido\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: esgotouse a memoria en update_gshadow\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: non se pode rescribir o ficheiro de contrasinais\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: non se pode rescribir o ficheiro de contrasinais shadow\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: non se pode bloquear o ficheiro de contrasinais shadow\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: non se pode abrir o ficheiro de contrasinais shadow\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: erro ao bloquear o ficheiro de grupos\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: erro ao abrir o ficheiro de grupos\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: erro ao bloquear o ficheiro de grupos shadow\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: erro ao abrir o ficheiro de grupos shadow\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: erro ao engadir a nova entrada de contrasinal\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: erro ao engadir a nova entrada de contrasinal shadow\n"
+
+#~ 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"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: erro ao actualizar a entrada do grupo\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: erro ao actualizar a entrada do grupo\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: non se pode abrir o ficheiro de grupos\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: non se pode abrir o ficheiro de grupos shadow\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: erro ao eliminar a entrada de contrasinal\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: erro ao eliminar a entrada de contrasinal shadow\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: o usuario %s non existe\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: erro ao engadir a entrada do novo grupo\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: o uid %lu non é único\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: erro ao cambiar a entrada de contrasinal\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: erro ao eliminar a entrada de contrasinal\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: erro ao eliminar a entrada de contrasinal shadow\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: non se pode obter un GID único\n"
 
@@ -2114,18 +2299,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " en \"%.100s\""
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: non se pode bloquear ficheiros, volva tentalo despois\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: liña %d: non se pode crear o UID\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/he.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -55,6 +55,9 @@
 msgid "  Choose a new password."
 msgstr "  בחר סיסמה חדשה."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "תוקף הסיסמה שלך יפוג בתוך %ld ימים.\n"
@@ -66,7 +69,12 @@
 msgstr "תוקף הסיסמה שלך פג היום."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "לא יכול לשנות tty %s"
 
 msgid "Environment overflow\n"
@@ -86,12 +94,12 @@
 msgstr[0] "%d שגיאה מאז כניסה אחרונה למערכת. האחרונה היתה %s על %s.\n"
 msgstr[1] "%d שגיאה מאז כניסה אחרונה למערכת. האחרונה היתה %s על %s.\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
-#, fuzzy
-msgid "Can't get unique GID (no more available GIDs)\n"
+#, fuzzy, c-format
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
 msgid "Too many logins.\n"
@@ -183,9 +191,16 @@
 msgstr "%s: לא יכול לקבוע את שם המשתמש שלך.\n"
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr ""
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) נכשל\n"
 
+msgid "No"
+msgstr ""
+
 msgid "Password: "
 msgstr "סיסמה: "
 
@@ -193,6 +208,11 @@
 msgid "%s's Password: "
 msgstr "הסיסמה של %s: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: שדות ארוכים מידי\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -276,41 +296,31 @@
 msgstr "%s: הגישה נאסרה\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: לא יכול לקבוע את שם המשתמש שלך.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: זיהוי PAM נכשל\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: לא יכול לנעול קובץ סיסמאות\n"
+#, fuzzy, c-format
+#| msgid "Cannot lock the password file; try again later.\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "לא יכול לנעול קובץ סיסמאות; נסה שוב מאוחר יותר\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: לא יכול לפתוח קובץ סיסמאות\n"
+#, fuzzy, c-format
+#| msgid "%s: can't open shadow file\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: לא יכול לפתוח קובץ צל\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: לא יכול לנעול קובץ סיסמאות צל\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: מספר טלפון בעבודה לא חוקי: \"%s\"\n"
 
 #, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: לא יכול לפתוח קובץ סיסמאות צל\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: לא יכול לכתוב מחדש קובץ סיסמאות צל\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: לא יכול לכתוב מחדש קובץ סיסמאות\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: לא יכול לעדכן קובץ סיסמאות\n"
-
-#, c-format
-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"
@@ -319,9 +329,9 @@
 msgid "%s: failed to drop privileges (%s)\n"
 msgstr ""
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: שם לא חוקי: \"%s\"\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -344,57 +354,26 @@
 msgid "Full Name"
 msgstr "שם מלא"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tשם מלא: %s\n"
+#, fuzzy, c-format
+msgid "\t%s: %s\n"
+msgstr "passwd: %s\n"
 
 msgid "Room Number"
 msgstr "מספר חדר"
 
-#, fuzzy, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "מספר חדר"
-
 msgid "Work Phone"
 msgstr "מספר טלפון בעבודה"
 
-#, fuzzy, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "מספר טלפון בעבודה"
-
 msgid "Home Phone"
 msgstr "מספר טלפון בבית"
 
-#, fuzzy, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "מספר טלפון בבית"
-
 msgid "Other"
 msgstr "אחר"
 
 msgid "Cannot change ID to root.\n"
 msgstr "לא יכול לשנות ID ל-root\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 not found in /etc/passwd\n"
-msgstr ""
-
-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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -426,9 +405,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: \"%s\" מכיל תווים לא חוקיים\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: לא יכול לקבוע את שם המשתמש שלך.\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: שם לא חוקי: \"%s\"\n"
 
 #, fuzzy, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -469,7 +448,7 @@
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
 #, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr ""
 
 #, c-format
@@ -481,30 +460,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: לא יכול לנעול קובץ צל\n"
-
-#, c-format
-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"
 
@@ -513,37 +468,22 @@
 msgstr "%s: שורה %d: חסרה סיסמה חדשה\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: unknown group %s\n"
+msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "%s: שורה %d: משתמש לא מוכר %s\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: שגיאה בעדכון קובץ סיסמאות\n"
-
-#, c-format
-msgid "%s: line %d: unknown user %s\n"
+#, fuzzy, c-format
+#| msgid "%s: line %d: unknown user %s\n"
+msgid "%s: line %d: user '%s' does not exist\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"
@@ -556,8 +496,9 @@
 msgid "Login Shell"
 msgstr "מעטפת כניסה למערכת"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "אינך רשאי לשנות את המעטפת בשביל %s.\n"
 
 #, c-format
@@ -568,24 +509,21 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: רשומה לא חוקית: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s היא מעטפת לא חוקית.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "שימוש: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr ""
-
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -598,88 +536,79 @@
 "\n"
 msgstr ""
 
-msgid "Login       Failures Maximum Latest                   On\n"
-msgstr ""
-
 #, c-format
-msgid " [%lds left]"
+msgid "faillog: Failed to get the entry for UID %d\n"
 msgstr ""
 
-#, c-format
-msgid " [%lds lock]"
+msgid "Login       Failures Maximum Latest                   On\n"
 msgstr ""
 
 #, c-format
-msgid "Unknown User: %s\n"
+msgid " [%lus left]"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "שימוש: %s [-r|-R] group\n"
-
 #, c-format
-msgid "       %s [-a user] group\n"
+msgid " [%lds lock]"
 msgstr ""
 
 #, c-format
-msgid "       %s [-d user] group\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
 msgstr ""
 
 #, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
+msgid "faillog: Failed to set max for UID %d\n"
 msgstr ""
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
 msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
+msgid "lastlog: Unknown user or range: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't get lock\n"
+msgid "faillog: Cannot open %s: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't open file\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't re-write file\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
+msgid "The options cannot be combined.\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't unlock file\n"
+msgid "%s: shadow group passwords required for -A\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't update entry\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr ""
-
-#, c-format
-msgid "unknown group: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: לא יכול לנעול קובץ צל\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: שם לא חוקי: \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: לא יכול לפתוח קובץ צל\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: מספר טלפון בעבודה לא חוקי: \"%s\"\n"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -698,9 +627,6 @@
 msgid "%s: Try again later\n"
 msgstr ""
 
-msgid "Who are you?\n"
-msgstr ""
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr ""
@@ -709,9 +635,9 @@
 msgid "Removing user %s from group %s\n"
 msgstr ""
 
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: שם לא חוקי: \"%s\"\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -733,114 +659,83 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
+msgstr "%s: שם לא חוקי: \"%s\"\n"
 
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
 #, c-format
-msgid "%s: cannot rewrite group file\n"
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
+msgid "%s: group '%s' already exists\n"
 msgstr ""
 
 #, c-format
-msgid "%s: unable to lock group file\n"
+msgid "%s: GID '%lu' already exists\n"
 msgstr ""
 
-#, c-format
-msgid "%s: unable to open group file\n"
+msgid "Usage: groupdel group\n"
 msgstr ""
 
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: לא יכול לשנות משתמש `%s' על לקוח NIS.\n"
 
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: לא יכול לשנות משתמש `%s' על לקוח NIS.\n"
 
-#, c-format
-msgid "%s: -K requires KEY=VALUE\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: group '%s' does not exist\n"
+msgstr "%s: שם לא חוקי: \"%s\"\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
-msgstr ""
-
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr ""
-
 #, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: לא יכול לנעול קובץ צל\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: שם לא חוקי: \"%s\"\n"
 
-msgid "Usage: groupdel group\n"
-msgstr ""
-
 #, c-format
-msgid "%s: error removing group entry\n"
+msgid "%s: %s is the NIS master\n"
 msgstr ""
 
 #, c-format
-msgid "%s: error removing shadow group entry\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "%s: cannot remove user's primary group.\n"
+msgid "%s: Out of memory. Cannot update %s.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: group %s does not exist\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
 
 #, c-format
-msgid "%s: group %s is a NIS group\n"
+msgid "%s: your groupname does not match your username\n"
 msgstr ""
 
 #, c-format
-msgid "%s: %s is the NIS master\n"
+msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-msgid "Member already exists\n"
-msgstr ""
-
-msgid "Member to remove could not be found\n"
-msgstr ""
-
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
-msgstr ""
-
-msgid "Only root can add members to different groups\n"
-msgstr ""
-
-msgid "Group access is required\n"
-msgstr ""
-
-msgid "Not primary owner of current group\n"
-msgstr ""
-
-#, fuzzy
-msgid "PAM authentication failed for\n"
-msgstr "%s: זיהוי PAM נכשל\n"
-
-#, fuzzy
-msgid "Unable to lock group file\n"
-msgstr "לא יכול לבצע cd ל-\"%s\"\n"
-
-msgid "Unable to open group file\n"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot close group file\n"
-msgstr "לא יכול לשחרר נעילה של קובץ הסיסמאות.\n"
-
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -854,41 +749,19 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr ""
-
 #, fuzzy, c-format
-msgid "%s: %u is not a unique GID\n"
+msgid "%s: invalid group name '%s'\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
 #, c-format
-msgid "%s: %s is not a unique name\n"
+msgid "%s: group %s is a NIS group\n"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: לא יכול לכתוב מחדש קובץ סיסמאות\n"
-
 #, c-format
-msgid "%s: unable to lock password file\n"
+msgid "%s: unknown user %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: לא יכול לשנות משתמש `%s' על לקוח NIS.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr ""
 
@@ -900,18 +773,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr ""
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: cannot update file %s\n"
-msgstr ""
-
 #, fuzzy
 msgid "invalid group file entry"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
@@ -928,6 +789,10 @@
 msgid "invalid group name '%s'\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "invalid group ID '%lu'\n"
+msgstr "%s: שם לא חוקי: \"%s\"\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr ""
@@ -941,17 +806,9 @@
 msgstr ""
 
 #, c-format
-msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr ""
-
 #, fuzzy
 msgid "invalid shadow group file entry"
 msgstr "%s: שגיאה בעדכון קובץ צל\n"
@@ -980,30 +837,18 @@
 msgid "%s: no changes\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr ""
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: grpconv\n"
+msgstr "שימוש: id\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
+msgid "Usage: grpunconv\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: cannot delete %s\n"
+msgstr "%s: לא יכול לנעול קובץ צל\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr ""
-
 msgid "Usage: id [-a]\n"
 msgstr "שימוש: id [-a]\n"
 
@@ -1025,6 +870,10 @@
 "\n"
 msgstr ""
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr ""
 
@@ -1035,11 +884,11 @@
 msgstr ""
 
 #, c-format
-msgid "Unknown user or range: %s\n"
+msgid "lastlog: unexpected argument: %s\n"
 msgstr ""
 
 #, c-format
-msgid "lastlog: unexpected argument: %s\n"
+msgid "lastlog: Cannot get the size of %s: %s\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -1129,6 +978,11 @@
 "\n"
 msgstr ""
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "שימוש: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr ""
 
@@ -1144,13 +998,9 @@
 msgstr "%s: מספר טלפון בעבודה לא חוקי: \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "unknown UID: %u\n"
-msgstr "%s: שורה %d: משתמש לא מוכר %s\n"
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: שם לא חוקי: \"%s\"\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr ""
-
 msgid "too many groups\n"
 msgstr ""
 
@@ -1163,61 +1013,19 @@
 "%s\n"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
-msgstr "%s: שם לא חוקי: \"%s\"\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "%s: שם לא חוקי: \"%s\"\n"
-
 #, c-format
-msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+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 ""
-
 #, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
+msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
 #, c-format
-msgid "%s: user `%s' does not exist\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
-msgstr "%s: שם לא חוקי: \"%s\"\n"
-
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: לא יכול לנעול קובץ צל\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: לא יכול לנעול קובץ צל\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: לא יכול לנעול קובץ צל\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error updating files\n"
-msgstr ""
-
-#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr ""
 
@@ -1233,9 +1041,10 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: שורה %d: לא יכול לעדכן רשומת סיסמה\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: line %d: unknown user %s\n"
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: שורה %d: משתמש לא מוכר %s\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1265,15 +1074,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1316,13 +1125,10 @@
 msgstr ""
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr ""
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1369,16 +1175,20 @@
 msgid "invalid user name '%s'\n"
 msgstr ""
 
-#, c-format
-msgid "user %s: no group %u\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "invalid user ID '%lu'\n"
+msgstr "%s: שם לא חוקי: \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "user '%s': no group %lu\n"
+msgstr "%s: שורה %d: משתמש לא מוכר %s\n"
+
 #, c-format
-msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr ""
 
 #, c-format
-msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -1389,10 +1199,6 @@
 msgid "add user '%s' in %s? "
 msgstr ""
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr ""
-
 #, fuzzy
 msgid "invalid shadow password file entry"
 msgstr "%s: לא יכול לנעול קובץ סיסמאות צל"
@@ -1405,34 +1211,24 @@
 msgid "user %s: last password change in the future\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: לא יכול לכתוב מחדש קובץ סיסמאות\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr ""
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "שימוש: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr ""
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "שימוש: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr ""
-
 msgid "Access to su to that account DENIED.\n"
 msgstr ""
 
@@ -1485,6 +1281,15 @@
 "(Ignored)\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: זיהוי PAM נכשל\n"
+
+#, c-format
+msgid "%s: You are not authorized to su at that time\n"
+msgstr ""
+
 msgid "No shell\n"
 msgstr ""
 
@@ -1507,15 +1312,7 @@
 msgid "Entering System Maintenance Mode"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: שורה %d: משתמש לא מוכר %s\n"
-
 #, c-format
-msgid "%s: unknown group %s\n"
-msgstr ""
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr ""
 
@@ -1555,10 +1352,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1573,14 +1372,6 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr ""
-
-#, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "ספרית שורש לא חוקית \"%s\"\n"
@@ -1618,50 +1409,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr ""
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr ""
 
@@ -1676,7 +1431,7 @@
 msgstr ""
 
 #, c-format
-msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr ""
 
 #, c-format
@@ -1689,19 +1444,19 @@
 msgstr "%s: לא יכול לנעול קובץ צל\n"
 
 #, fuzzy, c-format
-msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: לא יכול לנעול קובץ צל\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr ""
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1714,50 +1469,22 @@
 msgstr ""
 
 #, c-format
-msgid "%s: error updating group entry\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 
 #, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: user %s is currently logged in\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: שגיאה בעדכון קובץ צל\n"
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: שורה %d: לא יכול לעדכן רשומת סיסמה\n"
 
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr ""
-
-#, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr ""
-
-#, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr ""
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr ""
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr ""
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr ""
 
@@ -1796,39 +1523,33 @@
 "\n"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: שגיאה בעדכון קובץ צל\n"
-
 #, c-format
-msgid "%s: no flags given\n"
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
 msgstr ""
 
 #, c-format
-msgid "%s: shadow passwords required for -e and -f\n"
+msgid "%s: user '%s' already exists in %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the -L, -p, and -U flags are exclusive\n"
+msgid "%s: no flags given\n"
 msgstr ""
 
 #, c-format
-msgid "%s: uid %lu is not unique\n"
+msgid "%s: shadow passwords required for -e and -f\n"
 msgstr ""
 
 #, c-format
-msgid "%s: error changing password entry\n"
+msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
 #, c-format
-msgid "%s: error removing password entry\n"
+msgid "%s: UID '%lu' already exists\n"
 msgstr ""
 
 #, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr ""
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr ""
 
@@ -1849,6 +1570,14 @@
 msgstr ""
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr ""
 
@@ -1862,7 +1591,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -1877,12 +1606,14 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: failed to remove %s\n"
+msgstr "%s: מספר טלפון בעבודה לא חוקי: \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "%s: %s is unchanged\n"
+msgstr "סיסמה: "
+
 msgid "Couldn't lock file"
 msgstr ""
 
@@ -1893,6 +1624,141 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr ""
 
+#~ msgid "%s: can't lock password file\n"
+#~ msgstr "%s: לא יכול לנעול קובץ סיסמאות\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: לא יכול לפתוח קובץ סיסמאות\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: לא יכול לנעול קובץ סיסמאות צל\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: לא יכול לפתוח קובץ סיסמאות צל\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: לא יכול לכתוב מחדש קובץ סיסמאות צל\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: לא יכול לכתוב מחדש קובץ סיסמאות\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: לא יכול לעדכן קובץ סיסמאות\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: לא יכול לעדכן קובץ סיסמאות צל\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tשם מלא: %s\n"
+
 #, fuzzy
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "מספר חדר"
+
+#, fuzzy
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "מספר טלפון בעבודה"
+
+#, fuzzy
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "מספר טלפון בבית"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "לא יכול לפתוח את קובץ הסיסמאות.\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
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: לא יכול לנעול קובץ צל\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: שגיאה בעדכון קובץ צל\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: שגיאה בעדכון קובץ צל\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: שורה %d: לא יכול לעדכן רשומת סיסמה\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: לא יכול לנעול קובץ צל\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: שגיאה בעדכון קובץ צל\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: שגיאה בעדכון קובץ סיסמאות\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: שורה %d: לא יכול לעדכן רשומת סיסמה\n"
+
+#, fuzzy
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "שימוש: %s [-r|-R] group\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: לא יכול לנעול קובץ צל\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: לא יכול לפתוח קובץ צל\n"
+
+#, fuzzy
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "%s: זיהוי PAM נכשל\n"
+
+#, fuzzy
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "לא יכול לבצע cd ל-\"%s\"\n"
+
+#, fuzzy
+#~ msgid "Cannot close group file\n"
+#~ msgstr "לא יכול לשחרר נעילה של קובץ הסיסמאות.\n"
+
+#, fuzzy
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: שם לא חוקי: \"%s\"\n"
+
+#, fuzzy
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "%s: שורה %d: משתמש לא מוכר %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: לא יכול לנעול קובץ צל\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: לא יכול לנעול קובץ צל\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: לא יכול לנעול קובץ צל\n"
+
+#, fuzzy
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: שורה %d: משתמש לא מוכר %s\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: שגיאה בעדכון קובץ צל\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: שגיאה בעדכון קובץ צל\n"
+
+#, fuzzy
 #~ msgid "No password.\n"
 #~ msgstr "  בחר סיסמה חדשה.\n"

Modified: upstream/trunk/po/hu.po
===================================================================
--- upstream/trunk/po/hu.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/hu.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -53,6 +53,9 @@
 msgid "  Choose a new password."
 msgstr "  Adj új jelszót"
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "A jelszó %ld nap múlva lejár.\n"
@@ -64,7 +67,12 @@
 msgstr "Jelszavad érvényessége ma lejár"
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Nem lehet a következő terminálra váltani: %s"
 
 msgid "Environment overflow\n"
@@ -85,14 +93,14 @@
 "%d hiba az utolsó bejelentkezés óta\n"
 "A legutóbbi: %s itt: %s\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\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"
+
+#, 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
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s: nem szerezhető be egyedi csoportazonosító\n"
-
 msgid "Too many logins.\n"
 msgstr "Túl sok bejelentkezés\n"
 
@@ -184,9 +192,18 @@
 msgstr "Sikertelen tty név meghatározás."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: a memória elfogyott\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "Sikertelen malloc(%d)\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "Nem\n"
+
 msgid "Password: "
 msgstr "Jelszó: "
 
@@ -194,6 +211,11 @@
 msgid "%s's Password: "
 msgstr "%s jelszava: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: túl hosszú mezők\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -292,42 +314,33 @@
 msgstr "%s: Hozzáférés megtagadva.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: A felhasználóneved megállapítása sikertelen\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 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"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: fájlok zárolása sikertelen, próbáld később\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: a jelszófájl nem nyitható meg\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: %s fájl nem nyitható meg\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"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: hiba a következő indításakor: %s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: az árnyék jelszófájl megnyitása sikertelen\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: a jogosultságok eldobása meghiúsult (%s)\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"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: a jelszófájl újraírása sikertelen\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: a jelszófájl frissítése sikertelen\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: az árnyék jelszófájl frissítése sikertelen\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: nincs meg az árnyék jelszófájl\n"
 
@@ -335,9 +348,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: %s felhasználó nem létezik\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -364,57 +377,27 @@
 msgid "Full Name"
 msgstr "TELJES Név"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tTELJES Név: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Szobaszám"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tSzobaszám: %s\n"
-
 msgid "Work Phone"
 msgstr "Munkahelyi telefon"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tMunkahelyi telefon: %s\n"
-
 msgid "Home Phone"
 msgstr "Otthoni telefon"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tOtthoni telefon: %s\n"
-
 msgid "Other"
 msgstr "Egyéb"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Az ID nem cserélhető root-ra.\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"
-
-msgid "Cannot open the password file.\n"
-msgstr "A jelszófájl nem nyitható meg.\n"
-
 #, c-format
-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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -447,9 +430,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: \"%s\" illegális karaktereket tartalmaz\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: A felhasználóneved megállapítása sikertelen\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: %s felhasználó nem létezik\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -498,7 +481,7 @@
 msgstr "%s: érvénytelen numerikus argumentum: \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: -a kapcsoló CSAK -G-vel megy\n"
 
 #, c-format
@@ -510,30 +493,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: nem tudom lezárni a 'group' fájlt\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: nem tudom megnyitni a 'group' fájlt\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: nem tudom lezárni a 'gshadow' fájlt\n"
-
-#, c-format
-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"
 
@@ -541,38 +500,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: %d. sor: hiányzó új jelszó\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: %d.: ismeretlen %s csoport\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: %s csoport nem létezik\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: %s felhasználó nem létezik\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: hiba az árnyék fájl frissítésekor\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: hiba a jelszófájl frissítésekor\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"
@@ -591,8 +536,9 @@
 msgid "Login Shell"
 msgstr "Bejelentkező héj"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Nem módosíthatod %s parancsértelmezőjét.\n"
 
 #, c-format
@@ -603,24 +549,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Érvénytelen bejegyzés: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s érvénytelen héj.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Használat: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: ismeretlen felhasználó\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -654,11 +616,16 @@
 "értékeket.\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Név         Hibás Maximális Legutóbbi                   Ezen\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds van hátra]"
 
 #, c-format
@@ -666,76 +633,67 @@
 msgstr " [%lds zárolva]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Ismeretlen felhasználó: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Használat: %s [-r|-R] group\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a felhasználó] csoport\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d felhasználó] csoport\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Ismeretlen felhasználó: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A felhasználó,...] [-M felhasználó,...] csoport\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: %s fájl nem nyitható meg\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M felhasználó,...] csoport\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: árnyék csoport jelszavak kellenek ehhez: -A\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: nem szerezhető zár\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: nem szerezhető árnyékzár\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "%s jelszava nem változtatható\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: nem tudom megnyitni a fájlt\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: árnyék csoport jelszavak kellenek ehhez: -A\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: nem tudom megnyitni a fájlt\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: %s csoport nem létezik\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: nem tudom megnyitni a 'gshadow' fájlt\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: hiba a következő indításakor: %s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -754,9 +712,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Próbáld később\n"
 
-msgid "Who are you?\n"
-msgstr "Ki vagy?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "%s felhasználó hozzáadása %s csoporthoz\n"
@@ -765,9 +720,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: %s felhasználó nem létezik\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -802,113 +757,89 @@
 "                                szereplő (nem egyedi) GID értékkel\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: hiba az új csoport bejegyzés hozzáadásakor\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s rossz csoport név\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: nem tudom újraírni a csoport fájlt\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "érvénytelen csoportnév: `%s'\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: nem tudom újraírni az árnyék csoport fájlt\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: nem tudom zárolni a csoport fájlt\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: nem tudom megnyitni a csoport fájlt\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: nem tudom zárolni az árnyék csoport fájlt\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: nem tudom megnyitni az árnyék csoport fájlt\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K KULCS=ÉRTÉK párost kíván\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 msgstr "%s: %s csoport létezik\n"
 
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: %u GID nem egyedi\n"
-
 #, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: %s létrehozása sikertelen\n"
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "A tag már létezik\n"
 
 msgid "Usage: groupdel group\n"
 msgstr "Használat: groupdel csoport\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: nem tudom törölni a csoport bejegyzést\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: nem tudom átnevezni %s könyvtárat erre: %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: nem tudom törölni az árnyék csoport bejegyzést\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: `%s' felhasználó nem módosítható NIS kliensen.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: nem tudom törölni a felhasználó elsődleges csoportját\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: %s csoport nem létezik\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: %s egy NIS csoport\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: a(z) \"%s\" csoport egy NIS csoport.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s a NIS mester\n"
 
-msgid "Member already exists\n"
-msgstr "A tag már létezik\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: %s egy NIS felhasználó\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Az eltávolítandó tag nem található\n"
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: elfogyott a memória az update_group során\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
-"Használat: groupmems -a felhasználónév | -d felhasználónév | -D | -l [-g "
-"csoportnév]\n"
 
-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 "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "Csoport hozzáférés kell\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Nem a jelen csoport elsődleges tulajdonosa\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "PAM hitelesítési hiba ehhez:\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Csoport fájl zárolása sikertelen\n"
-
-msgid "Unable to open group file\n"
-msgstr "Csoport fájl megnyitása sikertelen\n"
-
-msgid "Cannot close group file\n"
-msgstr "Csoport fájl bezárása sikertelen\n"
-
 #, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
@@ -932,41 +863,19 @@
 "                                szereplő (nem egyedi) GID értékkel\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s nincs a /etc/group-ban\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u nem egyedi GID\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s nem egyedi név\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: nem tudom újraírni a jelszófájlt\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "érvénytelen csoportnév: `%s'\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: nem tudom zárolni a jelszófájlt\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: %s egy NIS csoport\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: nem tudom megnyitni a jelszófájlt\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: ismeretlen %s felhasználó\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: `%s' felhasználó nem módosítható NIS kliensen.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Használat: %s [-r] [-s] [csoport [gshadow]]\n"
 
@@ -978,18 +887,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s és -r inkompatibilisek\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: %s fájl nem zárolható\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "érvénytelen csoport fájl bejegyzés"
 
@@ -1004,6 +901,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "érvénytelen csoportnév: `%s'\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "érvénytelen csoportnév: `%s'\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "%s csoport: nincs %s felhasználó\n"
@@ -1016,18 +918,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "nincs megfelelő csoportfájl bejegyzés a következőben: %s\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "hozzáadod a(z) %s csoportot a következőhöz: %s ?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: nem tudom frissíteni %s árnyék bejegyzését\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: nem tudom frissíteni %s csoport bejegyzését\n"
-
 msgid "invalid shadow group file entry"
 msgstr "érvénytelen árnyék csoport fájl bejegyzés"
 
@@ -1054,30 +949,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: nincs változás\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: nem tudom zárolni az árnyék csoport fájlt\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Használat: groupdel csoport\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: nem tudom megnyitni az árnyék csoport fájlt\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Használat: groupdel csoport\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: nem tudom törölni %s árnyék csoportot\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: %s fájl nem frissíthető\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: nem tudom frissíteni az árnyék csoport fájlt\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: nem tudom frissíteni a csoport fájlt\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: nem tudom törölni az árnyék csoport fájlt\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Használat: id [-a]\n"
 
@@ -1110,6 +996,10 @@
 "                                rekordjainak kiírása\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Felhasználónév   Port     Innen            Legutóbb"
 
@@ -1119,15 +1009,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Használat: %s [-p] [név]\n"
 
@@ -1224,6 +1114,11 @@
 "bejelentkezési idő átlépve\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Használat: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Használat: newgrp [-] [csoport]\n"
 
@@ -1238,14 +1133,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: hiba a következő indításakor: %s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "ismeretlen UID: %u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: %s felhasználó nem létezik\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "ismeretlen GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "túl sok csoport\n"
 
@@ -1259,60 +1150,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: %s csoport nem létezik\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "érvénytelen csoportnév: `%s'\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: érvénytelen '%s' felhasználónév\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: %s felhasználó nem létezik\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: %s felhasználó nem létezik\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: érvénytelen '%s' felhasználónév\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: nem tudom zárolni a /etc/passwd fájlt.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: nem tudom zárolni a /etc/passwd fájlt.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: nem tudom zárolni a /etc/passwd fájlt.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: nem tudom zárolni a /etc/passwd fájlt.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1328,9 +1178,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: %d. sor: GID létrehozása sikertelen\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: %d. sor: nem találom e felhasználót: %s\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: %s felhasználó nem létezik\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1348,6 +1198,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: %d. sor: nem tudom frissíteni a bejegyzést\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1360,15 +1238,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1439,13 +1317,10 @@
 msgstr "%s jelszava nem változtatható\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: a memória elfogyott\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1488,16 +1363,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "érvénytelen '%s' felhasználó név\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "érvénytelen '%s' felhasználó név\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "%s felhasználó: nincs %u csoport\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "%s felhasználó: %s könyvtár nem létezik\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "%s felhasználó: %s program nem létezik\n"
 
 #, c-format
@@ -1508,10 +1391,6 @@
 msgid "add user '%s' in %s? "
 msgstr "hozzáadja \"%s\" felhasználót a következőbe: %s? "
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: nem tudom frissíteni %s jelszó bejegyzését\n"
-
 msgid "invalid shadow password file entry"
 msgstr "érvénytelen árnyék jelszófájl bejegyzés"
 
@@ -1522,34 +1401,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "%s felhasználó: az utolsó jelszómódosítás időpontja a jövőben van\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: nem tudom lezárni a passwd fájlt\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: %s fájl nem nyitható meg\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: nem tudom megnyitni a passwd fájlt\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Használat: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: nem tudom törölni %s árnyék bejegyzését\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: nem tudom frissíteni a \"shadow\" fájlt\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Használat: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: nem tudom frissíteni a \"passwd\" fájlt\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: nem tudom frissíteni %s felhasználó bejegyzését\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: nem tudom törülni az árnyék jelszófájlt\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "A su-zás e hozzáféréshez ELUTASÍTVA.\n"
 
@@ -1617,6 +1487,16 @@
 "%s: %s\n"
 "(Átlépve)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: PAM hitelesítési hiba\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Nem vagy jogosult ehhez: su %s\n"
+
 msgid "No shell\n"
 msgstr "Nincs héj\n"
 
@@ -1642,14 +1522,6 @@
 msgstr "Belépés a rendszerkarbantartó módba"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: ismeretlen %s GID\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: ismeretlen %s csoport\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: nem tudom létrehozni az új defaults fájlt\n"
 
@@ -1690,10 +1562,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1741,14 +1615,6 @@
 "                                   felhasználói fiókhoz\n"
 "\n"
 
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: elfogyott a memória az update_group során\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: elfogyott a memória az update_gshadow során\n"
-
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: érvénytelen alapkönyvtár: \"%s\"\n"
@@ -1786,50 +1652,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: érvénytelen '%s' felhasználónév\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: nem tudom újraírni a jelszófájlt\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: nem tudom újraírni az árnyék jelszófájlt\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: nem tudom zárolni az árnyék jelszófájlt\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: nem tudom megnyitni az árnyék jelszófájlt\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: hiba a csoportfájl zárolásakor\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: hiba a csoportfájl megnyitásakor\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: hiba az árnyék csoportfájl zárolásakor\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: hiba az árnyék csoportfájl megnyitásakor\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: hiba az új jelszó bejegyzés hozzáadásakor\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: hiba az új árnyék jelszó bejegyzés hozzáadásakor\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: %s könyvtár nem hozható létre\n"
 
@@ -1845,8 +1675,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "A postafiókfájl jogosultságainak beállítása"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: %s felhasználó létezik\n"
 
 #, c-format
@@ -1860,10 +1691,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s: %s létrehozása sikertelen\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u nem egyedi\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: %s létrehozása sikertelen\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1872,11 +1708,6 @@
 "%s: figyelem: a saját könyvtár már létezik.\n"
 "Nem másolok semmit bele a vázkönyvtárból.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr ""
-"%s: figyelem: a CREATE_HOME nem támogatott, használd a -m-et helyette.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1897,53 +1728,28 @@
 "eltávolítása\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: Hiba a csoport bejegyzés frissítésekor\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Nem tudom %s csoportot törölni, ami egy másik felhasználó elsődleges "
 "csoportja.\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: Hiba a csoport bejegyzés frissítésekor\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: nem tudom megnyitni a csoport fájlt\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: nem tudom megnyitni az árnyék csoport fájlt\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: hiba a jelszó bejegyzés törlésekor\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: hiba az árnyék jelszó bejegyzés törlésekor\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: %s felhasználó most be van jelentkezve\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: figyelem: nem törölhető: "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s tulajdonosa nem %s, nem törlöm\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: figyelem: nem törölhető: "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: %s felhasználó nem létezik\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: %s egy NIS felhasználó\n"
 
@@ -2019,9 +1825,16 @@
 "feloldása\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: hiba az új csoport bejegyzés hozzáadásakor\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: %s felhasználó létezik\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -2035,23 +1848,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: uid %lu nem egyedi\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "A tag már létezik\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: hiba a jelszó bejegyzés cseréjekor\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: hiba a jelszó bejegyzés törlésekor\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: hiba az árnyék jelszó bejegyzés törlésekor\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: %s könyvtár létezik\n"
 
@@ -2072,6 +1874,14 @@
 msgstr "%s: nem tudom átnevezni %s könyvtárat erre: %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: figyelem: %s tulajdonosa nem %s\n"
 
@@ -2085,7 +1895,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -2110,10 +1920,16 @@
 "szerkesztése\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: a jogosultságok eldobása meghiúsult (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s is változatlan\n"
@@ -2128,6 +1944,421 @@
 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: can't lock password file\n"
+#~ msgstr "%s: nem tudom zárolni a jelszófájlt\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: a jelszófájl nem nyitható meg\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: az árnyék jelszófájl zárolása sikertelen\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: az árnyék jelszófájl megnyitása sikertelen\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: az árnyék jelszófájl újraírása sikertelen\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: a jelszófájl újraírása sikertelen\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: a jelszófájl frissítése sikertelen\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: az árnyék jelszófájl frissítése sikertelen\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tTELJES Név: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tSzobaszám: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tMunkahelyi telefon: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tOtthoni telefon: %s\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"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "A jelszófájl nem nyitható meg.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: nem tudom lezárni a 'group' fájlt\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: nem tudom megnyitni a 'group' fájlt\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: nem tudom lezárni a 'gshadow' fájlt\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: nem tudom megnyitni a 'gshadow' fájlt\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: hiba az árnyék fájl frissítésekor\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: Hiba a csoport bejegyzés frissítésekor\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: %d.: ismeretlen %s csoport\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: %d. sor: nem tudom frissíteni a bejegyzést\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: nem tudom zárolni az árnyék fájlt\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: hiba az árnyék fájl frissítésekor\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: hiba a jelszófájl frissítésekor\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: %d. sor: ismeretlen %s felhasználó\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: %d. sor: a jelszó bejegyzés nem frissíthető\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: ismeretlen felhasználó\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Ismeretlen felhasználó: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Használat: %s [-r|-R] group\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a felhasználó] csoport\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d felhasználó] csoport\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A felhasználó,...] [-M felhasználó,...] csoport\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M felhasználó,...] csoport\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: nem szerezhető zár\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: nem szerezhető árnyékzár\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: nem tudom megnyitni a fájlt\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: nem tudom újraírni a fájlt\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: nem tudom újraírni az árnyék fájlt\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: nem tudom feloldani a fájlt\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: nem tudom frissíteni a bejegyzést\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: nem tudom frissíteni az árnyék bejegyzést\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "ismeretlen csoport: %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: nem tudom megnyitni a fájlt\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: nem tudom megnyitni a 'gshadow' fájlt\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Ki vagy?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: ismeretlen %s tag\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: hiba az új csoport bejegyzés hozzáadásakor\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: nem tudom újraírni a csoport fájlt\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: nem tudom újraírni az árnyék csoport fájlt\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: nem tudom zárolni a csoport fájlt\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: nem tudom megnyitni a csoport fájlt\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: nem tudom zárolni az árnyék csoport fájlt\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: nem tudom megnyitni az árnyék csoport fájlt\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: %u GID nem egyedi\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: nem tudom törölni a csoport bejegyzést\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: nem tudom törölni az árnyék csoport bejegyzést\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: nem tudom törölni a felhasználó elsődleges csoportját\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Az eltávolítandó tag nem található\n"
+
+#~ 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"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "Csak a root adhat tagokat különböző csoportokhoz\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "Csoport hozzáférés kell\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Nem a jelen csoport elsődleges tulajdonosa\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "PAM hitelesítési hiba ehhez:\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Csoport fájl zárolása sikertelen\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Csoport fájl megnyitása sikertelen\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Csoport fájl bezárása sikertelen\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s nincs a /etc/group-ban\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u nem egyedi GID\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s nem egyedi név\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: nem tudom újraírni a jelszófájlt\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: nem tudom zárolni a jelszófájlt\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: nem tudom megnyitni a jelszófájlt\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: %s fájl nem zárolható\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: nem tudom frissíteni %s árnyék bejegyzését\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: nem tudom frissíteni %s csoport bejegyzését\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: nem tudom zárolni az árnyék csoport fájlt\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: nem tudom megnyitni az árnyék csoport fájlt\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: nem tudom törölni %s árnyék csoportot\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: nem tudom frissíteni az árnyék csoport fájlt\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: nem tudom frissíteni a csoport fájlt\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: nem tudom törölni az árnyék csoport fájlt\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "ismeretlen UID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "ismeretlen GID: %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: %s csoport nem létezik\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: %s felhasználó nem létezik\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: érvénytelen '%s' felhasználónév\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: nem tudom zárolni a /etc/passwd fájlt.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: nem tudom zárolni a /etc/passwd fájlt.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: nem tudom zárolni a /etc/passwd fájlt.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: nem tudom zárolni a /etc/passwd fájlt.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: fájlok megnyitása sikertelen\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: hiba a fájlok frissítésekor\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: %d. sor: nem találom e felhasználót: %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: nem tudom frissíteni %s jelszó bejegyzését\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: nem tudom lezárni a passwd fájlt\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: nem tudom megnyitni a passwd fájlt\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: nem tudom törölni %s árnyék bejegyzését\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: nem tudom frissíteni a \"shadow\" fájlt\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: nem tudom frissíteni a \"passwd\" fájlt\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: nem tudom frissíteni %s felhasználó bejegyzését\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: nem tudom törülni az árnyék jelszófájlt\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: ismeretlen %s GID\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: ismeretlen %s csoport\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: elfogyott a memória az update_gshadow során\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: nem tudom újraírni a jelszófájlt\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: nem tudom újraírni az árnyék jelszófájlt\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: nem tudom zárolni az árnyék jelszófájlt\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: nem tudom megnyitni az árnyék jelszófájlt\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: hiba a csoportfájl zárolásakor\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: hiba a csoportfájl megnyitásakor\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: hiba az árnyék csoportfájl zárolásakor\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: hiba az árnyék csoportfájl megnyitásakor\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: hiba az új jelszó bejegyzés hozzáadásakor\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: hiba az új árnyék jelszó bejegyzés hozzáadásakor\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr ""
+#~ "%s: figyelem: a CREATE_HOME nem támogatott, használd a -m-et helyette.\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: Hiba a csoport bejegyzés frissítésekor\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: Hiba a csoport bejegyzés frissítésekor\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: nem tudom megnyitni a csoport fájlt\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: nem tudom megnyitni az árnyék csoport fájlt\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: hiba a jelszó bejegyzés törlésekor\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: hiba az árnyék jelszó bejegyzés törlésekor\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: %s felhasználó nem létezik\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: hiba az új csoport bejegyzés hozzáadásakor\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: uid %lu nem egyedi\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: hiba a jelszó bejegyzés cseréjekor\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: hiba a jelszó bejegyzés törlésekor\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: hiba az árnyék jelszó bejegyzés törlésekor\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: nem szerezhető be egyedi csoportazonosító\n"
 
@@ -2137,18 +2368,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " erre: `%.100s'"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: fájlok zárolása sikertelen, próbáld később\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: %d. sor: UID létrehozása sikertelen\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/id.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -53,6 +53,9 @@
 msgid "  Choose a new password."
 msgstr "  Pilih sebuah kata sandi baru."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Kata sandi anda akan kadaluarsa dalam %ld hari.\n"
@@ -64,7 +67,12 @@
 msgstr "Kata sandi anda akan kadaluarsa hari ini."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Tidak dapat mengubah tts %s"
 
 msgid "Environment overflow\n"
@@ -85,14 +93,14 @@
 "%d sejak login terakhir.\n"
 "Terakhir %s pada %s.\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\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: Can't get unique UID (no more available UIDs)\n"
 msgstr "%s: tidak bisa mendapatkan UID yang unik\n"
 
-#, fuzzy
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s: tak mampu mendapatkan GID yang unik\n"
-
 msgid "Too many logins.\n"
 msgstr "Terlalu banyak login.\n"
 
@@ -183,9 +191,18 @@
 msgstr "Tak dapat menentukan nama tty anda."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: kehabisan memori\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) gagal\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "Tidak\n"
+
 msgid "Password: "
 msgstr "Kata sandi:"
 
@@ -193,6 +210,11 @@
 msgid "%s's Password: "
 msgstr "Kata sandi dari %s:"
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: ruas terlalu panjang\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -290,42 +312,33 @@
 msgstr "%s: ijin ditolak.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Tidak dapat menentukan nama pengguna anda.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 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"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: tidak dapat mengunci berkas-berkas, coba lagi nanti\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: tidak dapat membuka berkas kata sandi\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: tidak dapat membuka berkas %s\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: tidak dapat mengunci berkas kata sandi bayangan\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: gagal membuat proses: %s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: tidak dapat membuka berkas kata sandi bayangan\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: gagal membuang hak (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: tidak dapat menulis kembali 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"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: tidak dapat memperbaharui berkas kata sandi\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: tidak dapat memperbaharui berkas kata sandi bayangan\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: tak terdapat berkas kata sandi bayangan\n"
 
@@ -333,9 +346,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: pengguna %s tak ada\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -361,57 +374,27 @@
 msgid "Full Name"
 msgstr "Nama Lengkap"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tNama Lengkap: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Nomor Ruangan"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tNomor Ruangan: %s\n"
-
 msgid "Work Phone"
 msgstr "Telepon Kantor"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tTelepon Kantor: %s\n"
-
 msgid "Home Phone"
 msgstr "Telepon Rumah"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tTelepon Rumah: %s\n"
-
 msgid "Other"
 msgstr "Lain-lain"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Tidak dapat mengubah ID menjadi root.\n"
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Tidak dapat mengunci berkas kata sandi; coba lagi nanti.\n"
-
-msgid "Cannot open the password file.\n"
-msgstr "Tidak dapat membuka berkas kata sandi.\n"
-
 #, c-format
-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"
-
-#, c-format
 msgid "%s: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -443,9 +426,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: \"%s\" berisi karakter-karakter ilegal\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Tidak dapat menentukan nama pengguna anda.\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: pengguna %s tak ada\n"
 
 #, fuzzy, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -493,7 +476,7 @@
 msgstr "%s: argumen numerik tak sah `%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: -a hanya diperbolehkan dengan -G\n"
 
 #, c-format
@@ -505,30 +488,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: tidak dapat mengunci berkas grup\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: tidak dapat membuka berkas grup\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: tidak dapat mengunci berkas gshadow\n"
-
-#, c-format
-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"
 
@@ -536,38 +495,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: baris %d: kata sandi baru hilang\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: baris %d: grup %s tak dikenal\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: grup %s tidak ada\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: pengguna %s tak ada\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: kesalahan saat memperbaharui berkas kata sandi bayangan\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: kesalahan saat memperbaharui berkas kata sandi\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"
@@ -580,8 +525,9 @@
 msgid "Login Shell"
 msgstr "Login Shell"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Anda tidak boleh mengubah shell untuk %s.\n"
 
 #, c-format
@@ -592,24 +538,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Entri tidak sah: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s merupakan shell yang tidak sah.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Penggunaan: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: pengguna tak dikenal\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -640,11 +602,16 @@
 "                                untuk pengguna dengan nama NAMA\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Gagal    Maks.   Terakhir                 Pada\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds tersisa]"
 
 #, c-format
@@ -652,76 +619,67 @@
 msgstr " [%lds terkunci]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Pengguna tak dikenal: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Penggunaan: %s [-r|-R] grup\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a pengguna] grup\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d pengguna] grup\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Pengguna tak dikenal: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A pengguna,...] [-M pengguna,...] grup\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: tidak dapat membuka berkas %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M pengguna,...] grup\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: kata sandi bayangan grup diperlukan untuk -A\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: tidak mendapatkan kunci\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: tidak mendapatkan kunci untuk berkas bayangan\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Kata sandi untuk %s tidak dapat diganti.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: tidak dapat membuka berkas\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: kata sandi bayangan grup diperlukan untuk -A\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: tidak dapat membuka berkas\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: grup %s tidak ada\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: tidak dapat membuka berkas kata sandi bayangan\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: gagal membuat proses: %s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -740,9 +698,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Coba lagi nanti\n"
 
-msgid "Who are you?\n"
-msgstr "Anda siapa?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Menambahkan pengguna %s ke grup %s\n"
@@ -751,9 +706,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: pengguna %s tak ada\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -787,116 +742,88 @@
 "                                terduplikasi (tak-unik)\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: kesalahan saat menambahkan entri grup yang baru\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: nama grup %s tidak sah\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: tidak dapat menuliskan kembali berkas grup\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "nama grup `%s' tidak sah\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: tidak dapat menuliskan kembali berkas grup bayangan\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: tidak dapat mengunci berkas grup\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: tidak dapat membuka berkas grup\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: tidak dapat mengunci berkas grup bayangan\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: tidak dapat membuka berkas grup bayangan\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K memerlukan NAMA=NILAI\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 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 "%s: GID '%lu' already exists\n"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: tak dapat membuat %s\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "Penggunaan: groupdel grup\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: kesalahan saat menghapus entri grup\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: tak dapat mengubah nama direktori %s menjadi %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: kesalahan saat menghapus entri group bayangan\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: tidak dapat mengubah pengguna '%s' pada klien NIS.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: tidak dapat menghapus grup utama dari pengguna.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: grup %s tidak ada\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: grup %s merupakan sebuah grup NIS\n"
+#, fuzzy, c-format
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: grup `%s' merupakan grup NIS.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s merupakan master NIS\n"
 
-msgid "Member already exists\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: pengguna %s merupakan pengguna NIS\n"
 
-msgid "Member to remove could not be found\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: kehabisan memori saat update_group\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
 
-msgid "Only root can add members to different groups\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
 msgstr ""
 
-msgid "Group access is required\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr ""
-
 #, fuzzy
-msgid "PAM authentication failed for\n"
-msgstr "%s: Otentikasi PAM gagal\n"
-
-#, fuzzy
-msgid "Unable to lock group file\n"
-msgstr "%s: tidak dapat mengunci berkas grup\n"
-
-#, fuzzy
-msgid "Unable to open group file\n"
-msgstr "%s: tidak dapat membuka berkas grup\n"
-
-#, fuzzy
-msgid "Cannot close group file\n"
-msgstr "%s: tak dapat membuka berkas grup\n"
-
-#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -921,41 +848,19 @@
 "                                terduplikasi (tak-unik)\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s tidak ditemukan dalam /etc/group\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u bukan GID yang unik\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s bukan nama yang unik\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: tak dapat menulis kembali berkas kata sandi\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "nama grup `%s' tidak sah\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: tak dapat mengunci berkas kata sandi\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: grup %s merupakan sebuah grup NIS\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: tak dapat membuka berkas kata sandi\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: pengguna %s tak dikenal\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: tidak dapat mengubah pengguna '%s' pada klien NIS.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Penggunaan: %s [-r] [-s] [grup [gbayangan]]\n"
 
@@ -967,18 +872,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s dan -r tidak kompatible\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: tidak dapat mengunci berkas %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "entri berkas grup tidak sah"
 
@@ -993,6 +886,10 @@
 msgid "invalid group name '%s'\n"
 msgstr "nama grup `%s' tidak sah\n"
 
+#, fuzzy, c-format
+msgid "invalid group ID '%lu'\n"
+msgstr "nama grup `%s' tidak sah\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "grup %s: tak ada pengguna %s\n"
@@ -1006,17 +903,9 @@
 msgstr "entri tidak ditemukan pada berkas grup\n"
 
 #, fuzzy, c-format
-msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "grup bayangan %s: tak ada pengguna %s\n"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: tidak dapat memperbaharui entri bayangan untuk %s\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: tidak dapat memperbaharui entri untuk grup %s\n"
-
 msgid "invalid shadow group file entry"
 msgstr "entri berkas grup bayangan tidak sah"
 
@@ -1043,30 +932,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: tak ada perubahan\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: tidak dapat mengunci berkas grup bayangan\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Penggunaan: groupdel grup\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: tidak dapat membuka berkas grup banyangan\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Penggunaan: groupdel grup\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: tidak dapat menghapus grup bayangan %s\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: tidak dapat memperbaharui berkas %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: tidak dapat memperbaharui berkas grup bayangan\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: tidak dapat memperbaharui berkas grup\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: tidak dapat menghapus berkas grup bayangan\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Penggunaan: id [-a]\n"
 
@@ -1098,6 +978,10 @@
 "NAMA\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Nama pengguna    Port     Dari             Terakhir"
 
@@ -1107,15 +991,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Penggunaan: %s [-p] [nama]\n"
 
@@ -1212,6 +1096,11 @@
 "waktu login telah berlebihan\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Penggunaan: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Penggunaan: newgrp [-] [grup]\n"
 
@@ -1226,14 +1115,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: gagal membuat proses: %s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "UID tak dikenal: %u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: pengguna %s tak ada\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "GID tidak dikenal: %lu\n"
-
 msgid "too many groups\n"
 msgstr "terlalu banyak grup\n"
 
@@ -1247,60 +1132,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: grup %s tidak ada\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "nama grup `%s' tidak sah\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: nama pengguna `%s' tak sah\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: pengguna %s tak ada\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: pengguna %s tak ada\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: nama pengguna `%s' tak sah\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: tidak dapat mengunci /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: tidak dapat mengunci /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: tidak dapat mengunci /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: tidak dapat mengunci /etc/passwd.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1316,9 +1160,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: baris %d: tak dapat membuat GID\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: baris %d: tak menemukan pengguna %s\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: pengguna %s tak ada\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1349,15 +1193,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1432,13 +1276,10 @@
 msgstr "Kata sandi untuk %s tidak dapat diganti.\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: kehabisan memori\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1481,16 +1322,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "nama pengguna tak sah '%s'\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "nama pengguna tak sah '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "pengguna %s: tak ada grup %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "pengguna %s: tak terdapat direktori %s\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "pengguna %s: tak terdapat program %s\n"
 
 #, fuzzy, c-format
@@ -1501,10 +1350,6 @@
 msgid "add user '%s' in %s? "
 msgstr "grup bayangan %s: tak ada pengguna %s\n"
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: tak dapat menghapus entri passwd untuk %s\n"
-
 msgid "invalid shadow password file entry"
 msgstr "entri kata sandi bayangan tak sah"
 
@@ -1515,34 +1360,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "pengguna %s: pergantian kata sandi terakhir terjadi dimasa depan\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: tak dapat mengunci berkas passwd\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: tidak dapat membuka berkas %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: tak dapat membuka berkas passwd\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Penggunaan: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: tak dapat menghapus entri bayangan untuk %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: tak dapat memperbaharui berkas shadow\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Penggunaan: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: tak dapat memperbaharui berkas passwd\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: tak dapat memperbaharui entri untuk pengguna %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: tak dapat menghapus berkas kata sandi bayangan\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Akses su untuk account itu DITOLAK.\n"
 
@@ -1611,6 +1447,16 @@
 "%s: %s\n"
 "(Diabaikan)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: Otentikasi PAM gagal\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Anda tak diperbolehkan untuk su %s\n"
+
 msgid "No shell\n"
 msgstr "Tak ada shell\n"
 
@@ -1636,14 +1482,6 @@
 msgstr "Memasuki Mode Pengelolaan Sistem"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: GID %s tak dikenal\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: grup %s tak dikenal\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: tak dapat membuat berkas-berkas bawaan yang baru\n"
 
@@ -1684,10 +1522,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1730,14 +1570,6 @@
 "\n"
 
 #, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: kehabisan memori saat update_group\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: kehabisan memori saat update_gshadow\n"
-
-#, fuzzy, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: direktori awal `%s' tak sah\n"
 
@@ -1774,50 +1606,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: nama pengguna `%s' tak sah\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: tak dapat menulis kembali berkas kata sandi\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: tak dapat menulis kembali berkas kata sandi bayangan\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: tak dapat mengunci berkas kata sandi bayangan\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: tak dapat membuka berkas kata sandi bayangan\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: kesalahan saat mengunci berkas grup\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: kesalahan saat membuka berkas grup\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: kesalahan saat mengunci berkas grup bayangan\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: kesalahan saat membuka berkas grup bayangan\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: kesalahan saat menambah entri baru kata sandi\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: kesalahan saat menambah entri baru kata sandi bayangan\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: tak dapat membuat direktori %s\n"
 
@@ -1831,8 +1627,9 @@
 msgid "Setting mailbox file permissions"
 msgstr ""
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: pengguna %s telah ada\n"
 
 #, c-format
@@ -1845,10 +1642,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s: tak dapat membuat %s\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u tidak unik\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: tak dapat membuat %s\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1857,10 +1659,6 @@
 "%s: perhatian: direktori rumah telah ada.\n"
 "Tak menyalin berkas apapun dari direktori skel ke situ.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr "%s: perhatian: CREATE_HOME tak didukung, sebaiknya gunakan -m.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1872,53 +1670,28 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: errot memperbaharui entri grup\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: tidak dapat menghapus grup %s yg merupakan grup utama dari pengguna "
 "lain.\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: errot memperbaharui entri grup\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: tak dapat membuka berkas grup\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: tak dapat membuka berkas grup bayangan\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: kesalahan saat menghapus entri kata sandi\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: kesalahan saat menghapus entri kata sandi bayangan\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: pengguna %s saat ini sedang login\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: perhatian: tak dapat menghapus "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s tak dimiliki oleh %s, tidak menghapus\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: perhatian: tak dapat menghapus "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: pengguna %s tak ada\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: pengguna %s merupakan pengguna NIS\n"
 
@@ -1981,9 +1754,16 @@
 "  -U, --unlock                  buka bloking pengguna\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: kesalahan saat menambahkan entri grup yang baru\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: pengguna %s telah ada\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -1998,22 +1778,10 @@
 msgstr ""
 
 #, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: uid %lu tak unik\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr ""
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: kesalahan saat mengganti entri kata sandi\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: kesalahan saat menghapus entri kata sandi\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: kesalahan saat menghapus entri kata sandi bayangan\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: direktori %s telah ada\n"
 
@@ -2034,6 +1802,14 @@
 msgstr "%s: tak dapat mengubah nama direktori %s menjadi %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: perhatian %s tak dimiliki oleh %s\n"
 
@@ -2047,7 +1823,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -2071,10 +1847,16 @@
 "  -s, --shadow                  sunting basisdata shadow atau gshadow\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: gagal membuang hak (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s tidak berubah\n"
@@ -2089,6 +1871,406 @@
 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: can't lock password file\n"
+#~ msgstr "%s: tidak dapat mengunci berkas kata sandi\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: tidak dapat membuka berkas kata sandi\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: tidak dapat mengunci berkas kata sandi bayangan\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: tidak dapat membuka berkas kata sandi bayangan\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: tidak dapat menulis kembali berkas kata sandi bayangan\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: tidak dapat menulis kembali berkas kata sandi\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: tidak dapat memperbaharui berkas kata sandi\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: tidak dapat memperbaharui berkas kata sandi bayangan\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tNama Lengkap: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tNomor Ruangan: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tTelepon Kantor: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tTelepon Rumah: %s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr "Tidak dapat mengunci berkas kata sandi; coba lagi nanti.\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Tidak dapat membuka berkas kata sandi.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: tidak dapat mengunci berkas grup\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: tidak dapat membuka berkas grup\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: tidak dapat mengunci berkas gshadow\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: tidak dapat membuka berkas kata sandi bayangan\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: kesalahan saat memperbaharui berkas kata sandi bayangan\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: errot memperbaharui entri grup\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: baris %d: grup %s tak dikenal\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: baris %d: tak dapat memperbaharui entri\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: tidak dapat mengunci berkas kata sandi bayangan\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: kesalahan saat memperbaharui berkas kata sandi bayangan\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: kesalahan saat memperbaharui berkas kata sandi\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: baris %d: pengguna %s tak dikenal\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: baris %d: tidak dapat memperbaharui entri kata sandi\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: pengguna tak dikenal\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Pengguna tak dikenal: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Penggunaan: %s [-r|-R] grup\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a pengguna] grup\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d pengguna] grup\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A pengguna,...] [-M pengguna,...] grup\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M pengguna,...] grup\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: tidak mendapatkan kunci\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: tidak mendapatkan kunci untuk berkas bayangan\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: tidak dapat membuka berkas\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: tidak dapat menuliskan kembali berkas\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: tidak dapat menuliskan kembali berkas bayangan\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: tidak dapat membuka kunci berkas\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: tidak dapat memperbaharui entri\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: tidak dapat memperbaharui entri bayangan\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "grup tak dikenal: %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: tidak dapat membuka berkas\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: tidak dapat membuka berkas kata sandi bayangan\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Anda siapa?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: anggota tak dikenal %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: kesalahan saat menambahkan entri grup yang baru\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: tidak dapat menuliskan kembali berkas grup\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: tidak dapat menuliskan kembali berkas grup bayangan\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: tidak dapat mengunci berkas grup\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: tidak dapat membuka berkas grup\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: tidak dapat mengunci berkas grup bayangan\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: tidak dapat membuka berkas grup bayangan\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u tidak unik\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: kesalahan saat menghapus entri grup\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: kesalahan saat menghapus entri group bayangan\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: tidak dapat menghapus grup utama dari pengguna.\n"
+
+#, fuzzy
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "%s: Otentikasi PAM gagal\n"
+
+#, fuzzy
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "%s: tidak dapat mengunci berkas grup\n"
+
+#, fuzzy
+#~ msgid "Unable to open group file\n"
+#~ msgstr "%s: tidak dapat membuka berkas grup\n"
+
+#, fuzzy
+#~ msgid "Cannot close group file\n"
+#~ msgstr "%s: tak dapat membuka berkas grup\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s tidak ditemukan dalam /etc/group\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u bukan GID yang unik\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s bukan nama yang unik\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: tak dapat menulis kembali berkas kata sandi\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: tak dapat mengunci berkas kata sandi\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: tak dapat membuka berkas kata sandi\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: tidak dapat mengunci berkas %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: tidak dapat memperbaharui entri bayangan untuk %s\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: tidak dapat memperbaharui entri untuk grup %s\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: tidak dapat mengunci berkas grup bayangan\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: tidak dapat membuka berkas grup banyangan\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: tidak dapat menghapus grup bayangan %s\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: tidak dapat memperbaharui berkas grup bayangan\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: tidak dapat memperbaharui berkas grup\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: tidak dapat menghapus berkas grup bayangan\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "UID tak dikenal: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "GID tidak dikenal: %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: grup %s tidak ada\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: pengguna %s tak ada\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: nama pengguna `%s' tak sah\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: tidak dapat mengunci /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: tidak dapat mengunci /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: tidak dapat mengunci /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: tidak dapat mengunci /etc/passwd.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: tidak dapat membuka berkas-berkas\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: kesalahan saat memperbaharui berkas-berkas\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: baris %d: tak menemukan pengguna %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: tak dapat menghapus entri passwd untuk %s\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: tak dapat mengunci berkas passwd\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: tak dapat membuka berkas passwd\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: tak dapat menghapus entri bayangan untuk %s\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: tak dapat memperbaharui berkas shadow\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: tak dapat memperbaharui berkas passwd\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: tak dapat memperbaharui entri untuk pengguna %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: tak dapat menghapus berkas kata sandi bayangan\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: GID %s tak dikenal\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: grup %s tak dikenal\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: kehabisan memori saat update_gshadow\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: tak dapat menulis kembali berkas kata sandi\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: tak dapat menulis kembali berkas kata sandi bayangan\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: tak dapat mengunci berkas kata sandi bayangan\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: tak dapat membuka berkas kata sandi bayangan\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: kesalahan saat mengunci berkas grup\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: kesalahan saat membuka berkas grup\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: kesalahan saat mengunci berkas grup bayangan\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: kesalahan saat membuka berkas grup bayangan\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: kesalahan saat menambah entri baru kata sandi\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: kesalahan saat menambah entri baru kata sandi bayangan\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr "%s: perhatian: CREATE_HOME tak didukung, sebaiknya gunakan -m.\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: errot memperbaharui entri grup\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: errot memperbaharui entri grup\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: tak dapat membuka berkas grup\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: tak dapat membuka berkas grup bayangan\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: kesalahan saat menghapus entri kata sandi\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: kesalahan saat menghapus entri kata sandi bayangan\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: pengguna %s tak ada\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: kesalahan saat menambahkan entri grup yang baru\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: uid %lu tak unik\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: kesalahan saat mengganti entri kata sandi\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: kesalahan saat menghapus entri kata sandi\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: kesalahan saat menghapus entri kata sandi bayangan\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: tak mampu mendapatkan GID yang unik\n"
 
@@ -2100,18 +2282,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " pada `%.100s'"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: tidak dapat mengunci berkas-berkas, coba lagi nanti\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: baris %d: tak dapat membuat UID\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/it.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -25,7 +25,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.1.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\n"
 "PO-Revision-Date: 2008-03-27 14:40+0100\n"
 "Last-Translator: Danilo Piazzalunga <danilopiazza at gmail.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -76,6 +76,9 @@
 msgid "  Choose a new password."
 msgstr "  Scegliere una nuova password."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "La password in uso scadrà tra %ld giorni.\n"
@@ -87,7 +90,12 @@
 msgstr "La password in uso scade oggi."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Impossibile cambiare i permessi al device %s"
 
 msgid "Environment overflow\n"
@@ -111,12 +119,16 @@
 "%d tentativi falliti dall'ultimo accesso.\n"
 "L'ultimo è stato %s su %s.\n"
 
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+#| msgid "Can't get unique GID (no more available GIDs)\n"
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "Impossibile ottenere un GID univoco (nessun GID disponibile)\n"
+
+#, fuzzy, c-format
+#| msgid "Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "Impossibile ottenere un UID univoco (nessun UID disponibile)\n"
 
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "Impossibile ottenere un GID univoco (nessun GID disponibile)\n"
-
 # NdT: Riferito al numero massimo di accessi concorrenti per un utente.
 msgid "Too many logins.\n"
 msgstr "Troppi accessi.\n"
@@ -209,9 +221,16 @@
 msgstr "Impossibile determinare il nome del terminale."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: memoria esaurita\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) non riuscita\n"
 
+msgid "No"
+msgstr ""
+
 msgid "Password: "
 msgstr "Password: "
 
@@ -219,6 +238,11 @@
 msgid "%s's Password: "
 msgstr "Password di %s: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: lunghezza dei campi eccessiva\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -315,42 +339,35 @@
 msgstr "%s: Permesso negato.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: impossibile determinare il proprio nome utente.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 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"
+#, fuzzy, c-format
+#| msgid "Cannot lock the password file; try again later.\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr ""
+"Impossibile fare il lock del file delle password; riprovare più tardi.\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: impossibile aprire il file delle password\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: impossibile aprire il file %s\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: impossibile fare il lock del file delle shadow password\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: impossibile eseguire fork(): %s\n"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: impossibile aprire il file delle shadow password\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: impossibile abbandonare i privilegi (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: impossibile riscrivere 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"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: impossibile aggiornare il file delle password\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: impossibile aggiornare il file delle shadow password\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: manca il file delle shadow password\n"
 
@@ -358,9 +375,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: l'utente «%s» non esiste\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -387,58 +405,27 @@
 msgid "Full Name"
 msgstr "Nome completo"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tNome completo: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Stanza n°"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tStanza n°: %s\n"
-
 msgid "Work Phone"
 msgstr "Numero telefonico di lavoro"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tNumero telefonico di lavoro: %s\n"
-
 msgid "Home Phone"
 msgstr "Numero telefonico di casa"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tNumero telefonico di casa: %s\n"
-
 msgid "Other"
 msgstr "Altro"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Impossibile cambiare ID a root.\n"
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr ""
-"Impossibile fare il lock del file delle password; riprovare più tardi.\n"
-
-msgid "Cannot open the password file.\n"
-msgstr "Impossibile aprire il file delle password.\n"
-
 #, c-format
-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"
-
-#, c-format
 msgid "%s: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -471,9 +458,10 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: «%s» contiene caratteri non ammessi\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: impossibile determinare il proprio nome utente.\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: l'utente «%s» non esiste\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -524,8 +512,9 @@
 msgid "%s: invalid numeric argument '%s'\n"
 msgstr "%s: argomento numerico «%s» non valido\n"
 
-#, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+#, fuzzy, c-format
+#| msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: è permesso usare il flag %s solo con il flag %s\n"
 
 #, c-format
@@ -537,30 +526,6 @@
 msgstr "%s: metodo di cifratura «%s» non supportato\n"
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: impossibile fare il lock del file dei gruppi\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: impossibile aprire il file dei gruppi\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: impossibile fare il lock del file gshadow\n"
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-msgstr "%s: impossibile aprire il file shadow\n"
-
-#, c-format
-msgid "%s: error updating gshadow file\n"
-msgstr "%s: errore nell'aggiornare il file gshadow\n"
-
-#, c-format
-msgid "%s: error updating group file\n"
-msgstr "%s: errore nell'aggiornare il file dei gruppi\n"
-
-#, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: riga %d: riga troppo lunga\n"
 
@@ -568,38 +533,25 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: riga %d: manca la nuova password\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: riga %d: gruppo «%s» sconosciuto\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: gruppo «%s» inesistente\n"
 
-#, c-format
-msgid "%s: line %d: cannot update group entry\n"
-msgstr "%s: riga %d: impossibile aggiornare la voce nel file dei gruppi\n"
+#, fuzzy, c-format
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: l'utente «%s» non esiste\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: errore nell'aggiornare il file shadow\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: errore nell'aggiornare il file delle password\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"
@@ -618,8 +570,9 @@
 msgid "Login Shell"
 msgstr "Shell di login"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Non è permesso cambiare la shell di %s.\n"
 
 #, c-format
@@ -630,24 +583,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: voce «%s» non valida\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s non è una shell valida.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Uso: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: utente sconosciuto\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -678,14 +647,19 @@
 "                                l'utente specificato da LOGIN\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 # NdT: Vedere faillog(5) per il significato dei campi. Il campo "On"
 # è il device tty su cui è avvenuto l'ultimo accesso fallito.
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Errori   Massimo Ultimo accesso           Su\n"
 
 # NdT: La «s» indica l'unità di misura (secondi).
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds rimasti]"
 
 # NdT: La «s» indica l'unità di misura (secondi).
@@ -694,78 +668,71 @@
 msgstr " [%lds blocco]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Utente «%s» sconosciuto\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Uso: %s [-r|-R] GRUPPO\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "     %s [-a UTENTE] GRUPPO\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "     %s [-d UTENTE] GRUPPO\n"
+#, fuzzy, c-format
+#| msgid "Unknown user or range: %s\n"
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Utente o intervallo «%s» sconosciuto\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "     %s [-A UTENTE,...] [-M UTENTE,...] GRUPPO\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: impossibile aprire il file %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "     %s [-M UTENTE,...] GRUPPO\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: l'opzione -A richiede le shadow password per i gruppi\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: impossibile fare il lock\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: impossibile fare il lock del file shadow\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "La password di %s non può essere cambiata.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: impossibile aprire il file\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: l'opzione -A richiede le shadow password per i gruppi\n"
 
-#, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: impossibile riscrivere il file\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: gruppo «%s» inesistente\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: impossibile riscrivere il file shadow\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: impossibile eseguire fork(): %s\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"
-
-#, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: impossibile chiudere il file\n"
-
-#, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: impossibile chiudere il file shadow\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Cambio della password del gruppo %s\n"
 
@@ -782,9 +749,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: riprovare più tardi\n"
 
-msgid "Who are you?\n"
-msgstr "Chi sei?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Aggiunta dell'utente %s al gruppo %s\n"
@@ -793,9 +757,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: l'utente «%s» non esiste\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -831,112 +796,93 @@
 "  -r, --system                  crea un account di sistema\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: errore nell'aggiungere la nuova voce al file dei gruppi\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s non è un nome di gruppo valido\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: impossibile riscrivere il file dei gruppi\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group ID '%s'\n"
+msgstr "%s: nome di gruppo «%s» non valido\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: impossibile riscrivere il file dei gruppi shadow\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: impossibile fare il lock del file dei gruppi\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: impossibile aprire il file dei gruppi\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: impossibile fare il lock del file dei gruppi shadow\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: impossibile aprire il file dei gruppi shadow\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K richiede NOME=VALORE\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 msgstr "%s: gruppo «%s» già esistente\n"
 
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u non univoco\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "Membro già esistente\n"
 
-#, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: impossibile creare il gruppo\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "Uso: groupdel GRUPPO\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: errore nel rimuovere la voce dal file dei gruppi\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: impossibile rinominare la directory %s in %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: errore nel rimuovere la voce dal file dei gruppi shadow\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr ""
+"%s: impossibile modificare il gruppo principale dell'utente «%s» da %u a %u.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: impossibile rimuovere il gruppo principale dell'utente.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: gruppo «%s» inesistente\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: il gruppo «%s» è un gruppo NIS\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: il gruppo «%s» è un gruppo NIS.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s è il NIS master\n"
 
-msgid "Member already exists\n"
-msgstr "Membro già esistente\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: l'utente %s è un utente NIS\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Impossibile trovare il membro da rimuovere\n"
+#, fuzzy, c-format
+#| msgid "%s: Out of memory. Cannot update the group database.\n"
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: memoria esaurita. Impossibila aggiornare il database dei gruppi.\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
-"Uso: groupmems -a NOME_UTENTE | -d NOME_UTENTE | -D | -l [ -g NOME_GRUPPO]\n"
 
-msgid "Only root can add members to different groups\n"
-msgstr "Solo root può aggiungere membri a gruppi diversi\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "È necessario l'accesso al gruppo\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Non si è il proprietario principale del gruppo\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "Autenticazione PAM non riuscita per\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Impossibile fare il lock del file dei gruppi\n"
-
-msgid "Unable to open group file\n"
-msgstr "Impossibile aprire il file dei gruppi\n"
-
-msgid "Cannot close group file\n"
-msgstr "Impossibile chiudere il file dei gruppi\n"
-
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -961,44 +907,20 @@
 "  -p, --password PASSWORD       imposta la nuova PASSWORD cifrata\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: «%s» non trovato in /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "%s: nome di gruppo «%s» non valido\n"
 
 #, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u non è un GID univoco\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: il gruppo «%s» è un gruppo NIS\n"
 
 #, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s non è un nome univoco\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: utente «%s» sconosciuto\n"
 
 #, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: impossibile riscrivere il file delle password\n"
-
-#, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: impossibile fare il lock del file delle password\n"
-
-#, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: impossibile aprire il file delle password\n"
-
-#, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-"%s: impossibile modificare il gruppo principale dell'utente «%s» da %u a %u, "
-"in quanto non è presente nel file delle password.\n"
-
-#, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr ""
-"%s: impossibile modificare il gruppo principale dell'utente «%s» da %u a %u.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Uso: %s [-r] [-s] [GRUPPO [GSHADOW]]\n"
 
@@ -1010,18 +932,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s e -r sono incompatibili\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: impossibile fare il lock del file %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "voce non valida nel file dei gruppi"
 
@@ -1036,6 +946,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "nome di gruppo «%s» non valido\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "nome di gruppo «%s» non valido\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "gruppo %s: nessun utente %s\n"
@@ -1048,18 +963,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "nessuna voce corrispondente nel file dei gruppi %s\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "aggiungere il gruppo «%s» in %s? "
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: impossibile aggiornare la voce relativa a %s nel file shadow\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: impossibile aggiornare la voce del gruppo %s\n"
-
 msgid "invalid shadow group file entry"
 msgstr "voce non valida nel file dei gruppi shadow"
 
@@ -1086,30 +994,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: nessuna modifica\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: impossibile fare il lock del file dei gruppi shadow\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Uso: groupdel GRUPPO\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: impossibile aprire il file dei gruppi shadow\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Uso: groupdel GRUPPO\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: impossibile rimuovere il gruppo shadow %s\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: impossibile aggiornare il file %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: impossibile aggiornare il file dei gruppi shadow\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: impossibile aggiornare il file dei gruppi\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: impossibile eliminare il file dei gruppi shadow\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Uso: id [-a]\n"
 
@@ -1142,6 +1041,10 @@
 "                                l'utente specificato da LOGIN\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Nome utente      Porta    Da               Ultimo accesso"
 
@@ -1152,14 +1055,14 @@
 msgstr "**Nessun accesso effettuato**"
 
 #, c-format
-msgid "Unknown user or range: %s\n"
-msgstr "Utente o intervallo «%s» sconosciuto\n"
-
-#, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: argomento «%s» non previsto\n"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Uso: %s [-p] [NOME]\n"
 
@@ -1258,6 +1161,11 @@
 "orario di accesso terminato\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Uso: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Uso: newgrp [-] [GRUPPO]\n"
 
@@ -1271,14 +1179,11 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: impossibile eseguire fork(): %s\n"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "UID %u sconosciuto\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: l'utente «%s» non esiste\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "GID %lu sconosciuto\n"
-
 msgid "too many groups\n"
 msgstr "troppi gruppi\n"
 
@@ -1296,63 +1201,21 @@
 "  -r, --system                  crea gli account di sistema\n"
 "%s\n"
 
-#, c-format
-msgid "%s: group ID `%s' is not valid\n"
-msgstr "%s: ID gruppo «%s» non valido\n"
-
-#, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "%s: nome di gruppo «%s» non valido\n"
-
-#, c-format
-msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: il gruppo «%s» è un gruppo shadow, ma non esiste in /etc/group\n"
 
-#, c-format
-msgid ""
-"%s: group %s created, failure during the creation of the corresponding "
-"gshadow group\n"
-msgstr ""
-"%s: creato il gruppo «%s»; errore nel creare il corrispondente gruppo "
-"gshadow\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: nome utente «%s» non valido\n"
 
 #, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: ID utente «%s» non valido\n"
-
-#, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: l'utente «%s» non esiste\n"
-
-#, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: nome utente «%s» non valido\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: impossibile fare il lock di /etc/passwd.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: impossibile fare il lock di /etc/shadow.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: impossibile fare il lock di /etc/group.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: impossibile fare il lock di /etc/gshadow.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1370,9 +1233,10 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: riga %d: impossibile creare il gruppo\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: riga %d: impossibile trovare l'utente %s\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: l'utente «%s» non esiste\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1390,6 +1254,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: riga %d: impossibile aggiornare la voce\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1402,15 +1294,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1485,14 +1377,14 @@
 msgid "The password for %s cannot be changed yet.\n"
 msgstr "La password di %s non può ancora essere cambiata.\n"
 
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: memoria esaurita\n"
-
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 "%s: sbloccando l'utente si otterrebbe un account senza password.\n"
 "È necessario impostare una password con «usermod -p» per sbloccare questo "
@@ -1539,16 +1431,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "nome utente «%s» non valido\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "nome utente «%s» non valido\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "utente %s: nessun gruppo %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "utente %s: la directory %s non esiste\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "utente %s: il programma %s non esiste\n"
 
 #, c-format
@@ -1559,10 +1459,6 @@
 msgid "add user '%s' in %s? "
 msgstr "aggiungere l'utente «%s» in %s? "
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: impossibile aggiornare la voce relativa a %s nel file passwd\n"
-
 msgid "invalid shadow password file entry"
 msgstr "voce non valida nel file delle shadow password"
 
@@ -1573,34 +1469,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "utente %s: l'ultimo cambio di password reca una data futura\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: impossibile fare il lock del file passwd\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: impossibile aprire il file %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: impossibile aprire il file passwd\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Uso: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: impossibile rimuovere la voce relativa a %s dal file shadow\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: impossibile aggiornare il file shadow\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Uso: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: impossibile aggiornare il file passwd\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: impossibile aggiornare la voce relativa all'utente %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: impossibile eliminare il file delle shadow password\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "L'accesso all'account tramite «su» è NEGATO.\n"
 
@@ -1667,6 +1554,16 @@
 "%s: %s\n"
 "(Ignorato)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: autenticazione PAM non riuscita\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Non si è autorizzati a diventare %s\n"
+
 msgid "No shell\n"
 msgstr "Nessuna shell\n"
 
@@ -1692,14 +1589,6 @@
 msgstr "Avvio modalità manutenzione del sistema"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: GID «%s» sconosciuto\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: gruppo «%s» sconosciuto\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: impossibile creare il nuovo file dei valori predefiniti\n"
 
@@ -1719,6 +1608,46 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: troppi gruppi specificati (max %d).\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: useradd [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
+#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#| "                                home directory\n"
+#| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#| "account\n"
+#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#| "  -D, --defaults                print or save modified default useradd\n"
+#| "                                configuration\n"
+#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#| "EXPIRE_DATE\n"
+#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#| "                                user account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#| "  -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"
+#| "  -N, --no-user-group           do not create a group with the same name "
+#| "as\n"
+#| "                                the user\n"
+#| "  -o, --non-unique              allow create user with duplicate\n"
+#| "                                (non-unique) UID\n"
+#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#| "                                account\n"
+#| "  -r, --system                  create a system account\n"
+#| "  -s, --shell SHELL             the login shell for the new user account\n"
+#| "  -u, --uid UID                 force use the UID for the new user "
+#| "account\n"
+#| "  -U, --user-group              create a group with the same name as the "
+#| "user\n"
+#| "\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1739,10 +1668,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1794,16 +1725,6 @@
 "\n"
 
 #, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: memoria esaurita. Impossibila aggiornare il database dei gruppi.\n"
-
-#, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr ""
-"%s: memoria esaurita. Impossibile aggiornare il database dei grupppi "
-"shadow.\n"
-
-#, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: directory di base «%s» non valida\n"
 
@@ -1840,49 +1761,12 @@
 msgstr "%s: le opzioni %s e %s sono mutuamente esclusive\n"
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: nome utente «%s» non valido\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: impossibile riscrivere il file delle password\n"
-
-#, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: impossibile riscrivere il file delle shadow password\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: impossibile fare il lock del file delle shadow password\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: impossibile aprire il file delle shadow password\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: errore nel fare il lock del file dei gruppi\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: errore nell'aprire il file dei gruppi\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: errore nel fare il lock del file dei gruppi shadow\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: errore nell'aprire il file dei gruppi shadow\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: errore nell'aggiungere la nuova voce al file delle password\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
 msgstr ""
-"%s: errore nell'aggiungere la nuova voce al file delle shadow password\n"
 
 #, c-format
 msgid "%s: cannot create directory %s\n"
@@ -1900,8 +1784,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Impostazione dei permessi del file della casella di posta"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: l'utente «%s» esiste già\n"
 
 #, c-format
@@ -1915,11 +1800,16 @@
 msgid "%s: can't create user\n"
 msgstr "%s: impossibile creare l'utente\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u non univoco\n"
 
 #, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: impossibile creare il gruppo\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1927,10 +1817,6 @@
 "%s: attenzione: la directory home esiste già.\n"
 "Non verrà copiato nessun file dalla directory skel.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr "%s: attenzione: CREATE_HOME non è supportata; usare -m.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1950,53 +1836,28 @@
 "  -r, --remove                  rimuove directory home e spool di posta\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: errore nell'aggiornare la voce nel file dei gruppi\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: impossibile rimuovere il gruppo «%s» in quanto gruppo principale di un "
 "altro utente.\n"
 
 #, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: errore nell'aggiornare la voce nel file dei gruppi shadow\n"
-
-#, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: impossibile aprire il file dei gruppi\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: impossibile aprire il file dei gruppi shadow\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: errore nel rimuovere la voce dal file delle password\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: errore nel rimuovere la voce dal file delle shadow password\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: l'utente %s è attualmente collegato\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: attenzione: impossibile rimuovere "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s non appartiene a %s, quindi non viene rimosso\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: attenzione: impossibile rimuovere "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: l'utente %s non esiste\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: l'utente %s è un utente NIS\n"
 
@@ -2063,10 +1924,23 @@
 "  -U, --unlock                  sblocca l'account dell'utente\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: errore nell'aggiungere la nuova voce al file dei gruppi shadow\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+"%s: sbloccando l'utente si otterrebbe un account senza password.\n"
+"È necessario impostare una password con «usermod -p» per sbloccare questo "
+"account.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: l'utente «%s» esiste già\n"
+
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: non è stata fornita nessuna opzione\n"
@@ -2079,23 +1953,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr "%s: i flag -L, -p e -U sono mutuamente esclusivi\n"
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: uid «%lu» non univoco\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "Membro già esistente\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: errore nel cambio della voce nel file delle password\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: errore nel rimuovere la voce dal file delle password\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: errore nel rimuovere la voce dal file delle shadow password\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: la directory %s esiste già\n"
 
@@ -2118,6 +1981,14 @@
 msgstr "%s: impossibile rinominare la directory %s in %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: attenzione: %s non appartiene a %s\n"
 
@@ -2127,11 +1998,15 @@
 msgid "failed to rename mailbox"
 msgstr "impossibile rinominare la casella di posta"
 
-#, c-format
+#, fuzzy, 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"
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 "%s è stato modificato.\n"
 "Per coerenza, potrebbe essere necessario modificare anche %s.\n"
@@ -2158,10 +2033,16 @@
 "  -s, --shadow                  modifica il database shadow o gshadow\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: impossibile abbandonare i privilegi (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s non modificato\n"
@@ -2176,3 +2057,418 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr ""
 "%s: impossibile ripristinare %s: %s (le modifiche effettuate sono in %s)\n"
+
+#~ msgid "%s: can't lock password file\n"
+#~ msgstr "%s: impossibile fare il lock del file delle password\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: impossibile aprire il file delle password\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: impossibile fare il lock del file delle shadow password\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: impossibile aprire il file delle shadow password\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: impossibile riscrivere il file delle shadow password\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: impossibile riscrivere il file delle password\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: impossibile aggiornare il file delle password\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: impossibile aggiornare il file delle shadow password\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tNome completo: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tStanza n°: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tNumero telefonico di lavoro: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tNumero telefonico di casa: %s\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Impossibile aprire il file delle password.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: impossibile fare il lock del file dei gruppi\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: impossibile aprire il file dei gruppi\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: impossibile fare il lock del file gshadow\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: impossibile aprire il file shadow\n"
+
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: errore nell'aggiornare il file gshadow\n"
+
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: errore nell'aggiornare il file dei gruppi\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: riga %d: gruppo «%s» sconosciuto\n"
+
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: riga %d: impossibile aggiornare la voce nel file dei gruppi\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: impossibile fare il lock del file shadow\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: errore nell'aggiornare il file shadow\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: errore nell'aggiornare il file delle password\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: riga %d: utente «%s» sconosciuto\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr ""
+#~ "%s: riga %d: impossibile aggiornare la voce nel file delle password\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: utente sconosciuto\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Utente «%s» sconosciuto\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Uso: %s [-r|-R] GRUPPO\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "     %s [-a UTENTE] GRUPPO\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "     %s [-d UTENTE] GRUPPO\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "     %s [-A UTENTE,...] [-M UTENTE,...] GRUPPO\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "     %s [-M UTENTE,...] GRUPPO\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: impossibile fare il lock\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: impossibile fare il lock del file shadow\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: impossibile aprire il file\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: impossibile riscrivere il file\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: impossibile riscrivere il file shadow\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: impossibile togliere il lock dal file\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: impossibile aggiornare la voce\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: impossibile aggiornare la voce nel file shadow\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "gruppo «%s» sconosciuto\n"
+
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: impossibile chiudere il file\n"
+
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: impossibile chiudere il file shadow\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Chi sei?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: membro «%s» sconosciuto\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: errore nell'aggiungere la nuova voce al file dei gruppi\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: impossibile riscrivere il file dei gruppi\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: impossibile riscrivere il file dei gruppi shadow\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: impossibile fare il lock del file dei gruppi\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: impossibile aprire il file dei gruppi\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: impossibile fare il lock del file dei gruppi shadow\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: impossibile aprire il file dei gruppi shadow\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u non univoco\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: errore nel rimuovere la voce dal file dei gruppi\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: errore nel rimuovere la voce dal file dei gruppi shadow\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: impossibile rimuovere il gruppo principale dell'utente.\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Impossibile trovare il membro da rimuovere\n"
+
+#~ msgid ""
+#~ "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+#~ msgstr ""
+#~ "Uso: groupmems -a NOME_UTENTE | -d NOME_UTENTE | -D | -l [ -g "
+#~ "NOME_GRUPPO]\n"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "Solo root può aggiungere membri a gruppi diversi\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "È necessario l'accesso al gruppo\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Non si è il proprietario principale del gruppo\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "Autenticazione PAM non riuscita per\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Impossibile fare il lock del file dei gruppi\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Impossibile aprire il file dei gruppi\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Impossibile chiudere il file dei gruppi\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: «%s» non trovato in /etc/group\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u non è un GID univoco\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s non è un nome univoco\n"
+
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: impossibile riscrivere il file delle password\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: impossibile fare il lock del file delle password\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: impossibile aprire il file delle password\n"
+
+#~ msgid ""
+#~ "%s: cannot change the primary group of user '%s' from %u to %u, since it "
+#~ "is not in the passwd file.\n"
+#~ msgstr ""
+#~ "%s: impossibile modificare il gruppo principale dell'utente «%s» da %u a %"
+#~ "u, in quanto non è presente nel file delle password.\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: impossibile fare il lock del file %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: impossibile aggiornare la voce relativa a %s nel file shadow\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: impossibile aggiornare la voce del gruppo %s\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: impossibile fare il lock del file dei gruppi shadow\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: impossibile aprire il file dei gruppi shadow\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: impossibile rimuovere il gruppo shadow %s\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: impossibile aggiornare il file dei gruppi shadow\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: impossibile aggiornare il file dei gruppi\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: impossibile eliminare il file dei gruppi shadow\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "UID %u sconosciuto\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "GID %lu sconosciuto\n"
+
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: ID gruppo «%s» non valido\n"
+
+#~ msgid ""
+#~ "%s: group %s created, failure during the creation of the corresponding "
+#~ "gshadow group\n"
+#~ msgstr ""
+#~ "%s: creato il gruppo «%s»; errore nel creare il corrispondente gruppo "
+#~ "gshadow\n"
+
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: ID utente «%s» non valido\n"
+
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: nome utente «%s» non valido\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: impossibile fare il lock di /etc/passwd.\n"
+
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: impossibile fare il lock di /etc/shadow.\n"
+
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: impossibile fare il lock di /etc/group.\n"
+
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: impossibile fare il lock di /etc/gshadow.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: impossibile aprire i file\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: errore nell'aggiornare i file\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: riga %d: impossibile trovare l'utente %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: impossibile aggiornare la voce relativa a %s nel file passwd\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: impossibile fare il lock del file passwd\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: impossibile aprire il file passwd\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: impossibile rimuovere la voce relativa a %s dal file shadow\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: impossibile aggiornare il file shadow\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: impossibile aggiornare il file passwd\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: impossibile aggiornare la voce relativa all'utente %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: impossibile eliminare il file delle shadow password\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: GID «%s» sconosciuto\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: gruppo «%s» sconosciuto\n"
+
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr ""
+#~ "%s: memoria esaurita. Impossibile aggiornare il database dei grupppi "
+#~ "shadow.\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: impossibile riscrivere il file delle password\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: impossibile riscrivere il file delle shadow password\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: impossibile fare il lock del file delle shadow password\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: impossibile aprire il file delle shadow password\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: errore nel fare il lock del file dei gruppi\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: errore nell'aprire il file dei gruppi\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: errore nel fare il lock del file dei gruppi shadow\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: errore nell'aprire il file dei gruppi shadow\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: errore nell'aggiungere la nuova voce al file delle password\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr ""
+#~ "%s: errore nell'aggiungere la nuova voce al file delle shadow password\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr "%s: attenzione: CREATE_HOME non è supportata; usare -m.\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: errore nell'aggiornare la voce nel file dei gruppi\n"
+
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: errore nell'aggiornare la voce nel file dei gruppi shadow\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: impossibile aprire il file dei gruppi\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: impossibile aprire il file dei gruppi shadow\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: errore nel rimuovere la voce dal file delle password\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: errore nel rimuovere la voce dal file delle shadow password\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: l'utente %s non esiste\n"
+
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr ""
+#~ "%s: errore nell'aggiungere la nuova voce al file dei gruppi shadow\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: uid «%lu» non univoco\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: errore nel cambio della voce nel file delle password\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: errore nel rimuovere la voce dal file delle password\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: errore nel rimuovere la voce dal file delle shadow password\n"

Modified: upstream/trunk/po/ja.po
===================================================================
--- upstream/trunk/po/ja.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/ja.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -54,6 +54,9 @@
 msgid "  Choose a new password."
 msgstr "  新しいパスワードを選択してください。"
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "あなたのパスワードはあと %ld 日で期限が切れます。\n"
@@ -65,7 +68,12 @@
 msgstr "あなたのパスワードは本日で期限が切れます。"
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "端末 %s に変更できません"
 
 msgid "Environment overflow\n"
@@ -86,14 +94,14 @@
 "最後のログインから %d 回失敗。\n"
 "最後のログインは %s (マシン %s)。\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "%s: 他と重ならないグループ ID を取得できません\n"
+
+#, fuzzy, c-format
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "%s: 他と重ならないユーザ ID を取得できません\n"
 
-#, fuzzy
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s: 他と重ならないグループ ID を取得できません\n"
-
 msgid "Too many logins.\n"
 msgstr "ログイン試行数が制限を越えました。\n"
 
@@ -185,9 +193,18 @@
 msgstr "あなたの端末 (tty) 名を決定できません。"
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: メモリが足りません\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) に失敗しました\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "No\n"
+
 msgid "Password: "
 msgstr "パスワード: "
 
@@ -195,6 +212,11 @@
 msgid "%s's Password: "
 msgstr "%s のパスワード: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: 入力内容が長過ぎます\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -289,42 +311,33 @@
 msgstr "%s: 権限がありません。\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: あなたのユーザ名を判定できません。\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM 認証に失敗しました\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: パスワードファイルをロックできません\n"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: ファイルをロックできません。後でもう一度試してください\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: パスワードファイルが開けません\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: ファイル %s を開けません\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: シャドウパスワードファイルをロックできません\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: fork に失敗しました: %s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: シャドウパスワードファイルを開けません\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: 特権を落とせませんでした (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: シャドウパスワードファイルを書換えできません\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: パスワードファイルを書換えできません\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: パスワードファイルを更新できません\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: シャドウパスワードファイルを更新できません\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: シャドウパスワードファイルがありません\n"
 
@@ -332,9 +345,9 @@
 msgid "%s: failed to drop privileges (%s)\n"
 msgstr "%s: 特権を落とせませんでした (%s)\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: ユーザ %s は不明です\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: ユーザ %s は存在しません\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -359,57 +372,27 @@
 msgid "Full Name"
 msgstr "フルネーム"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tフルネーム: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "部屋番号"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\t部屋番号: %s\n"
-
 msgid "Work Phone"
 msgstr "職場電話番号"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\t職場電話番号: %s\n"
-
 msgid "Home Phone"
 msgstr "自宅電話番号"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\t自宅電話番号: %s\n"
-
 msgid "Other"
 msgstr "その他"
 
 msgid "Cannot change ID to root.\n"
 msgstr "ID を root へ変更できません。\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 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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -442,9 +425,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' には利用できない文字が含まれています\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: あなたのユーザ名を判定できません。\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: ユーザ %s は存在しません\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -493,7 +476,7 @@
 msgstr "%s: 数値引数 '%s' が正しくありません\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: -a フラグは -G フラグと共に指定する必要があります\n"
 
 #, c-format
@@ -505,30 +488,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: グループファイルをロックできません\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: グループファイルを開けません\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: gshadow ファイルをロックできません\n"
-
-#, c-format
-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"
 
@@ -536,38 +495,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: %d 行: 新規パスワードがありません\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: %d 行: グループ %s は不明です\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: グループ %s は存在しません\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: ユーザ %s は存在しません\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: シャドウファイル更新の際にエラーが起きました\n"
-
-#, c-format
-msgid "%s: error updating password 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"
@@ -586,8 +531,9 @@
 msgid "Login Shell"
 msgstr "ログインシェル"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "あなたが %s のシェルを変更することはできません。\n"
 
 #, c-format
@@ -598,24 +544,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: 不正な入力: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s は不正なシェルです。\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "使用法: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: 不明なユーザです\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -642,11 +604,16 @@
 "                                このユーザの失敗カウンタを操作する\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "ログイン名  失敗     最大    最新                     場所\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr "[残り %ld 秒]"
 
 #, c-format
@@ -654,76 +621,67 @@
 msgstr "[ロック %ld 秒]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "不明なユーザです: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "使用法: %s [-r|-R] グループ\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a ユーザ] グループ\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d ユーザ] グループ\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "不明なユーザです: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A ユーザ,...] [-M ユーザ,...] グループ\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: ファイル %s を開けません\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M ユーザ,...] グループ\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: -A にはシャドウグループパスワードが必要です\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: ロックできません\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: シャドウをロックできません\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "%s のパスワードは変更できません。\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: ファイルを開けません\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: -A にはシャドウグループパスワードが必要です\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: ファイルを開けません\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: グループ %s は存在しません\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: shadow ファイルを開けません\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: fork に失敗しました: %s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -742,9 +700,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: 後でもう一度お願いします\n"
 
-msgid "Who are you?\n"
-msgstr "あなたは誰?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "ユーザ %s をグループ %s に追加\n"
@@ -753,9 +708,9 @@
 msgid "Removing user %s from group %s\n"
 msgstr "ユーザ %s をグループ %s から削除\n"
 
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: メンバー %s は不明です\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: ユーザ %s は存在しません\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -791,112 +746,89 @@
 "                                作成を許可する\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: 新規グループエントリ追加の際にエラーが起きました\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s はグループ名として正しくありません\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: グループファイルを書換えできません\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "'%s' はグループ名として正しくありません\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: シャドウグループファイルを書換えできません\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: グループファイルをロックできません\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: グループファイルを開けません\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: シャドウグループファイルをロックできません\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: シャドウグループファイルを開けません\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K には KEY=VALUE が必要です\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 msgstr "%s: グループ %s は既に存在します\n"
 
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: グループ ID %u が重複しています\n"
-
 #, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: %s を作成できません\n"
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "メンバーは既に存在します\n"
 
 msgid "Usage: groupdel group\n"
 msgstr "使用法: groupdel グループ\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: グループエントリ削除の際にエラーが起きました\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: ディレクトリ %s の名前を %s に変更できません\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: シャドウグループエントリ削除の際にエラーが起きました\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: NIS クライアントではユーザ '%s' を変更できません。\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: ユーザのプライマリグループは削除できません。\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: グループ %s は存在しません\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: グループ %s は NIS のグループです\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: グループ '%s' は NIS グループです。\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s が NIS マスターです\n"
 
-msgid "Member already exists\n"
-msgstr "メンバーは既に存在します\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: ユーザ %s は NIS ユーザです\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "削除すべきメンバーが見付かりません\n"
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: update_group 中にメモリが不足しました\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
-"使用法: groupmems -a ユーザ名 | -d ユーザ名 | -D | -l [-g グループ名]\n"
 
-msgid "Only root can add members to different groups\n"
-msgstr "メンバーを別のグループに追加できるのは root だけです\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "グループアクセス権が必要です\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "現グループのプライマリな所有者ではありません\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "PAM 認証に失敗しました\n"
-
-msgid "Unable to lock group file\n"
-msgstr "グループファイルをロックできません\n"
-
-msgid "Unable to open group file\n"
-msgstr "グループファイルを開けません\n"
-
-msgid "Cannot close group file\n"
-msgstr "グループファイルをクローズできません\n"
-
 #, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
@@ -921,41 +853,19 @@
 "                                使用を許可する\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: /etc/groupに %s が見付かりません\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: グループ ID %u は重複しています\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: 名前 %s は重複しています\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: パスワードファイルの書換えができません\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "'%s' はグループ名として正しくありません\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: パスワードファイルがロックできません\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: グループ %s は NIS のグループです\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: パスワードファイルが開けません\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: ユーザ %s は不明です\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: NIS クライアントではユーザ '%s' を変更できません。\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "使用法: %s [-r] [-s] [group [gshadow]]\n"
 
@@ -967,18 +877,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s と -r は同時に指定できません\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: ファイル %s をロックできません\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-msgstr "%s: ファイル %s を開けません\n"
-
-#, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: ファイル %s を更新できません\n"
-
 msgid "invalid group file entry"
 msgstr "不正なグループファイルエントリです"
 
@@ -993,6 +891,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "'%s' はグループ名として正しくありません\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "'%s' はグループ名として正しくありません\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "グループ %s: ユーザ %s はいません\n"
@@ -1005,18 +908,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "%s には一致するグループファイルエントリがありません\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "グループ %s を %s に追加しますか?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: %s のシャドウエントリを更新できません\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: グループ %s のエントリを更新できません\n"
-
 msgid "invalid shadow group file entry"
 msgstr "シャドウグループファイルのエントリが正しくありません"
 
@@ -1043,30 +939,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: 変更はありません\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: シャドウグループファイルをロックできません\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "使用法: groupdel グループ\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: シャドウグループファイルを開けません\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "使用法: groupdel グループ\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: シャドウグループ %s を削除できません\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: ファイル %s を更新できません\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: シャドウグループファイルを更新できません\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: グループファイルを更新できません\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: シャドウグループファイルを削除できません\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "使用法: id [-a]\n"
 
@@ -1097,6 +984,10 @@
 "  -u, --user LOGIN              指定ユーザ LOGIN の lastlog 記録を表示する\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "ユーザ名         ポート   場所             最近のログイン"
 
@@ -1106,15 +997,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "使用法: %s [-p] [ユーザ名]\n"
 
@@ -1212,6 +1103,11 @@
 "ログイン時間切れ\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "使用法: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "使用法: newgrp [-] [グループ]\n"
 
@@ -1226,14 +1122,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: fork に失敗しました: %s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "不明なユーザ ID: %u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: ユーザ %s は存在しません\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "不明なグループ ID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "グループが多すぎます\n"
 
@@ -1247,60 +1139,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: グループ %s は存在しません\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "'%s' はグループ名として正しくありません\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: ユーザ名 '%s' は不正です\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: ユーザ %s は存在しません\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: ユーザ %s は存在しません\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: ユーザ名 '%s' は不正です\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: /etc/passwd をロックできません。\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: /etc/passwd をロックできません。\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: /etc/passwd をロックできません。\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: /etc/passwd をロックできません。\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1316,9 +1167,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: %d 行: グループ ID を作成できません\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: %d 行: ユーザ %s が見付かりません\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: ユーザ %s は存在しません\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1336,6 +1187,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: %d 行: エントリを更新できません\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1348,15 +1227,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1427,13 +1306,10 @@
 msgstr "%s のパスワードは変更できません。\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: メモリが足りません\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1476,16 +1352,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "ユーザ名 '%s' は不正です\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "ユーザ名 '%s' は不正です\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "ユーザ %s: グループ %u がありません\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "ユーザ %s: ディレクトリ %s が存在しません\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "ユーザ %s: プログラム %s は存在しません\n"
 
 #, c-format
@@ -1496,10 +1380,6 @@
 msgid "add user '%s' in %s? "
 msgstr "ユーザ '%s' を '%s' に追加しますか?"
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: %s のパスワードエントリを更新できません\n"
-
 msgid "invalid shadow password file entry"
 msgstr "不正なシャドウパスワードのエントリです"
 
@@ -1510,34 +1390,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "ユーザ %s: 最後のパスワード変更が未来になっています\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: パスワードファイルをロックできません\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: ファイル %s を開けません\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: パスワードファイルを開けません\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "使用法: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: %s のシャドウエントリを削除できません\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: シャドウファイルを更新できません\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "使用法: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: パスワードファイルを更新できません\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: ユーザ %s のエントリを更新できません\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: シャドウパスワードファイルを削除できません\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "このアカウントへの su アクセスは禁止されています。\n"
 
@@ -1603,6 +1474,16 @@
 "%s: %s\n"
 "(無視)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: PAM 認証に失敗しました\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "あなたには su %s する権限がありません\n"
+
 msgid "No shell\n"
 msgstr "シェルがありません\n"
 
@@ -1628,14 +1509,6 @@
 msgstr "システムメンテナンスモードへ入ります"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: グループ ID %s は不明です\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: グループ %s は不明です\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: 新しいデフォルトファイルを作れません\n"
 
@@ -1676,10 +1549,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1721,14 +1596,6 @@
 "  -u, --uid UID                 新ユーザアカウントのユーザ ID を指定する\n"
 "\n"
 
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: update_group 中にメモリが不足しました\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: update_gshadow 中にメモリが不足しました\n"
-
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: ベースディレクトリ '%s' は不正です\n"
@@ -1766,50 +1633,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: ユーザ名 '%s' は不正です\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: パスワードファイルの書換えができません\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: シャドウパスワードファイルの書換えができません\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: シャドウパスワードファイルがロックできません\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: シャドウパスワードファイルが開けません\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: グループファイルのロックでエラーが起きました\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: グループファイルを開く際にエラーが起きました\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: シャドウグループファイルのロックでエラーが起きました\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: シャドウグループファイルを開く際にエラーが起きました\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: 新しいパスワードエントリの追加の際にエラーが起きました\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: 新しいシャドウパスワードエントリ追加の際にエラーが起きました\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: ディレクトリ %s を作成できません\n"
 
@@ -1825,8 +1656,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "メールボックスファイルの許可属性を設定します"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: ユーザ %s は存在します\n"
 
 #, c-format
@@ -1840,10 +1672,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s: %s を作成できません\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: ユーザ ID %u は重複しています\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: %s を作成できません\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1852,11 +1689,6 @@
 "%s: 警告: ホームディレクトリが既に存在します。\n"
 "skel ディレクトリからのコピーは行いません。\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr ""
-"%s: 警告: CREATE_HOME はサポートされていません。-m を用いてください。\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1876,52 +1708,27 @@
 "る\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: グループエントリ更新の際にエラーが起きました\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: グループ %s は他のユーザのプライマリグループなので削除できません。\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: グループエントリ更新の際にエラーが起きました\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: グループファイルを開けません\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: シャドウグループファイルを開けません\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: パスワードエントリの削除でエラーが起きました\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: シャドウパスワードエントリの削除でエラーが起きました\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: ユーザ %s は現在ログイン中です\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: 警告: 削除できません"
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s は %s の所有ではありません。削除は行いません\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: 警告: 削除できません"
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: ユーザ %s は存在しません\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: ユーザ %s は NIS ユーザです\n"
 
@@ -1987,9 +1794,16 @@
 "  -U, --unlock                  このユーザアカウントのロックを解除する\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: 新規グループエントリ追加の際にエラーが起きました\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: ユーザ %s は存在します\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -2003,23 +1817,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: ユーザ ID %lu が重複しています\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "メンバーは既に存在します\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: パスワードエントリの変更でエラーが起きました\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: パスワードエントリの削除でエラーが起きました\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: シャドウパスワードエントリの削除でエラーが起きました\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: ディレクトリ %s は存在します\n"
 
@@ -2040,6 +1843,14 @@
 msgstr "%s: ディレクトリ %s の名前を %s に変更できません\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: 警告: %s は %s の所有ではありません\n"
 
@@ -2053,7 +1864,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -2078,10 +1889,16 @@
 "る\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: 特権を落とせませんでした (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s は変更されません\n"
@@ -2096,6 +1913,421 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: %s を復旧できませんでした: %s (あなたの変更は %s にあります)\n"
 
+#~ msgid "%s: can't lock password file\n"
+#~ msgstr "%s: パスワードファイルをロックできません\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: パスワードファイルが開けません\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: シャドウパスワードファイルをロックできません\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: シャドウパスワードファイルを開けません\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: シャドウパスワードファイルを書換えできません\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: パスワードファイルを書換えできません\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: パスワードファイルを更新できません\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: シャドウパスワードファイルを更新できません\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tフルネーム: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\t部屋番号: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\t職場電話番号: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\t自宅電話番号: %s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr ""
+#~ "パスワードファイルをロックできません; 後でもう一度試してください。\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "パスワードファイルを開けません。\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: グループファイルをロックできません\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: グループファイルを開けません\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: gshadow ファイルをロックできません\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: shadow ファイルを開けません\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: シャドウファイル更新の際にエラーが起きました\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: グループエントリ更新の際にエラーが起きました\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: %d 行: グループ %s は不明です\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: %d 行: エントリを更新できません\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: シャドウファイルをロックできません\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: シャドウファイル更新の際にエラーが起きました\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: パスワードファイル更新の際にエラーが起きました\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: %d 行: ユーザ %s は不明です\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: %d 行: パスワードエントリを更新できません\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: 不明なユーザです\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "不明なユーザです: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "使用法: %s [-r|-R] グループ\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a ユーザ] グループ\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d ユーザ] グループ\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A ユーザ,...] [-M ユーザ,...] グループ\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M ユーザ,...] グループ\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: ロックできません\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: シャドウをロックできません\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: ファイルを開けません\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: ファイルを書換えできません\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: シャドウファイルを書換えできません\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: ファイルのロックを解除できません\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: エントリを更新できません\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: シャドウエントリを更新できません\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "不明なグループです: %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: ファイルを開けません\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: shadow ファイルを開けません\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "あなたは誰?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: メンバー %s は不明です\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: 新規グループエントリ追加の際にエラーが起きました\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: グループファイルを書換えできません\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: シャドウグループファイルを書換えできません\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: グループファイルをロックできません\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: グループファイルを開けません\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: シャドウグループファイルをロックできません\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: シャドウグループファイルを開けません\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: グループ ID %u が重複しています\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: グループエントリ削除の際にエラーが起きました\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: シャドウグループエントリ削除の際にエラーが起きました\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: ユーザのプライマリグループは削除できません。\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "削除すべきメンバーが見付かりません\n"
+
+#~ msgid ""
+#~ "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+#~ msgstr ""
+#~ "使用法: groupmems -a ユーザ名 | -d ユーザ名 | -D | -l [-g グループ名]\n"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "メンバーを別のグループに追加できるのは root だけです\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "グループアクセス権が必要です\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "現グループのプライマリな所有者ではありません\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "PAM 認証に失敗しました\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "グループファイルをロックできません\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "グループファイルを開けません\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "グループファイルをクローズできません\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: /etc/groupに %s が見付かりません\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: グループ ID %u は重複しています\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: 名前 %s は重複しています\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: パスワードファイルの書換えができません\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: パスワードファイルがロックできません\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: パスワードファイルが開けません\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: ファイル %s をロックできません\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: %s のシャドウエントリを更新できません\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: グループ %s のエントリを更新できません\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: シャドウグループファイルをロックできません\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: シャドウグループファイルを開けません\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: シャドウグループ %s を削除できません\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: シャドウグループファイルを更新できません\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: グループファイルを更新できません\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: シャドウグループファイルを削除できません\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "不明なユーザ ID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "不明なグループ ID: %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: グループ %s は存在しません\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: ユーザ %s は存在しません\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: ユーザ名 '%s' は不正です\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: /etc/passwd をロックできません。\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: /etc/passwd をロックできません。\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: /etc/passwd をロックできません。\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: /etc/passwd をロックできません。\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: ファイルを開けません\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: ファイル更新のエラーです\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: %d 行: ユーザ %s が見付かりません\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: %s のパスワードエントリを更新できません\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: パスワードファイルをロックできません\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: パスワードファイルを開けません\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: %s のシャドウエントリを削除できません\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: シャドウファイルを更新できません\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: パスワードファイルを更新できません\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: ユーザ %s のエントリを更新できません\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: シャドウパスワードファイルを削除できません\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: グループ ID %s は不明です\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: グループ %s は不明です\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: update_gshadow 中にメモリが不足しました\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: パスワードファイルの書換えができません\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: シャドウパスワードファイルの書換えができません\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: シャドウパスワードファイルがロックできません\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: シャドウパスワードファイルが開けません\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: グループファイルのロックでエラーが起きました\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: グループファイルを開く際にエラーが起きました\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: シャドウグループファイルのロックでエラーが起きました\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: シャドウグループファイルを開く際にエラーが起きました\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: 新しいパスワードエントリの追加の際にエラーが起きました\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: 新しいシャドウパスワードエントリ追加の際にエラーが起きました\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr ""
+#~ "%s: 警告: CREATE_HOME はサポートされていません。-m を用いてください。\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: グループエントリ更新の際にエラーが起きました\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: グループエントリ更新の際にエラーが起きました\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: グループファイルを開けません\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: シャドウグループファイルを開けません\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: パスワードエントリの削除でエラーが起きました\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: シャドウパスワードエントリの削除でエラーが起きました\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: ユーザ %s は存在しません\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: 新規グループエントリ追加の際にエラーが起きました\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: ユーザ ID %lu が重複しています\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: パスワードエントリの変更でエラーが起きました\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: パスワードエントリの削除でエラーが起きました\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: シャドウパスワードエントリの削除でエラーが起きました\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: 他と重ならないグループ ID を取得できません\n"
 
@@ -2105,18 +2337,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " on `%.100s'"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: ファイルをロックできません。後でもう一度試してください\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: %d 行: ユーザ ID を作成できません\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/kk.po
===================================================================
--- upstream/trunk/po/kk.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/kk.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadowutils\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-04-03 00:42+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\n"
 "PO-Revision-Date: 2009-03-02 13:55+0600\n"
 "Last-Translator: Baurzhan M. <baurthefirst at gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ at googlegroups.com>\n"
@@ -17,8 +17,11 @@
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #, c-format
-msgid "Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
-msgstr "'%s' атындағы %s ішінде бірнеше жазба бар. Оны pwck не grpck көмегімен дұрыстаңыз.\n"
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr ""
+"'%s' атындағы %s ішінде бірнеше жазба бар. Оны pwck не grpck көмегімен "
+"дұрыстаңыз.\n"
 
 #, c-format
 msgid "crypt method not supported by libcrypt? (%s)\n"
@@ -53,6 +56,9 @@
 msgid "  Choose a new password."
 msgstr "  Жаңа пароль таңдаңыз."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Пароліңіздің мерзімі %ld күнде аяқталады.\n"
@@ -64,7 +70,12 @@
 msgstr "Пароліңіздің мерзімі бүгін аяқталады."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "%s терминалын ауыстыру мүмкін емес"
 
 msgid "Environment overflow\n"
@@ -85,12 +96,16 @@
 "Жүйеге кірудің %d-ші қате талабы.\n"
 "Соңғысы %s болған, терминал %s.\n"
 
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+#| msgid "Can't get unique GID (no more available GIDs)\n"
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "Ерекше GID алу мүмкін емес (бос GID-тар қалмады)\n"
+
+#, fuzzy, c-format
+#| msgid "Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "Ерекше UID алу мүмкін емес (бос UID-тар қалмады)\n"
 
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "Ерекше GID алу мүмкін емес (бос GID-тар қалмады)\n"
-
 msgid "Too many logins.\n"
 msgstr "Жүйеге кірудің шектен көп талап саны.\n"
 
@@ -136,6 +151,11 @@
 msgid "passwd: %s\n"
 msgstr "passwd: %s\n"
 
+#, fuzzy
+#| msgid "Password changed."
+msgid "passwd: password unchanged\n"
+msgstr "Пароль өзгертілді."
+
 msgid "passwd: password updated successfully\n"
 msgstr "passwd: пароль сәтті жаңартылды\n"
 
@@ -171,15 +191,24 @@
 msgstr "Түбірлік бумасын '%s' мәніне ауыстыру мүмкін емес\n"
 
 msgid "No utmp entry.  You must exec \"login\" from the lowest level \"sh\""
-msgstr "Utmp жазбасы жоқ. Сізге exec \"login\" командасын бірінші деңгейден \"sh\" қосу керек"
+msgstr ""
+"Utmp жазбасы жоқ. Сізге exec \"login\" командасын бірінші деңгейден \"sh\" "
+"қосу керек"
 
 msgid "Unable to determine your tty name."
 msgstr "Терминалыңыздың атын анықтау мүмкін емес."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: жады жеткіліксіз\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "жадыдан %d байт бөлу мүмкін емес\n"
 
+msgid "No"
+msgstr ""
+
 msgid "Password: "
 msgstr "Пароль: "
 
@@ -187,6 +216,11 @@
 msgid "%s's Password: "
 msgstr "%s пайдаланушының паролі: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: жолдар өте ұзын\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -207,17 +241,23 @@
 "Қолданылуы: chage [опциялар] [ПАЙДАЛАНУШЫ_АТЫ]\n"
 "\n"
 "Опциялар:\n"
-"  -d, --lastday LAST_DAY        парольдің аяқталу мерзімін LAST_DAY күніне орнату\n"
-"  -E, --expiredate EXPIRE_DATE  тіркелгінің аяқталу мерзімі EXPIRE_DATE күніне орнату\n"
+"  -d, --lastday LAST_DAY        парольдің аяқталу мерзімін LAST_DAY күніне "
+"орнату\n"
+"  -E, --expiredate EXPIRE_DATE  тіркелгінің аяқталу мерзімі EXPIRE_DATE "
+"күніне орнату\n"
 "  -h, --help                    осы көмек ақпаратын көрсетіп, шығу\n"
-"  -I, --inactive INACTIVE       парольдің мерзімі біткен соң оны INACTIVE болып\n"
+"  -I, --inactive INACTIVE       парольдің мерзімі біткен соң оны INACTIVE "
+"болып\n"
 "                                орнату үшін өтетін күн саны\n"
 "  -l, --list                    тіркелгінің жұмыс уақыты ақпаратын көрсету\n"
-"  -m, --mindays MIN_DAYS        парольді ауыстыру арасында өту керек ең аз күн санын\n"
+"  -m, --mindays MIN_DAYS        парольді ауыстыру арасында өту керек ең аз "
+"күн санын\n"
 "                                MIN_DAYS мәніне орнату\n"
-"  -M, --maxdays MAX_DAYS        парольді ауыстыру арасында өту керек ең көп сүн санын\n"
+"  -M, --maxdays MAX_DAYS        парольді ауыстыру арасында өту керек ең көп "
+"сүн санын\n"
 "                                MAX_DAYS мәніне орнату\n"
-"  -W, --warndays WARN_DAYS      мерзімі аяқталу туралы хабарламаны WARN_DAYS күн қалғанда көрсете бастау\n"
+"  -W, --warndays WARN_DAYS      мерзімі аяқталу туралы хабарламаны WARN_DAYS "
+"күн қалғанда көрсете бастау\n"
 "\n"
 
 msgid "Enter the new value, or press ENTER for the default"
@@ -269,7 +309,9 @@
 
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
-msgstr "Парольдің мерзімі аяқталу туралы хабарламаны көрсете бастау, күн саны\t: %ld\n"
+msgstr ""
+"Парольдің мерзімі аяқталу туралы хабарламаны көрсете бастау, күн саны\t: %"
+"ld\n"
 
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
@@ -280,42 +322,34 @@
 msgstr "%s: Рұқсат жоқ.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Сіздің пайдаланушы атын анықтау мүмкін емес.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM көмегімен шындылықты тексеру қатемен аяқталды\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: парольдер файлын оқшаулау мүмкін емес\n"
+#, fuzzy, c-format
+#| msgid "Cannot lock the password file; try again later.\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "Парольдер файлын оқшаулау мүмкін емес; кейінірек қайталап көріңіз.\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: парольдер файлын ашу мүмкін емес\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: %s файлын ашу мүмкін емес\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: көлеңкелі парольдер файлын оқшаулау мүмкін емес\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: үрдісті бастау қатесі: %s\n"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: көлеңкелі парольдер файлын ашу мүмкін емес\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: привилегиялар деңгейін төмендету мүмкін емес (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: көлеңкелі парольдер файлын үстінен жазу мүмкін емес\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: парольдер файлын үстінен жазу мүмкін емес\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: парольдер файлын жаңарту мүмкін емес\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: көлеңкелі парольдер файлын жаңарту мүмкін емес\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: көлеңкелі парольдер файлын жоқ болып тұр\n"
 
@@ -323,9 +357,10 @@
 msgid "%s: failed to drop privileges (%s)\n"
 msgstr "%s: привилегиялар деңгейін төмендету мүмкін емес (%s)\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: белгісіз пайдаланушы %s\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: пайдаланушы `%s' жоқ болып тұр\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -345,66 +380,45 @@
 
 #, c-format
 msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n"
-msgstr "Қолданылуы: %s [-f толық_аты] [-r бөлме_нөмірі] [-w жұмыс_тел] [-h үй_тел]\n"
+msgstr ""
+"Қолданылуы: %s [-f толық_аты] [-r бөлме_нөмірі] [-w жұмыс_тел] [-h үй_тел]\n"
 
 msgid "Full Name"
 msgstr "Толық аты"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tТолық аты: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Бөлме нөмірі"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tБөлме нөмірі: %s\n"
-
 msgid "Work Phone"
 msgstr "Жұмыс телефон нөмірі"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tЖұмыс телефон нөмірі: %s\n"
-
 msgid "Home Phone"
 msgstr "Үй телефон нөмірі"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tҮй телефон нөмірі: %s\n"
-
 msgid "Other"
 msgstr "Басқа"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Суперпайдаланушы (root) құқығын алу мүмкін емес.\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 not found in /etc/passwd\n"
-msgstr "%s: /etc/passwd файлында %s табылмады\n"
+msgid "%s: name with non-ASCII characters: '%s'\n"
+msgstr ""
 
-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"
 
 #, c-format
+msgid "%s: room number with non-ASCII characters: '%s'\n"
+msgstr ""
+
+#, c-format
 msgid "%s: invalid room number: '%s'\n"
 msgstr "%s: бөлме нөмірі қате: '%s'\n"
 
@@ -416,13 +430,19 @@
 msgid "%s: invalid home phone: '%s'\n"
 msgstr "%s: үй телефон нөмірі қате: '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' contains illegal characters\n"
+msgid "%s: '%s' contains non-ASCII characters\n"
+msgstr "%s: '%s' құрамында қате таңбалар бар\n"
+
 #, c-format
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' құрамында қате таңбалар бар\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Сіздің пайдаланушы атын анықтау мүмкін емес.\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: пайдаланушы `%s' жоқ болып тұр\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -458,7 +478,8 @@
 "  -c, --crypt-method            шифрлеу тәсіл (%s-дан біреу)\n"
 "  -e, --encrypted               шифрленген пароль енгізіледі\n"
 "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
-"  -m, --md5                     DES орнына MD5 алгоритмін қолдану, егер пароль\n"
+"  -m, --md5                     DES орнына MD5 алгоритмін қолдану, егер "
+"пароль\n"
 "                                шифрленбеген түрде енгізілсе\n"
 "%s\n"
 
@@ -473,8 +494,9 @@
 msgid "%s: invalid numeric argument '%s'\n"
 msgstr "%s: қате сан аргументі '%s'\n"
 
-#, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+#, fuzzy, c-format
+#| msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: %s жалаушасын тек %s жалаушасымен БІРГЕ қолдануға болады\n"
 
 #, c-format
@@ -486,30 +508,6 @@
 msgstr "%s: қолдауы жоқ шифрлеу тәсілі: %s\n"
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: group файлын оқшаулау мүмкін емес\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: group файлын ашу мүмкін емес\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: gshadow файлын оқшаулау мүмкін емес\n"
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-msgstr "%s: shadow файлын ашу мүмкін емес\n"
-
-#, c-format
-msgid "%s: error updating gshadow file\n"
-msgstr "%s: gshadow файлын жаңарту қатесі\n"
-
-#, c-format
-msgid "%s: error updating group file\n"
-msgstr "%s: group файлын жаңарту қатесі\n"
-
-#, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: жол %d: жол өте ұзын\n"
 
@@ -517,38 +515,25 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: жол %d: жаңа пароль жоқ\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: жол %d: белгісіз топ %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: %s тобы жоқ болып тұр\n"
 
-#, c-format
-msgid "%s: line %d: cannot update group entry\n"
-msgstr "%s: жол %d: топ жазбасын жаңарту мүмкін емес\n"
+#, fuzzy, c-format
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: пайдаланушы `%s' жоқ болып тұр\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: shadow файлын жаңарту қатесі\n"
-
-#, c-format
-msgid "%s: error updating password 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"
@@ -567,8 +552,9 @@
 msgid "Login Shell"
 msgstr "Қоршам"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Сіз %s үшін қоршамды өзгерте алмайсыз.\n"
 
 #, c-format
@@ -579,51 +565,82 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Қате мән: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s - дұрыс қоршам емес.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Қолданылуы: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: белгісіз пайдаланушы\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC seconds\n"
+"  -l, --lock-time SEC           after failed login lock account to SEC "
+"seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
-"  -t, --time DAYS               display faillog records more recent than DAYS\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
 "  -u, --user LOGIN              display faillog record or maintains failure\n"
-"                                counters and limits (if used with -r, -m or -l\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
 "                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "Қолданылуы: faillog [опциялар]\n"
 "\n"
 "Опциялары:\n"
-"  -a, --all                     барлық пайдаланушылар үшін faillog жазбаларын көрсету\n"
+"  -a, --all                     барлық пайдаланушылар үшін faillog "
+"жазбаларын көрсету\n"
 "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
-"  -l, --lock-time SEC           сәтсіз талаптан кейін тіркелгіні SEC секундқа оқшаулау\n"
-"  -m, --maximum MAX             максимум сәтсіз жүйеге кіру талап шегін MAX мәніне орнату\n"
-"  -r, --reset                   сәтсіз жүйеге кіру талаптары жазбаларын өшіру\n"
-"  -t, --time DAYS               DAYS күнге дейінгі faillog жазбаларын көрсету\n"
-"  -u, --user ПАЙДАЛАНУШЫ              көрсетілген ПАЙДАЛАНУШЫ ушін faillog жазбаларын\n"
-"                                көрсету немесе шектеу (-r, -m не -l бірге қолдану керек)\n"
+"  -l, --lock-time SEC           сәтсіз талаптан кейін тіркелгіні SEC "
+"секундқа оқшаулау\n"
+"  -m, --maximum MAX             максимум сәтсіз жүйеге кіру талап шегін MAX "
+"мәніне орнату\n"
+"  -r, --reset                   сәтсіз жүйеге кіру талаптары жазбаларын "
+"өшіру\n"
+"  -t, --time DAYS               DAYS күнге дейінгі faillog жазбаларын "
+"көрсету\n"
+"  -u, --user ПАЙДАЛАНУШЫ              көрсетілген ПАЙДАЛАНУШЫ ушін faillog "
+"жазбаларын\n"
+"                                көрсету немесе шектеу (-r, -m не -l бірге "
+"қолдану керек)\n"
 "                                мәндерін баптау\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Пайдаланушы Сәтсіз кіру саны Максимум Соңғы         Қайда\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds қалды]"
 
 #, c-format
@@ -631,78 +648,71 @@
 msgstr " [%lds оқшаулар саны]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Белгісіз пайдаланушы: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Қолданылуы: %s [-r|-R] топ\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a пайдаланушы] топ\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d пайдаланушы] топ\n"
+#, fuzzy, c-format
+#| msgid "Unknown user or range: %s\n"
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Белгісіз пайдаланушы не диапазон: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A пайдаланушы,...] [-M пайдаланушы,...] топ\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: %s файлын ашу мүмкін емес\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M пайдаланушы,...] топ\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: -A үшін көлеңкелі парольдер файлына қолдау керек\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: оқшаулау мүмкін емес\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: shadow файлын оқшаулау мүмкін емес\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "%s үшін парольді өзгертуге болмайды.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: файлды ашу мүмкін емес\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: -A үшін көлеңкелі парольдер файлына қолдау керек\n"
 
-#, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: файлды үстінен жазу мүмкін емес\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: %s тобы жоқ болып тұр\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: shadow файлын үстінен жазу мүмкін емес\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: үрдісті бастау қатесі: %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: shadow ішіндегі жазбасын жаңарту мүмкін емес\n"
-
-#, c-format
-msgid "unknown group: %s\n"
-msgstr "белгісіз топ: %s\n"
-
-#, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: файлды жабу мүмкн емес\n"
-
-#, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: shadow файлын жабу мүмкін емес\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "%s тобы үшін парольді өзгерту\n"
 
@@ -719,9 +729,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Кейінірек қайталап көріңіз\n"
 
-msgid "Who are you?\n"
-msgstr "Сіз кімсіз?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "%s пайдаланушыны %s тобына қосу\n"
@@ -730,9 +737,10 @@
 msgid "Removing user %s from group %s\n"
 msgstr "%s пайдаланушыны %s тобынан өшіру\n"
 
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: белгісіз қатысушы %s\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: пайдаланушы `%s' жоқ болып тұр\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -760,117 +768,102 @@
 "                                қайтаруды мәжбүрлету\n"
 "  -g, --gid GID                 жаңа топ үшін GID қолдану\n"
 "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
-"  -K, --key KEY=МӘН           /etc/login.defs ішіндегісін елемеу(одан басыңқы болу)\n"
-"  -o, --non-unique              қайталанатын GID бар топтарды құруға рұқсат беру\n"
+"  -K, --key KEY=МӘН           /etc/login.defs ішіндегісін елемеу(одан "
+"басыңқы болу)\n"
+"  -o, --non-unique              қайталанатын GID бар топтарды құруға рұқсат "
+"беру\n"
 "  -p, --password PASSWORD       жаңа топ үшін шифрленген парольді қолдану\n"
 "  -r, --system                  жүйелік тіркелгіні жасау\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: жаңа топты құру қатесі\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s - дұрыс топ аты емес\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: group файлын үстінен жазу мүмкін емес\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group ID '%s'\n"
+msgstr "%s: қате топ аты `%s'\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: shadow group файлын үстінен жазу мүмкін емес\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: group файлын оқшаулау мүмкін емес\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: group файлын ашу мүмкін емес\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: shadow group файлын оқшаулау мүмкін емес\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: shadow group файлын ашу мүмкін емес\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K талап етеді KEY=МӘНІ\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 msgstr "%s: %s тобы бар болып тұр\n"
 
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u бар болып тұр\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "Мүше бар болып тұр\n"
 
-#, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: топты құру мүмкін емес\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "Қолданылуы: groupdel топ\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: топ жазбасын өшіру қатесі\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: %s бумасының атын %s атына ауыстыру мүмкін емес\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: көлеңкелі топ жазбасын өшіру қатесі\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr ""
+"%s: '%s' пайдаланушының басыңқы тобын %u тобынан %u тобына өзгертуге мүмкін "
+"емес.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: пайдаланушының басыңқы тобын өшіру мүмкін емес.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: %s тобы жоқ болып тұр\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: %s тобы NIS тобы болып тұр\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: '%s' тобы NIS тобы болып тұр.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s қазір NIS сервері болып тұр\n"
 
-msgid "Member already exists\n"
-msgstr "Мүше бар болып тұр\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: %s қазір NIS пайдаланушысы болып тұр\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Өшірілетін қатысушылар табылмады\n"
+#, fuzzy, c-format
+#| msgid "%s: Out of memory. Cannot update the group database.\n"
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: Жады жеткіліксіз. Топтар дерекқорын жаңарту мүмкін емес.\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
-msgstr "Қолданылуы: groupmems -a пайдаланушы_аты | -d пайдаланушы_аты | -D | -l [-g пайдаланушы_аты]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
 
-msgid "Only root can add members to different groups\n"
-msgstr "Әр түрлі топтарға қатысушыларды тек root қоса алады\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "Топтық рұқсат керек\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Ағымдағы топтың басыңқы иесі жоқ\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "Келесі үшін PAM шындылықты тексеру орындалмады:\n"
-
-msgid "Unable to lock group file\n"
-msgstr "group файлын оқшаулау мүмкін емес\n"
-
-msgid "Unable to open group file\n"
-msgstr "group файлын ашу мүмкін емес\n"
-
-msgid "Cannot close group file\n"
-msgstr "group файлын жабу мүмкін емес\n"
-
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -878,7 +871,8 @@
 "  -g, --gid GID                 force use new GID by GROUP\n"
 "  -h, --help                    display this help message and exit\n"
 "  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique              allow using duplicate (non-unique) GID by GROUP\n"
+"  -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 ""
@@ -887,44 +881,28 @@
 "Опциялары:\n"
 "  -g, --gid GID                 ТОП үшін жаңа GID қолдануды мәжбүрлету\n"
 "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
-"  -n, --new-name NEW_GROUP      ТОП үшін жаңа ТОП_АТЫ атын қолдануды мәжбүрлету\n"
-"  -o, --non-unique              ТОП үшін қайталанатын (ерекше емес) GID қолдануға рұқсат беру\n"
-"  -p, --password PASSWORD       жаңа пароль ретінде шифрленген парольді қолдану\n"
+"  -n, --new-name NEW_GROUP      ТОП үшін жаңа ТОП_АТЫ атын қолдануды "
+"мәжбүрлету\n"
+"  -o, --non-unique              ТОП үшін қайталанатын (ерекше емес) GID "
+"қолдануға рұқсат беру\n"
+"  -p, --password PASSWORD       жаңа пароль ретінде шифрленген парольді "
+"қолдану\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s жазбасы /etc/group ішінен табылмады\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "%s: қате топ аты `%s'\n"
 
 #, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u қайталанбайтын GID емес (бар болып тұр)\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: %s тобы NIS тобы болып тұр\n"
 
 #, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s аты бар болып тұр\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: белгісіз пайдаланушы %s\n"
 
 #, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: passwd файлын үстінен жазу мүмкін емес\n"
-
-#, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: passwd файлын оқшаулау мүмкін емес\n"
-
-#, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: passwd файлын ашу мүмкін емес\n"
-
-#, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u, since it is not in the passwd file.\n"
-msgstr "%s:  '%s' пайдаланушының басыңқы тобын %u тобынан %u тобына ауыстыру мүмкін емес, өйткені ол passwd файлында жоқ.\n"
-
-#, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: '%s' пайдаланушының басыңқы тобын %u тобынан %u тобына өзгертуге мүмкін емес.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Қолданылуы: %s [-r] [-s] [group [gshadow]]\n"
 
@@ -936,18 +914,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s пен -r өзара үйлеспейді\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: %s файлын оқшаулау мүмкін емес\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-msgstr "%s: %s файлын ашу мүмкін емес\n"
-
-#, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: %s файлын жаңарту мүмкін емес\n"
-
 msgid "invalid group file entry"
 msgstr "group файл ішінде қате жазба"
 
@@ -962,6 +928,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "қате топ аты '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "қате топ аты '%s'\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "%s тобы: %s пайдаланушы жоқ\n"
@@ -974,18 +945,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "%s ішінде сәйкес көлеңкелі топ жазбасы жоқ\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "'%s' тобын %s ішіне қосу керек пе ?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: %s үшін көлеңкелі жазбаны жаңарту мүмкін емес\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: %s тобы үшін жазбаны жаңарту мүмкін емес\n"
-
 msgid "invalid shadow group file entry"
 msgstr "көлеңкелі топтар файлының қате жазбасы"
 
@@ -1012,30 +976,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: өзгерістер жоқ\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: shadow group файлын оқшаулау мүмкін емес\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Қолданылуы: groupdel топ\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: shadow group файлын ашу мүмкін емес\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Қолданылуы: groupdel топ\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: %s shadow group өшіру мүмкін емес\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: %s файлын жаңарту мүмкін емес\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: shadow group файлын жаңарту мүмкін емес\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: group файлын жаңарту мүмкін емес\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: shadow group файлын өшіру мүмкін емес\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Қолданылуы: id [-a]\n"
 
@@ -1051,19 +1006,27 @@
 "Options:\n"
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 "  -h, --help                    display this help message and exit\n"
-"  -t, --time DAYS               print only lastlog records more recent than DAYS\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "Қолданылуы: lastlog [опциялар]\n"
 "\n"
 "Опциялары:\n"
-"  -b, --before КҮН             мерзімі КҮНнен үлкен ғана lastlog жазбаларын көрсету\n"
+"  -b, --before КҮН             мерзімі КҮНнен үлкен ғана lastlog жазбаларын "
+"көрсету\n"
 "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
-"  -t, --time КҮН               мерзімі КҮНнен кіші ғана lastlog жазбаларын көрсету\n"
-"  -u, --user ТІРКЕЛГІ          көрсетілген ТІРКЕЛГІ үшін lastlog жазбаларын көрсету\n"
+"  -t, --time КҮН               мерзімі КҮНнен кіші ғана lastlog жазбаларын "
+"көрсету\n"
+"  -u, --user ТІРКЕЛГІ          көрсетілген ТІРКЕЛГІ үшін lastlog жазбаларын "
+"көрсету\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Пайдаланушы    Порт    Қайдан      Соңғы"
 
@@ -1074,14 +1037,14 @@
 msgstr "**Жүйеге ешқашан кірмеді**"
 
 #, c-format
-msgid "Unknown user or range: %s\n"
-msgstr "Белгісіз пайдаланушы не диапазон: %s\n"
-
-#, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: күтпеген аргумент: %s\n"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Қолданылуы: %s [-p] [аты]\n"
 
@@ -1108,7 +1071,8 @@
 "[Disconnect bypassed -- root login allowed.]"
 msgstr ""
 "\n"
-"[Жүйеден мәжбүрлі шығу орындалмады -- root үшін жүйеге кіруге рұқсат етілген.]"
+"[Жүйеден мәжбүрлі шығу орындалмады -- root үшін жүйеге кіруге рұқсат "
+"етілген.]"
 
 #, c-format
 msgid ""
@@ -1178,6 +1142,11 @@
 "жүйеге кіру уақыты өтті\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Қолданылуы: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Қолданылуы: newgrp [-] [топ]\n"
 
@@ -1191,14 +1160,11 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: үрдісті бастау қатесі: %s\n"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "белгісіз UID: %u\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: пайдаланушы `%s' жоқ болып тұр\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "белгісіз GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "топ саны шектен тыс\n"
 
@@ -1216,65 +1182,28 @@
 "  -r, --system                  жүйелік тіркелгілерді жасау\n"
 "%s\n"
 
-#, c-format
-msgid "%s: group ID `%s' is not valid\n"
-msgstr "%s: топ ID `%s' дұрыс емес\n"
-
-#, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "%s: қате топ аты `%s'\n"
-
-#, c-format
-msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: топ %s shadow тобы болып тұр, бірақ /etc/group ішінен табылмады\n"
 
-#, c-format
-msgid "%s: group %s created, failure during the creation of the corresponding gshadow group\n"
-msgstr "%s: топ %s құрылды, сәйкес келетін көлеңкелі топты жасау қатемен аяқталды\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: '%s' пайдаланушы аты қате\n"
 
 #, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: пайдаланушы ID `%s' дұрыс емес\n"
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: '%s' пайдаланушы аты қате\n"
 
 #, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: пайдаланушы `%s' жоқ болып тұр\n"
-
-#, c-format
-msgid "%s: invalid user name `%s'\n"
-msgstr "%s: пайдаланушы аты `%s' қате\n"
-
-#, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: /etc/passwd оқшаулау мүмкін емес.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: /etc/shadow оқшаулау мүмкін емес.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: /etc/group оқшаулау мүмкін емес.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: /etc/gshadow оқшаулау мүмкін емес.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
 #, c-format
 msgid "%s: cannot update the entry of user %s (not in the passwd database)\n"
-msgstr "%s: %s пайдаланушы жазбасын жаңарту мүмкін емес (passwd дерекқорында жоқ)\n"
+msgstr ""
+"%s: %s пайдаланушы жазбасын жаңарту мүмкін емес (passwd дерекқорында жоқ)\n"
 
 #, c-format
 msgid "%s: line %d: can't create user\n"
@@ -1284,9 +1213,10 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: жол %d: топты жасау мүмкін емес\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: жол %d: %s пайдаланушы табылмады\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: пайдаланушы `%s' жоқ болып тұр\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1304,48 +1234,84 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: жол %d: жазбаны жаңарту мүмкін емес\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     report password status on all accounts\n"
 "  -d, --delete                  delete the password for the named account\n"
-"  -e, --expire                  force expire the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
 "  -h, --help                    display this help message and exit\n"
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "Қолданылуы: passwd [опциялар] [ТІРКЕЛГІ]\n"
 "\n"
 "Опциялары:\n"
-"  -a, --all                     барлық тіркелгілер үшін парольдер күйін шығару\n"
+"  -a, --all                     барлық тіркелгілер үшін парольдер күйін "
+"шығару\n"
 "  -d, --delete                  көрсетілген тіркелгі үшін парольді өшіру\n"
-"  -e, --expire                  көрсетілген тіркелгі үшін пароль мерзімінің аяқталуын мәжбүрлету\n"
+"  -e, --expire                  көрсетілген тіркелгі үшін пароль мерзімінің "
+"аяқталуын мәжбүрлету\n"
 "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
 "  -k, --keep-tokens             парольді тек мерзімі аяқталса ғана өзгерту\n"
-"  -i, --inactive INACTIVE       мерзімі аяқталғаннан кейін тіркелгіні сөндіру үшін\n"
+"  -i, --inactive INACTIVE       мерзімі аяқталғаннан кейін тіркелгіні "
+"сөндіру үшін\n"
 "                                керек күн санын INACTIVE мәніне орнату\n"
 "  -l, --lock                    көрсетілген тіркелгіні оқшаулау\n"
-"  -n, --mindays MIN_DAYS        парольді өзгерту арасында ең аз рұқсат етілген күн санын\n"
+"  -n, --mindays MIN_DAYS        парольді өзгерту арасында ең аз рұқсат "
+"етілген күн санын\n"
 "                                MIN_DAYS мәніне орнату\n"
 "  -q, --quiet                   тыныш түрі\n"
 "  -r, --repository REPOSITORY   REPOSITORY репозиторийінде парольді өзгерту\n"
-"  -S, --status                  көрсетілген тіркелгі үшін пароль күйін шығару\n"
+"  -S, --status                  көрсетілген тіркелгі үшін пароль күйін "
+"шығару\n"
 "  -u, --unlock                  көрсетілген тіркелгіні оқшаулаудан босату\n"
-"  -w, --warndays WARN_DAYS      мерзімі аяқталуы туралы WARN_DAYS қалғанда ескерте бастау\n"
-"  -x, --maxdays MAX_DAYS        парольді өзгерту арасында ең көп рұқсат етілген күн санын\n"
+"  -w, --warndays WARN_DAYS      мерзімі аяқталуы туралы WARN_DAYS қалғанда "
+"ескерте бастау\n"
+"  -x, --maxdays MAX_DAYS        парольді өзгерту арасында ең көп рұқсат "
+"етілген күн санын\n"
 "                                MAX_DAYS мәніне орнату\n"
 "\n"
 
@@ -1392,14 +1358,14 @@
 msgid "The password for %s cannot be changed yet.\n"
 msgstr "%s үшін парольді қазір өзгертуге болмайды.\n"
 
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: жады жеткіліксіз\n"
-
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 "%s: пайдаланушыны оқшаулаудан босату парольсіз тіркелгіге әкелуі мүмкін.\n"
 "Осыны жасау үшін сіз оған парольді usermod -p қолданып орнатуыңыз керек.\n"
@@ -1444,16 +1410,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "қате пайдаланушы аты '%s'\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "қате пайдаланушы аты '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "пайдаланушы %s: %u тобы жоқ\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "пайдаланушы %s: %s бумасы жоқ\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "пайдаланушы %s: %s бағдарламасы жоқ\n"
 
 #, c-format
@@ -1464,10 +1438,6 @@
 msgid "add user '%s' in %s? "
 msgstr "'%s' пайдаланушыны %s ішіне қосу керек пе? "
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: %s үшін пароль жазбасын жаңарту мүмкін емес\n"
-
 msgid "invalid shadow password file entry"
 msgstr "көлеңкелі парольдер файлының қате жазбасы"
 
@@ -1478,34 +1448,26 @@
 msgid "user %s: last password change in the future\n"
 msgstr "пайдаланушы %s: соңғы парольді өзгерту уақыты болашақта\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: passwd файлын оқшаулау мүмкін емес\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: %s файлын ашу мүмкін емес\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: passwd файлын ашу мүмкін емес\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Қолданылуы: id\n"
 
-#, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: %s үшін көлеңкелі жазбаны өшіру мүмкін емес\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not authorized to change the password of %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr "%s: %s пайдаланушының %s үшін паролді өзгертуге құқығы жоқ\n"
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: shadow файлын жаңарту мүмкін емес\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Қолданылуы: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: passwd файлын жаңарту мүмкін емес\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: %s пайдаланушы үшін жазбаны жаңарту мүмкін емес\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: көлеңкелі парольдер файлын өшіру мүмкін емес\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Осы тіркелгі үшін su орындауға РҰҚСАТ ЖОҚ.\n"
 
@@ -1535,12 +1497,15 @@
 "Қолданылуы: su [опциялар] [ТІРКЕЛГІ]\n"
 "\n"
 "Опциялары:\n"
-"  -c, --command COMMAND         шақырылатын қоршамға COMMAND командасын беру\n"
+"  -c, --command COMMAND         шақырылатын қоршамға COMMAND командасын "
+"беру\n"
 "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
 "  -, -l, --login                қоршамды тіркелгі қоршамына ауыстыру\n"
 "  -m, -p,\n"
-"  --preserve-environment        орта айнымалыларының мәндерін мен қоршамды сақтау\n"
-"  -s, --shell SHELL             passwd-да көрсетілгеннің орнына SHELL қоршамын қолдану\n"
+"  --preserve-environment        орта айнымалыларының мәндерін мен қоршамды "
+"сақтау\n"
+"  -s, --shell SHELL             passwd-да көрсетілгеннің орнына SHELL "
+"қоршамын қолдану\n"
 "\n"
 
 #, c-format
@@ -1570,6 +1535,16 @@
 "%s: %s\n"
 "(Елемеу)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: PAM көмегімен шындылықты тексеру қатемен аяқталды\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Сізде su %s жасау үшін құқығыңыз жоқ\n"
+
 msgid "No shell\n"
 msgstr "Қоршам жоқ\n"
 
@@ -1595,14 +1570,6 @@
 msgstr "Жүйені жөндеу режиміне өту"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: белгісіз GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: белгісіз топ %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: жаңа defaults файлын жасау мүмкін емес\n"
 
@@ -1622,13 +1589,54 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: шектен көп топ саны көрсетілген (максимум %d).\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: useradd [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
+#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#| "                                home directory\n"
+#| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#| "account\n"
+#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#| "  -D, --defaults                print or save modified default useradd\n"
+#| "                                configuration\n"
+#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#| "EXPIRE_DATE\n"
+#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#| "                                user account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#| "  -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"
+#| "  -N, --no-user-group           do not create a group with the same name "
+#| "as\n"
+#| "                                the user\n"
+#| "  -o, --non-unique              allow create user with duplicate\n"
+#| "                                (non-unique) UID\n"
+#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#| "                                account\n"
+#| "  -r, --system                  create a system account\n"
+#| "  -s, --shell SHELL             the login shell for the new user account\n"
+#| "  -u, --uid UID                 force use the UID for the new user "
+#| "account\n"
+#| "  -U, --user-group              create a group with the same name as the "
+#| "user\n"
+#| "\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
 "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
 "                                home directory\n"
-"  -c, --comment COMMENT         set the GECOS field for the new user account\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
 "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
 "  -D, --defaults                print or save modified default useradd\n"
 "                                configuration\n"
@@ -1641,10 +1649,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1654,7 +1664,8 @@
 "  -r, --system                  create a system account\n"
 "  -s, --shell SHELL             the login shell for the new user account\n"
 "  -u, --uid UID                 force use the UID for the new user account\n"
-"  -U, --user-group              create a group with the same name as the user\n"
+"  -U, --user-group              create a group with the same name as the "
+"user\n"
 "\n"
 msgstr ""
 "Қолданылуы: useradd [опциялар] ТІРКЕЛГІ\n"
@@ -1662,26 +1673,33 @@
 "Опциялары:\n"
 "  -b, --base-dir BASE_DIR       жаңа пайдаланушы тіркелгісінің үй бумасы\n"
 "                                үшін базалық бума\n"
-"  -c, --comment COMMENT         жаңа пайдаланушы тіркелгісі үшін GECOS мәнін орнату\n"
+"  -c, --comment COMMENT         жаңа пайдаланушы тіркелгісі үшін GECOS мәнін "
+"орнату\n"
 "  -d, --home-dir HOME_DIR       жаңа пайдаланушы тіркелгісі үшін үй бумасы\n"
 "  -D, --defaults                өзгертілген бастапқы useradd баптауларын\n"
 "                                шығару немесе сақтау\n"
-"  -e, --expiredate EXPIRE_DATE  тіркелгі мерзімі аяқталуын EXPIRE_DATE күніне орнату\n"
-"  -f, --inactive INACTIVE       мерзімі аяқталған соң тіркелгі сөндірілу үшін өту керек\n"
+"  -e, --expiredate EXPIRE_DATE  тіркелгі мерзімі аяқталуын EXPIRE_DATE "
+"күніне орнату\n"
+"  -f, --inactive INACTIVE       мерзімі аяқталған соң тіркелгі сөндірілу "
+"үшін өту керек\n"
 "                                күн санын INACTIVE мәніне орнату\n"
-"  -g, --gid GROUP               жаңа пайдаланушы тіркелгісі үшін GROUP қолдануды мәжбүрлету\n"
+"  -g, --gid GROUP               жаңа пайдаланушы тіркелгісі үшін GROUP "
+"қолдануды мәжбүрлету\n"
 "  -G, --groups GROUPS           жаңа пайдаланушы тіркелгісі үшін қосымша\n"
 "                                топтар тізімін шығару\n"
 "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
 "  -k, --skel SKEL_DIR           басақ skel бумасын қолдану\n"
-"  -K, --key KEY=VALUE           /etc/login.defs ішіндегі мәндерін үстінен жазу\n"
-"  -l,                           пайдаланушыны lastlog пен faillog дерекқорларына\n"
+"  -K, --key KEY=VALUE           /etc/login.defs ішіндегі мәндерін үстінен "
+"жазу\n"
+"  -l,                           пайдаланушыны lastlog пен faillog "
+"дерекқорларына\n"
 "                                 қоспау\n"
 "  -m, --create-home             жаңа пайдаланушы үшін үй бумасын құру\n"
 "  -N, --no-user-group           пайдаланушымен аттас жаңа топты құрмау\n"
 "  -o, --non-unique              қайталанатын (ерекше емес) UID-тары бар\n"
 "                                тіркелгілерді жасауға рұқсат ету\n"
-"  -p, --password PASSWORD       жаңа тіркелгі үшін шифрленген парольді қолдану\n"
+"  -p, --password PASSWORD       жаңа тіркелгі үшін шифрленген парольді "
+"қолдану\n"
 "  -r, --system                  жүйелік тіркелгіні жасау\n"
 "  -s, --shell SHELL             жаңа тіркелгі үшін қоршам\n"
 "  -u, --uid UID                 жаңа тіркелгі үшін UID қолдануды мәжбүрлету\n"
@@ -1689,14 +1707,6 @@
 "\n"
 
 #, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: Жады жеткіліксіз. Топтар дерекқорын жаңарту мүмкін емес.\n"
-
-#, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: Жады жеткіліксіз. Көлеңкелі топтар дерекқорын жаңарту мүмкін емес.\n"
-
-#, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: '%s' негізгі бумасы қате\n"
 
@@ -1733,79 +1743,54 @@
 msgstr "%s: %s пен %s опциялары өзара ерегіседі\n"
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: '%s' пайдаланушы аты қате\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: парольдер файлын үстінен жазу мүмкін емес\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: көлеңкелі парольдер файлын үстінен жазу мүмкін емес\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: көлеңкелі парольдер файлын оқшаулау мүмкін емес\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: көлеңкелі парольдер файлын ашу мүмкін емес\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: топтар файлын оқшаулау қатесі\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: топтар файлын ашу қатесі\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: көлеңкелі топтар файлын оқшаулау қатесі\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: көлеңкелі топтар файлын ашу қатесі\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: жаңа пароль жазбасын қосу қатесі\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: жаңа көлеңкелі пароль жазбасын қосу қатесі\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: %s бумасын жасау мүкін емес\n"
 
 msgid "Creating mailbox file"
 msgstr "Пошта файлын құру"
 
-msgid "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
-msgstr "'mail' тобы табылмады. Пайдаланушының пошта файлы 0600 түрінде құрылады.\n"
+msgid ""
+"Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
+msgstr ""
+"'mail' тобы табылмады. Пайдаланушының пошта файлы 0600 түрінде құрылады.\n"
 
 msgid "Setting mailbox file permissions"
 msgstr "Пошта файлға рұқсаттарды орнату"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: %s пайдаланушысы бар болып тұр\n"
 
 #, c-format
-msgid "%s: group %s exists - if you want to add this user to that group, use -g.\n"
-msgstr "%s: %s тобы бар болып тұр - егер оған жаңа пайдаланушыны қосқыңыз келсе, -g қолданыңыз.\n"
+msgid ""
+"%s: group %s exists - if you want to add this user to that group, use -g.\n"
+msgstr ""
+"%s: %s тобы бар болып тұр - егер оған жаңа пайдаланушыны қосқыңыз келсе, -g "
+"қолданыңыз.\n"
 
 #, c-format
 msgid "%s: can't create user\n"
 msgstr "%s: пайдаланушыны жасау мүмкін емес\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u бар болып тұр\n"
 
 #, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: топты құру мүмкін емес\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1813,10 +1798,6 @@
 "%s: ескерту: үй бумасы бар болып тұр.\n"
 "Оның ішіне skel бумасынан бірде-бір файл көшірілмеді.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr "%s: ескерту: CREATE_HOME үшін қолдау жоқ, оның орнына -m қолданыңыз.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1836,51 +1817,28 @@
 "  -r, --remove                  үй бумасын мен поштасын өшіру\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: топ жазбасын жаңарту қатемен аяқталды\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
+msgstr ""
+"%s: %s тобын өшіру мүмкін емес, ол басқа пайдалануы үшін басыңқы топ болып "
+"табылады.\n"
 
 #, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
-msgstr "%s: %s тобын өшіру мүмкін емес, ол басқа пайдалануы үшін басыңқы топ болып табылады.\n"
-
-#, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: көлеңкелі топ жазбасын жаңарту қатемен аяқталды\n"
-
-#, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: group файлын ашу мүмкін емес\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: көлеңкелі group файлын ашу мүмкін емес\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: пароль жазбасын өшіру мүмкін емес\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: көлеңкелі пароль жазбасын өшіру мүмкін емес\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: %s пайдаланушысы қазір жүйеге кіріп тұр\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: ексерту: өшіру мүмкін емес"
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s қазір %s иелігінде емес, өшірілмейді\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: ексерту: өшіру мүмкін емес"
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: %s пайдаланушысы жоқ\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: %s қазір NIS пайдаланушысы болып тұр\n"
 
@@ -1923,30 +1881,48 @@
 "Опциялары:\n"
 "  -c, --comment COMMENT         GECOS жазбасы үшін жаңа мәні\n"
 "  -d, --home HOME_DIR           пайдаланушы тіркелгісі үшін жаңа үй бумасы\n"
-"  -e, --expiredate EXPIRE_DATE  тіркелгінің аяқталу мерзімін EXPIRE_DATE күніне орнату\n"
-"  -f, --inactive INACTIVE       мерзімі аяқталғаннан кейін пароль сөндірілетін күн\n"
+"  -e, --expiredate EXPIRE_DATE  тіркелгінің аяқталу мерзімін EXPIRE_DATE "
+"күніне орнату\n"
+"  -f, --inactive INACTIVE       мерзімі аяқталғаннан кейін пароль "
+"сөндірілетін күн\n"
 "                                санын INACTIVE мәніне орнату\n"
-"  -g, --gid ТОП                 жаңа басыңқы топ ретінде ТОПты қолдануды мәжбүрлету\n"
+"  -g, --gid ТОП                 жаңа басыңқы топ ретінде ТОПты қолдануды "
+"мәжбүрлету\n"
 "  -G, --groups ТОПТАР           пайдаланушыны қосымша ТОПТАРға қосу\n"
 "  -a, --append                  пайдаланушыны қосымша ТОПТАР ішіне қосу\n"
-"                                -G опциясы сияқты, пайдаланушыны басқа топтардан\n"
+"                                -G опциясы сияқты, пайдаланушыны басқа "
+"топтардан\n"
 "                                өшірмейді\n"
 "  -h, --help                    осы көмек ақпаратын көрсету және шығу\n"
 "  -l, --login NEW_LOGIN         тіркелгі үшін жаңа аты\n"
 "  -L, --lock                    пайдаланушы тіркелгісін оқшаулау\n"
 "  -m, --move-home               үй бумасының құрамасын жаңа жерге ауыстыру\n"
 "                                (тек -d опциясымен бірге қолданыңыз)\n"
-"  -o, --non-unique              қайталанатын (ерекше емес) UID-тарды қолдануды рұқсат ету\n"
-"  -p, --password PASSWORD       жаңа пароль ретінде шифрленген парольді қолдану\n"
+"  -o, --non-unique              қайталанатын (ерекше емес) UID-тарды "
+"қолдануды рұқсат ету\n"
+"  -p, --password PASSWORD       жаңа пароль ретінде шифрленген парольді "
+"қолдану\n"
 "  -s, --shell SHELL             пайдаланушы тіркелгісі үшін жаңа қоршам\n"
 "  -u, --uid UID                 пайдаланушы тіркелгісі үшін жаңа UID\n"
 "  -U, --unlock                  пайдаланушы тіркелгісін оқшаулаудан босату\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: жаңа көлеңкелі топ жазбасын қосу қатемен аяқталды\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+"%s: пайдаланушыны оқшаулаудан босату парольсіз тіркелгіге әкелуі мүмкін.\n"
+"Осыны жасау үшін сіз оған парольді usermod -p қолданып орнатуыңыз керек.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: %s пайдаланушысы бар болып тұр\n"
+
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: жалаушалар көрсетілмеген\n"
@@ -1959,23 +1935,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr "%s: -L, -p және -U жалаушаларын бірге қолдануға болмайды\n"
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: uid %lu қазір қолданылуда\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "Мүше бар болып тұр\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: пароль жазбасын өзгерту қатемен аяқталды\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: пароль жазбасын өшіру қатемен аяқталды\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: көлеңкелі пароль жазбасын өшіру қатемен аяқталды\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: %s бумасы бар болып тұр\n"
 
@@ -1996,6 +1961,14 @@
 msgstr "%s: %s бумасының атын %s атына ауыстыру мүмкін емес\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: ескерту: %s қазір %s иелігінде емес\n"
 
@@ -2005,11 +1978,15 @@
 msgid "failed to rename mailbox"
 msgstr "mailbox атын ауыстыру қатемен аяқталды"
 
-#, c-format
+#, fuzzy, 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"
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 "Сіз %s түзеттіңіз.\n"
 "Сізге %s құрамасын түзетуге керек болуы мүмкін.\n"
@@ -2036,10 +2013,16 @@
 "  -s, --shadow                  shadow не gshadow дерекқорын түзету\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: привилегиялар деңгейін төмендету мүмкін емес (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s өзгертілмеді\n"
@@ -2054,3 +2037,414 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: %s қайтару мүмкін емес: %s (сіздің өзгертулеріңіз %s ішінде)\n"
 
+#~ msgid "%s: can't lock password file\n"
+#~ msgstr "%s: парольдер файлын оқшаулау мүмкін емес\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: парольдер файлын ашу мүмкін емес\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: көлеңкелі парольдер файлын оқшаулау мүмкін емес\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: көлеңкелі парольдер файлын ашу мүмкін емес\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: көлеңкелі парольдер файлын үстінен жазу мүмкін емес\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: парольдер файлын үстінен жазу мүмкін емес\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: парольдер файлын жаңарту мүмкін емес\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: көлеңкелі парольдер файлын жаңарту мүмкін емес\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tТолық аты: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tБөлме нөмірі: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tЖұмыс телефон нөмірі: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tҮй телефон нөмірі: %s\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Парольдер файлын ашу мүмкін емес.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: group файлын оқшаулау мүмкін емес\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: group файлын ашу мүмкін емес\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: gshadow файлын оқшаулау мүмкін емес\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: shadow файлын ашу мүмкін емес\n"
+
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: gshadow файлын жаңарту қатесі\n"
+
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: group файлын жаңарту қатесі\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: жол %d: белгісіз топ %s\n"
+
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: жол %d: топ жазбасын жаңарту мүмкін емес\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: shadow файлын оқшаулау мүмкін емес\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: shadow файлын жаңарту қатесі\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: парольдер файлын жаңарту қатесі\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: жол %d: белгісіз пайдаланушы %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: жол %d: пароль жолын жаңарту мүмкін емес\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: белгісіз пайдаланушы\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Белгісіз пайдаланушы: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Қолданылуы: %s [-r|-R] топ\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a пайдаланушы] топ\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d пайдаланушы] топ\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A пайдаланушы,...] [-M пайдаланушы,...] топ\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M пайдаланушы,...] топ\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: оқшаулау мүмкін емес\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: shadow файлын оқшаулау мүмкін емес\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: файлды ашу мүмкін емес\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: файлды үстінен жазу мүмкін емес\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: shadow файлын үстінен жазу мүмкін емес\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: файлды оқшаулаудан босату мүмкін емес\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: жазбаны жаңарту мүмкін емес\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: shadow ішіндегі жазбасын жаңарту мүмкін емес\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "белгісіз топ: %s\n"
+
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: файлды жабу мүмкн емес\n"
+
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: shadow файлын жабу мүмкін емес\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Сіз кімсіз?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: белгісіз қатысушы %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: жаңа топты құру қатесі\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: group файлын үстінен жазу мүмкін емес\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: shadow group файлын үстінен жазу мүмкін емес\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: group файлын оқшаулау мүмкін емес\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: group файлын ашу мүмкін емес\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: shadow group файлын оқшаулау мүмкін емес\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: shadow group файлын ашу мүмкін емес\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u бар болып тұр\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: топ жазбасын өшіру қатесі\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: көлеңкелі топ жазбасын өшіру қатесі\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: пайдаланушының басыңқы тобын өшіру мүмкін емес.\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Өшірілетін қатысушылар табылмады\n"
+
+#~ msgid ""
+#~ "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+#~ msgstr ""
+#~ "Қолданылуы: groupmems -a пайдаланушы_аты | -d пайдаланушы_аты | -D | -l [-"
+#~ "g пайдаланушы_аты]\n"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "Әр түрлі топтарға қатысушыларды тек root қоса алады\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "Топтық рұқсат керек\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Ағымдағы топтың басыңқы иесі жоқ\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "Келесі үшін PAM шындылықты тексеру орындалмады:\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "group файлын оқшаулау мүмкін емес\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "group файлын ашу мүмкін емес\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "group файлын жабу мүмкін емес\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s жазбасы /etc/group ішінен табылмады\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u қайталанбайтын GID емес (бар болып тұр)\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s аты бар болып тұр\n"
+
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: passwd файлын үстінен жазу мүмкін емес\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: passwd файлын оқшаулау мүмкін емес\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: passwd файлын ашу мүмкін емес\n"
+
+#~ msgid ""
+#~ "%s: cannot change the primary group of user '%s' from %u to %u, since it "
+#~ "is not in the passwd file.\n"
+#~ msgstr ""
+#~ "%s:  '%s' пайдаланушының басыңқы тобын %u тобынан %u тобына ауыстыру "
+#~ "мүмкін емес, өйткені ол passwd файлында жоқ.\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: %s файлын оқшаулау мүмкін емес\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: %s үшін көлеңкелі жазбаны жаңарту мүмкін емес\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: %s тобы үшін жазбаны жаңарту мүмкін емес\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: shadow group файлын оқшаулау мүмкін емес\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: shadow group файлын ашу мүмкін емес\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: %s shadow group өшіру мүмкін емес\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: shadow group файлын жаңарту мүмкін емес\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: group файлын жаңарту мүмкін емес\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: shadow group файлын өшіру мүмкін емес\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "белгісіз UID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "белгісіз GID: %lu\n"
+
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: топ ID `%s' дұрыс емес\n"
+
+#~ msgid ""
+#~ "%s: group %s created, failure during the creation of the corresponding "
+#~ "gshadow group\n"
+#~ msgstr ""
+#~ "%s: топ %s құрылды, сәйкес келетін көлеңкелі топты жасау қатемен "
+#~ "аяқталды\n"
+
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: пайдаланушы ID `%s' дұрыс емес\n"
+
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: пайдаланушы аты `%s' қате\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: /etc/passwd оқшаулау мүмкін емес.\n"
+
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: /etc/shadow оқшаулау мүмкін емес.\n"
+
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: /etc/group оқшаулау мүмкін емес.\n"
+
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: /etc/gshadow оқшаулау мүмкін емес.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: файлдарды ашу мүмкін емес\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: файлдарды жаңарту мүмкін емес\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: жол %d: %s пайдаланушы табылмады\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: %s үшін пароль жазбасын жаңарту мүмкін емес\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: passwd файлын оқшаулау мүмкін емес\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: passwd файлын ашу мүмкін емес\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: %s үшін көлеңкелі жазбаны өшіру мүмкін емес\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: shadow файлын жаңарту мүмкін емес\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: passwd файлын жаңарту мүмкін емес\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: %s пайдаланушы үшін жазбаны жаңарту мүмкін емес\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: көлеңкелі парольдер файлын өшіру мүмкін емес\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: белгісіз GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: белгісіз топ %s\n"
+
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr ""
+#~ "%s: Жады жеткіліксіз. Көлеңкелі топтар дерекқорын жаңарту мүмкін емес.\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: парольдер файлын үстінен жазу мүмкін емес\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: көлеңкелі парольдер файлын үстінен жазу мүмкін емес\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: көлеңкелі парольдер файлын оқшаулау мүмкін емес\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: көлеңкелі парольдер файлын ашу мүмкін емес\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: топтар файлын оқшаулау қатесі\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: топтар файлын ашу қатесі\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: көлеңкелі топтар файлын оқшаулау қатесі\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: көлеңкелі топтар файлын ашу қатесі\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: жаңа пароль жазбасын қосу қатесі\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: жаңа көлеңкелі пароль жазбасын қосу қатесі\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr ""
+#~ "%s: ескерту: CREATE_HOME үшін қолдау жоқ, оның орнына -m қолданыңыз.\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: топ жазбасын жаңарту қатемен аяқталды\n"
+
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: көлеңкелі топ жазбасын жаңарту қатемен аяқталды\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: group файлын ашу мүмкін емес\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: көлеңкелі group файлын ашу мүмкін емес\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: пароль жазбасын өшіру мүмкін емес\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: көлеңкелі пароль жазбасын өшіру мүмкін емес\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: %s пайдаланушысы жоқ\n"
+
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: жаңа көлеңкелі топ жазбасын қосу қатемен аяқталды\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: uid %lu қазір қолданылуда\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: пароль жазбасын өзгерту қатемен аяқталды\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: пароль жазбасын өшіру қатемен аяқталды\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: көлеңкелі пароль жазбасын өшіру қатемен аяқталды\n"

Modified: upstream/trunk/po/km.po
===================================================================
--- upstream/trunk/po/km.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/km.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -61,6 +61,9 @@
 msgid "  Choose a new password."
 msgstr "  ជ្រើស​ពាក្យ​សម្ងាត់​មួយ ។\n"
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "ពាក្យ​សម្ងាត់​របស់​អ្នក​នឹង​ផុត​កំណត់ក្នុងពេល​ %ld ថ្ងៃ ។\n"
@@ -74,7 +77,12 @@
 msgstr "ពាក្យ​សម្ងាត់​របស់​អ្នក​នឹងផុត​កំណត់នៅ​ថ្ងៃ​នេះ ។\n"
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "មិន​អាច​ប្តូរ​ tty %s បានឡើយ"
 
 msgid "Environment overflow\n"
@@ -98,14 +106,14 @@
 "%d ចូល​ចុងក្រោយ​បានបរាជ័យ​ ។\n"
 "ចុងក្រោម​ %s  %s.\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\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: Can't get unique UID (no more available UIDs)\n"
 msgstr "%s ៖ មិនអាចយក​ UID ដែលមានតែមួយ​បានទេ\n"
 
-#, fuzzy
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s ៖ មិនអាច​យក​​ GID ​ដែលមានតែមួយ​បានឡើយ​\n"
-
 msgid "Too many logins.\n"
 msgstr "ចូល​ច្រើន​ពេក​ ។\n"
 
@@ -194,9 +202,18 @@
 msgstr "មិន​អាច​កំណត់​ឈ្មោះ​ tty របស់​អ្នកបានទេ​ ។"
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s ៖ អស់​សតិ​\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) បាន​បរាជ័យ​\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "ទេ\n"
+
 msgid "Password: "
 msgstr "ពាក្យ​សម្ងាត់​ ៖ "
 
@@ -204,6 +221,11 @@
 msgid "%s's Password: "
 msgstr "ពាក្យសម្ងាត់​របស់ %sសម្ងាត់ ៖ "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s ៖ វាល គឺ​វែងវែងពេក​\n"
+
 #, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
@@ -301,42 +323,33 @@
 msgstr "%s ៖ សិទ្ធ​ត្រូវ​បាន​បដិសេធ ។\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s ៖ មិន​អាចកំណត់​ឈ្មោះ​អ្នកប្រើ​របស់​អ្នក​បាន​ទេ ។\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s ៖ PAM ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវបាន​បរាជ័យ​\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s ៖ មិនអាច​ចាក់សោ​ឯកសារ​ពាក្យ​សម្ងាត់​បានទេ​\n"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s ៖ មិន​អាច​ចាក់សោ​ឯកសារ​បានឡើយ សូមព្យាយាម​ម្តង​ទៀតនៅពេលក្រោយ​\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s ៖ មិន​អាច​បើក​ឯកសារ​ពាក្យ​សម្ងាត់​\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s ៖ មិនអាច​បើក​ឯកសារ​ %s បានទេ\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s ៖ មិនអាច​ចាក់សោ​​ឯកសារ​ពាក្យ​សម្ងាត់ស្រមោល​បានទេ\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s ៖ ការចែកជាពីរវិធី​​បានបរាជ័យ​ ៖ %s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s ៖ មិន​អាច​បើក​ឯកសារពាក្យ​សម្ងាត់​ស្រមោលបានទេ\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s ៖ បរាជ័យ​ក្នុងការ​ទម្លាក់​សិទ្ធ (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s ៖ មិនអាច​សរសេរ​ឯកសារពាក្យសម្ងាត់ស្រមោល​ឡើងវិញ​បានទេ​\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s ៖ មិនអាច​សរសេរ​ឯកសារពាក្យសម្ងាត់​ឡើងវិញបានទេ​\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s ៖ មិនអាច​ធ្វើឲ្យ​ឯកសារ​ពាក្យ​សម្ងាត់​ទាន់សម័យ​បានទេ\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s ៖ មិនអាច​ធ្វើ​ឲ្យ​ឯកសារពាក្យសម្ងាត់​ស្រមោលទាន់សម័យបានទេ\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s ៖ គ្មាន​វត្តមាន​​ឯកសារ​ពាក្យ​សម្ងាត់ស្រមោលទេ​\n"
 
@@ -344,9 +357,9 @@
 msgid "%s: failed to drop privileges (%s)\n"
 msgstr "%s ៖ បរាជ័យ​ក្នុងការ​ទម្លាក់​សិទ្ធ (%s)\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s ៖ មិន​ស្គាល់​អ្នកប្រើ​ %s\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s ៖ មិនទាន់មានអ្នក​ប្រើ​ %s ទេ​\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -371,57 +384,27 @@
 msgid "Full Name"
 msgstr "ឈ្មោះ​ពេញ"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tឈ្មោះពេញ​ ៖ %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s ៖ %s\n"
 
 msgid "Room Number"
 msgstr "លេខបន្ទប់​"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tលេខ​បន្ទប់​ ៖ %s\n"
-
 msgid "Work Phone"
 msgstr "ទូរស័ព្ទ​​​កន្លែង​​​ធ្វើការ"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tទូរស័ព្ទ​​​កន្លែង​​​ធ្វើការ ៖ %s\n"
-
 msgid "Home Phone"
 msgstr "ទូរស័ព្ទនៅ​ផ្ទះ"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tទូរស័ព្ទនៅ​ផ្ទះ ៖ %s\n"
-
 msgid "Other"
 msgstr "ផ្សេងៗ"
 
 msgid "Cannot change ID to root.\n"
 msgstr "មិន​អាចផ្លាស់ប្តូរ​លេខ​សម្គាល់​ទៅ​ជា​ root បាន​ឡើយ​ ។\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 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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -454,9 +437,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s ៖ '%s' មាន​តួអក្សរ​មិន​ត្រឹមត្រូវ​\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s ៖ មិន​អាចកំណត់​ឈ្មោះ​អ្នកប្រើ​របស់​អ្នក​បាន​ទេ ។\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s ៖ មិនទាន់មានអ្នក​ប្រើ​ %s ទេ​\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -505,7 +488,7 @@
 msgstr "%s ៖ អាគុយម៉ង់​ជាលេខ​មិន​ត្រឹមត្រូវ​ '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: ទង់ -a គឺត្រូវបានអនុញ្ញាត​បានតែជាមួយទង់ -G ប៉ុណ្ណោះ\n"
 
 #, c-format
@@ -517,30 +500,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s ៖ មិន​អាច​ចាក់​សោ​​​ឯកសារជា​​ក្រុម​បាន​ទេ\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s ៖ មិន​អាច​បើក​ឯកសារ​ជា​ក្រុម​បាន​ទេ​\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s ៖មិន​អាច​ចាក់សោ​ឯកសារ​ gshadow បានទេ\n"
-
-#, c-format
-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"
 
@@ -548,38 +507,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s ៖ បន្ទាត់​ %d ៖ បាត់បង់​ពាក្យ​សម្ងាត់​ថ្មី​\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s ៖ បន្ទាត់​ %d ៖ មិន​ស្គាល់​ក្រុម​ %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s ៖ មិនមានក្រុម​ %sឡើយ​\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s ៖ មិនទាន់មានអ្នក​ប្រើ​ %s ទេ​\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s ៖ មានកំហុស​ក្នុងការ​ធ្វើឲ្យឯកសារស្រមោល​ទាន់សម័យ​\n"
-
-#, c-format
-msgid "%s: error updating password 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"
-
 #, fuzzy
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
@@ -600,8 +545,9 @@
 msgid "Login Shell"
 msgstr "សែលចូល"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "អ្នក​មិនអាច​​ប្តូរ​សែល​សម្រាប់​ %s បានទេ ។\n"
 
 #, c-format
@@ -612,17 +558,14 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s ៖ ធាតុបញ្ចូល​​មិន​ត្រឹមត្រូវ​ ៖ %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s គឺជា​សែល​មិន​ត្រឹមត្រូវ​ ។\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "របៀបប្រើ ៖ ការផុតកំណត់ {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s  ៖ មិន​ស្គាល់​អ្នក​ប្រើ​\n"
-
 #, fuzzy
 msgid ""
 "Usage: faillog [options]\n"
@@ -630,7 +573,7 @@
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -656,11 +599,16 @@
 "\t\t\t\tអ្នកប្រើ​ដែល​មាន​ឈ្មោះ​ចូល \"ឈ្មោះចូល\"\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "ចូល       ភាពបរាជ័យ​នៃការចូល​ចុងក្រោយ​ជាអតិបរមា                   លើ\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds នៅសល់]"
 
 #, c-format
@@ -668,76 +616,67 @@
 msgstr " [%lds ជាប់សោ]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "មិន​ស្គាល់​អ្នក​ប្រើ ៖ %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "របៀបប្រើ ៖ %s ក្រុម [-r|-R] \n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s ក្រុម [-a user]​\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s ក្រុម [-d user]​\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "មិន​ស្គាល់​អ្នក​ប្រើ ៖ %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s ក្រុម [-A user,...] [-M user,...]\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s ៖ មិនអាច​បើក​ឯកសារ​ %s បានទេ\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s ក្រុម [-M user,...]\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s ៖ បានទាមទារ​ពាក្យសម្ងាត់​ក្រុម​ស្រមោល​សម្រាប់​ -A\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s ៖ មិនអាច​ចាក់សោ​បានឡើយ\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s ៖ មិនអាច​ចាក់សោ​ស្រមោល​បានឡើយ​\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "មិនអាចប្ដូរ​ពាក្យ​សម្ងាត់​សម្រាប់​ %s បានឡើយ ។\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s ៖ មិន​អាច​បើក​​ឯកសារ​បានទេ\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s ៖ បានទាមទារ​ពាក្យសម្ងាត់​ក្រុម​ស្រមោល​សម្រាប់​ -A\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s ៖ មិន​អាច​បើក​​ឯកសារ​បានទេ\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s ៖ មិនមានក្រុម​ %sឡើយ​\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s ៖ មិន​អាច​បើក​ឯកសារ​ស្រមោល​បានទេ\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s ៖ ការចែកជាពីរវិធី​​បានបរាជ័យ​ ៖ %s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -756,9 +695,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s ៖ សូមព្យាយាមម្ដងទៀត​នៅពេលក្រោយ\n"
 
-msgid "Who are you?\n"
-msgstr "តើអ្នក​ជា​នណា​ ?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "កំពុង​បន្ថែម​អ្នកប្រើ​ %s ទៅក្រុម​ %s\n"
@@ -767,9 +703,9 @@
 msgid "Removing user %s from group %s\n"
 msgstr "កំពុង​យក​អ្នក​ប្រើ​ %s ចេញពី​ក្រុម​ %s\n"
 
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s ៖ មិន​ស្គាល់​សមាជិក​ %s\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s ៖ មិនទាន់មានអ្នក​ប្រើ​ %s ទេ​\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -803,116 +739,89 @@
 "\t\t\t\t GID (មិនមាន​តែមួយ​គត់) ស្ទួន\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s ៖ កំហុស​ក្នុងការ​បន្ថែម​ធាតុបញ្ចូល​​ក្រុម​ថ្មី​\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s  ៖ %s ជា​ឈ្មោះ​ក្រុម​មិន​ត្រឹមត្រូវ​\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s ៖​ មិនអាច​សរសេរ​ឯកសារក្រុមឡើងវិញ​បានទេ​\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "ឈ្មោះ​ក្រុម​ '%s' មិនត្រឹមត្រូវ\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s ៖ មិនអាច​សរសេរ​ឯកសារក្រុម​ស្រមោល​ឡើងវិញ​បានទេ​\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s ៖ មិនអាច​ចាក់សោ​ឯកសារក្រុម​បានទេ\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s ៖ មិនអាច​បើក​ឯកសារក្រុម​បានទេ​\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s ៖ មិនអាច​ចាក់សោ​ឯកសារក្រុមស្រមោល​បានទេ\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s ៖ មិនអាច​បើក​ឯកសារក្រុម​ស្រមោល​បានទេ​\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K ទាមទារ​ KEY=VALUE\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 msgstr "%s ៖ មានក្រុម​ %s រួច​ហើយ​\n"
 
 #, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s ៖ GID %u គឺមិនមែន​មាន​តែមួយទេ​\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s ៖ មិន​អាច​បង្កើត​ %s បានឡើយ\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "របៀបប្រើ​ ៖ ក្រុម​ groupdel \n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s ៖ កំហុស​ក្នុងការយក​ធាតុបញ្ចូល​ក្រុមចេញ\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s ៖ មិនអាចប្ដូរឈ្មោះ​ថត​ %s ទៅ​ជា​ %s បានឡើយ\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s ៖ កំហុស​ក្នុងការយក​ធាតុបញ្ចូល​ក្រុម​ស្រមោល​ចេញ\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s ៖ មិនអាចផ្លាស់​​ប្តូរ​អ្នក​ប្រើបានទេ​ '%s' លើ​ម៉ាស៊ីន​ភ្ញៀវ NIS បានទេ ។\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s ៖ មិនអាចយក​ក្រុម​ចម្បង​របស់អ្នកប្រើ​ចេញ​បានទេ ។\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s ៖ មិនមានក្រុម​ %sឡើយ​\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s ៖ ក្រុម​ %s គឺជា​ក្រុម NIS\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s ៖ ក្រុម​ '%s' គឺជាក្រុម​ NIS ។\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s ៖ %s គឺជា​មេ NIS\n"
 
-msgid "Member already exists\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s ៖ អ្នកប្រើ​ %s គឺជា​អ្នក​​ប្រើ​ NIS\n"
 
-msgid "Member to remove could not be found\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: អស់​សតិ​ក្នុង​ក្នុងការធ្វើឲ្យ​ក្រុមទាន់សម័យ\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
 
-msgid "Only root can add members to different groups\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
 msgstr ""
 
-msgid "Group access is required\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr ""
-
 #, fuzzy
-msgid "PAM authentication failed for\n"
-msgstr "%s ៖ PAM ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវបាន​បរាជ័យ​\n"
-
-#, fuzzy
-msgid "Unable to lock group file\n"
-msgstr "%s ៖ មិនអាច​ចាក់សោ​ឯកសារក្រុម​បានទេ\n"
-
-#, fuzzy
-msgid "Unable to open group file\n"
-msgstr "%s ៖ មិនអាច​បើក​ឯកសារក្រុម​បានទេ​\n"
-
-#, fuzzy
-msgid "Cannot close group file\n"
-msgstr "%s ៖ មិនអាចបើក​ឯកសារក្រុម​បានឡើយ​\n"
-
-#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -937,41 +846,19 @@
 "\t\t\t\t(មិនមែនមានតែមួយ) GID\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s ៖ %s រក​មិនឃើញ​នៅក្នុង​ /etc/group ទេ\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s ៖ %u មិនមែន​​ GID ដែលមានតែមួយ​ទេ\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s ៖ %s គឺមិនមែនជាឈ្មោះ​ដែលមានតែមួយទេ​\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s ៖ មិន​អាច​សរសេរ​ឯកសារ​ពាក្យ​សម្ងាត់​ឡើង​វិញ​បានឡើយ\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "ឈ្មោះ​ក្រុម​ '%s' មិនត្រឹមត្រូវ\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s ​៖ មិន​អាច​ចាក់​សោ​ឯកសារ​ពាក្យ​សម្ងាត់បានឡើយ​\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s ៖ ក្រុម​ %s គឺជា​ក្រុម NIS\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s ៖ មិន​អាច​បើក​ឯកសារ​ពាក្យ​សម្ងាត់​បានឡើយ\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s ៖ មិន​ស្គាល់​អ្នកប្រើ​ %s\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s ៖ មិនអាចផ្លាស់​​ប្តូរ​អ្នក​ប្រើបានទេ​ '%s' លើ​ម៉ាស៊ីន​ភ្ញៀវ NIS បានទេ ។\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "របៀបប្រើ ៖​ %s [-r] [-s] [group [gshadow]]\n"
 
@@ -983,18 +870,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s ៖ -s និង​ -r គឺមិន​ត្រូវ​គ្នាទេ​\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s ៖ មិន​អាច​ចាក់សោ​ឯកសារ​ %s បានទេ\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-msgstr "%s ៖ មិនអាច​បើក​ឯកសារ​ %s បានទេ\n"
-
-#, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s ៖ មិនអាច​ធ្វើឲ្យឯកសារ %s ទាន់សម័យ​បានទេ\n"
-
 #, fuzzy
 msgid "invalid group file entry"
 msgstr "ធាតុបញ្ចូល​ឯកសារក្រុម​មិនត្រឹមត្រូវ​\n"
@@ -1011,6 +886,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "ឈ្មោះ​ក្រុម​ '%s' មិនត្រឹមត្រូវ\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "ឈ្មោះ​ក្រុម​ '%s' មិនត្រឹមត្រូវ\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "ក្រុម​ %s ៖ គ្មាន​អ្នកប្រើ​ %s\n"
@@ -1023,18 +903,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "គ្មាន​ធាតុបញ្ចូល​ឯកសារ​ក្រុមផ្គូរផ្គង​នៅក្នុង​​ %s ទេ\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "បន្ថែម​ក្រុម​ '%s' ទៅក្នុង​ %s ឬ ?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s ៖ មិន​អាច​ធ្វើ​ឲ្យ​ធាតុ​ស្រមោល​សម្រាប់​​ %s ទាន់សម័យបានឡើយ\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s ៖ មិនអាច​ធ្វើឲ្យធាតុ​បញ្ចូល​សម្រាប់ក្រុម​ %s ទាន់សម័យ​បានទេ\n"
-
 #, fuzzy
 msgid "invalid shadow group file entry"
 msgstr "ធាតុ​ឯកសារ​ក្រុម​ស្រមោល​មិន​ត្រឹមត្រូវ\n"
@@ -1063,30 +936,21 @@
 msgid "%s: no changes\n"
 msgstr "%s ៖គ្មាន​ការផ្លាស់ប្ដូរ​\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s ៖ មិនអាច​ចាក់សោ​ឯកសារក្រុមស្រមោល​បានទេ​\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "របៀបប្រើ​ ៖ ក្រុម​ groupdel \n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s ៖ មិនអាច​បើក​ឯកសារក្រុមស្រមោល​បានទេ​\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "របៀបប្រើ​ ៖ ក្រុម​ groupdel \n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s ៖ មិនអាច​យក​ក្រុម​ស្រមោល %s ចេញ​បានទេ\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s ៖ មិនអាច​ធ្វើឲ្យឯកសារ %s ទាន់សម័យ​បានទេ\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s ៖ មិនអាច​ធ្វើឲ្យ​ឯកសារ​ក្រុម​ស្រមោល​ទាន់សម័យ​បានទេ​\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s ៖ មិនអាច​ធ្វើឲ្យ​ឯកសារក្រុម​ទាន់សម័យបានទេ​\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s ៖ មិនអាច​លុប​ឯកសារក្រុម​ស្រមោលបានទេ​\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "របៀបប្រើ ៖ លេខសម្គាល់ [-a]\n"
 
@@ -1118,6 +982,10 @@
 "បញ្ជាក់\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 #, fuzzy
 msgid "Username         Port     From             Latest"
 msgstr "ឈ្មោះ​អ្នក​ប្រើ         ច្រក     ពី             ចុង​ក្រោយ​បំផុត\n"
@@ -1129,15 +997,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "របៀបប្រើ ៖ %s [-p] [name]\n"
 
@@ -1238,6 +1106,11 @@
 "បានហួសពេលវេលា​ចូល​​\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "របៀបប្រើ​ ៖ លេខសម្គាល់\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "របៀបប្រើ ៖ newgrp [-] [group]\n"
 
@@ -1252,14 +1125,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s ៖ ការចែកជាពីរវិធី​​បានបរាជ័យ​ ៖ %s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "មិន​ស្គាល់​ UID ៖ %u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s ៖ មិនទាន់មានអ្នក​ប្រើ​ %s ទេ​\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "មិន​ស្គាល់​ GID ៖ %lu\n"
-
 msgid "too many groups\n"
 msgstr "ច្រើន​ក្រុមពេក​\n"
 
@@ -1273,60 +1142,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s ៖ មិនមានក្រុម​ %sឡើយ​\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "ឈ្មោះ​ក្រុម​ '%s' មិនត្រឹមត្រូវ\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s ៖ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ​ '%s'\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s ៖ មិនទាន់មានអ្នក​ប្រើ​ %s ទេ​\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s ៖ មិនទាន់មានអ្នក​ប្រើ​ %s ទេ​\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s ៖ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ​ '%s'\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s ៖ មិន​អាច​ចាក់​សោ​ /etc/passwd បានឡើយ ។\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s ៖ មិន​អាច​ចាក់​សោ​ /etc/passwd បានឡើយ ។\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s ៖ មិន​អាច​ចាក់​សោ​ /etc/passwd បានឡើយ ។\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s ៖ មិន​អាច​ចាក់​សោ​ /etc/passwd បានឡើយ ។\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1342,9 +1170,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s ៖ បន្ទាត់​ %d ៖ មិន​អាច​បង្កើត​ GID បានឡើយ\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s ៖ បន្ទាត់​ %d ៖ មិន​អាច​រក​អ្នកប្រើ​ %s ឃើញឡើយ\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s ៖ មិនទាន់មានអ្នក​ប្រើ​ %s ទេ​\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1375,15 +1203,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1455,13 +1283,10 @@
 msgstr "មិនអាចប្ដូរ​ពាក្យ​សម្ងាត់​សម្រាប់​ %s បានឡើយ ។\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s ៖ អស់​សតិ​\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1508,16 +1333,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ​ '%s'\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ​ '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "អ្នក​ប្រើ​ %s ៖ គ្មាន​ក្រុម​ %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "អ្នក​ប្រើ %s ៖ មិនទាន់មាន​ថត​ %s នៅ​ឡើយ​ទេ​\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "អ្នកប្រើ​ %s ៖ មិនទាន់មាន​កម្មវិធី​ %s នៅឡើយទេ\n"
 
 #, c-format
@@ -1528,10 +1361,6 @@
 msgid "add user '%s' in %s? "
 msgstr "បន្ថែម​អ្នក​ប្រើ​ '%s'ក្នុង​ %s ឬ ? "
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s ៖ មិនអាច​ធ្វើឲ្យ​ធាតុបញ្ចូលពាក្យសម្ងាត់​ទាន់សម័យ​សម្រាប់​​ %s បានឡើយ\n"
-
 #, fuzzy
 msgid "invalid shadow password file entry"
 msgstr "ធាតុបញ្ចូល​ឯកសារ​ពាក្យ​សម្ងាត់​ស្រមោល​មិនត្រឹមត្រូវ​\n"
@@ -1544,34 +1373,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "អ្នកប្រើ​ %s ៖ ពាក្យ​សម្ងាត់​ចុងក្រោយ​​ប្ដូរនៅក្នុង​អនាគត\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s ៖ មិន​អាច​ចាក់​សោ​ឯកសារ​​ពាក្យសម្ងាត់បានឡើយ\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s ៖ មិនអាច​បើក​ឯកសារ​ %s បានទេ\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s ៖ មិន​អាច​បើក​ឯកសារ​ឯកសារពាក្យសម្ងាត់បានឡើយ\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "របៀបប្រើ​ ៖ លេខសម្គាល់\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s ៖ មិន​អាច​យក​ធាតុបញ្ចូល​​ស្រមោលចេញ​​សម្រាប់ %s បានឡើយ\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s ៖ មិនអាច​ធ្វើឲ្យឯកសារស្រមោល​ទាន់សម័យបានឡើយ​\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "របៀបប្រើ​ ៖ លេខសម្គាល់\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s ៖ មិនអាច​ធ្វើឲ្យ​ឯកសារពាក្យសម្ងាត់​ទាន់សម័យបានឡើយ\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s ៖ មិនអាច​ធ្វើឲ្យធាតុបញ្ចូល​ទាន់សម័យ​សម្រាប់ %s បានឡើយ\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s ៖ មិន​អាច​លុប​ឯកសារ​ពាក្យ​សម្ងាត់​ស្រមោល​បានឡើយ\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "ដំណើរការ​ជា​ su ទៅ​កាន់​គណនី​នោះ​ DENIED ។\n"
 
@@ -1638,6 +1458,16 @@
 "%s: %s\n"
 "(មិន​អើពើ​)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s ៖ PAM ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវបាន​បរាជ័យ​\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "អ្នកគ្មាន​ការ​អនុញ្ញាតឲ្យ​ចូល​ទៅ​កាន់​ su ទេ​ %s\n"
+
 msgid "No shell\n"
 msgstr "គ្មានសែល​\n"
 
@@ -1666,14 +1496,6 @@
 msgstr "កំពុង​បញ្ចូល​របៀប​តំហែទាំ​ប្រព័ន្ធ​\n"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s ៖ មិន​ស្គាល់​ GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s ៖ មិន​ស្គាល់​ក្រុម​ %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s ៖ មិន​អាច​បង្កើត​ឯកសារ​លំនាំ​ដើម​ថ្មី​បានឡើយ​\n"
 
@@ -1714,10 +1536,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1759,14 +1583,6 @@
 "  -u, --uid UID\t\t\tបង្ខំឲ្យប្រើ UID សម្រាប់​គណនី​អ្នកប្រើ​ថ្មី\n"
 "\n"
 
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: អស់​សតិ​ក្នុង​ក្នុងការធ្វើឲ្យ​ក្រុមទាន់សម័យ\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s ៖ អស់​សតិ​ក្នុងការធ្វើឲ្យ gshadow ទាន់សម័៧\n"
-
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s  ៖ ថត​មូលដ្ឋាន​មិន​ត្រឹមត្រូវ​ '%s'\n"
@@ -1804,50 +1620,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s ៖ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ​ '%s'\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s ៖ មិន​អាច​សរសេរ​ឯកសារ​ពាក្យ​សម្ងាត់​ឡើង​វិញ​បានឡើយ\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s ៖ មិន​អាច​សរសេរ​ឯកសារ​ពាក្យ​សម្ងាត់​ស្រមោលឡើងវិញ​​បានឡើយ​\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s ៖ មិន​អាច​ចាក់​សោ​ឯកសារ​ពាក្យ​សម្ងាត់ស្រមោល​បានឡើយ\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s ៖ មិន​អាច​បើក​ឯកសារ​ពាក្យ​សម្ងាត់​ស្រមោលបានឡើយ\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s ៖ មានកំហុសក្នុងការ​ចាក់សោ​ឯកសារក្រុម​\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s ៖ មានកំហុស​ក្នុងការ​បើក​ឯកសារក្រុម\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s ៖មានកំហុសក្នុងការ​ចាក់សោ​ឯកសារក្រុម​ស្រមោល​\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s ៖ មានកំហុស​ក្នុងការ​បើក​ឯកសារក្រុម​ស្រមោល\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s ៖ មានកំហុសក្នុងការ​បន្ថែម​ធាតុបញ្ចូល​ពាក្យសម្ងាត់​ថ្មី​\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s ៖ មានកំហុស​ក្នុងការ​បន្ថែម​ធាតុបញ្ចូល​ពាក្យសម្ងាត់​ស្រមោល​ថ្មី​\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s ៖ មិន​​អាច​បង្កើត​ថត​ %s បានឡើយ\n"
 
@@ -1861,8 +1641,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "ការកំណត់​សិទ្ធ​លើ​ឯកសារ​ប្រអប់​សំបុត្រ​"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s ៖ អ្នក​ប្រើ​ %s មាន​រួច​ហើយ​\n"
 
 #, c-format
@@ -1874,10 +1655,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s ៖ មិន​អាច​បង្កើត​ %s បានឡើយ\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s ៖ UID %u មិន​មែន​មាន​តែមួយទេ​\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s ៖ មិន​អាច​បង្កើត​ %s បានឡើយ\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1886,10 +1672,6 @@
 "%s ៖ ការព្រមាន​ ៖ មានថតផ្ទះ​រួចហើយ ។\n"
 "មិនចម្លង​​ឯកសារណាមួយ​ពីថត​ skel ចូលក្នុង​វានោះទេ ។\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr "%s ៖ ការព្រមាន ៖ CREATE_HOME មិន​បាន​គាំទ្រទេ​ សូម​ប្រើ​ -m ជំនួសវិញ ។\n"
-
 #, fuzzy
 msgid ""
 "Usage: userdel [options] LOGIN\n"
@@ -1909,51 +1691,26 @@
 "  -r, --remove\t\t\tយកថ​ត​ផ្ទះ  និង​ហុង​សំបុត្រ​ចេញ\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s  ៖ មានកំហុស​ក្នុងការ​ធ្វើឲ្យ​ធាតុ​បញ្ចូល​ក្រុម​​ទាន់សម័យ\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr "%s ៖ មិនអាច​យកក្រុម %s ដែលជា​ក្រុម​ចម្បង​សម្រាប់​អ្នកប្រើដទៃទៀតចេញបានទេ ។\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s  ៖ មានកំហុស​ក្នុងការ​ធ្វើឲ្យ​ធាតុ​បញ្ចូល​ក្រុម​​ទាន់សម័យ\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s ៖ មិនអាចបើក​ឯកសារក្រុម​បានឡើយ​\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s ៖ មិនអាច​បើក​ឯកសារក្រុម​ស្រមោល​បានឡើយ\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s ៖ មានកំហុស​ក្នុងការ​លុប​ធាតុ​បញ្ចូល​ពាក្យសម្ងាត់​\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s ៖ មានកំហុស​ក្នុងការ​លុប​ធាតុបញ្ចូល​ពាក្យសម្ងាត់​ស្រមោល​\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s ៖ បច្ចុប្បន្ន ​អ្នក​ប្រើ​ %s បាន​ចូលហើយ​\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s  ៖ ការព្រមាន​ ៖ មិន​អាច​យកចេញបានឡើយ "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s ៖ %s មិន​បានទទួលយក​​ %s ទេ, មិនយកចេញ​\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s  ៖ ការព្រមាន​ ៖ មិន​អាច​យកចេញបានឡើយ "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s ៖ មិនទាន់មានអ្នក​ប្រើ​ %s ទេ​\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s ៖ អ្នកប្រើ​ %s គឺជា​អ្នក​​ប្រើ​ NIS\n"
 
@@ -2015,9 +1772,16 @@
 "  -U, --unlock\t\t\tដោះសោ​គណនី​អ្នកប្រើ\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s ៖ កំហុស​ក្នុងការ​បន្ថែម​ធាតុបញ្ចូល​​ក្រុម​ថ្មី​\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s ៖ អ្នក​ប្រើ​ %s មាន​រួច​ហើយ​\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -2032,22 +1796,10 @@
 msgstr ""
 
 #, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s ៖ uid %lu មិនមែន​មាន​តែ​មួយទេ​\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr ""
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s  ​៖ មានកំហុស​ក្នុងការ​ផ្លាស់ប្ដូរ​ធាតុបញ្ចូល​ពាក្យសម្ងាត់​\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s ៖ មានកំហុស​ក្នុងការ​យក​ធាតុបញ្ចូល​ពាក្យសម្ងាត់ចេញ\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s ៖ មានកំហុសក្នុងការ​យក​ធាតុបញ្ចូល​ពាក្យសម្ងាត់​ស្រមោល​ចេញ\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s ៖ មានថត​ %s ​រួច​ហើយ​\n"
 
@@ -2068,6 +1820,14 @@
 msgstr "%s ៖ មិនអាចប្ដូរឈ្មោះ​ថត​ %s ទៅ​ជា​ %s បានឡើយ\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s ៖ ការព្រមាន ៖​ %s មិនត្រូវបានទទួល​យក​ដោយ %s ឡើយ\n"
 
@@ -2081,7 +1841,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 #, fuzzy
@@ -2106,10 +1866,16 @@
 "  -s, --shadow\t\t\tកែសម្រួល​មូលដ្ឋាន​ទិន្នន័យ​ស្រមោល ឬ gshadow\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s ៖ បរាជ័យ​ក្នុងការ​ទម្លាក់​សិទ្ធ (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s ៖ %s មិនត្រូវបានប្ដូរឡើយ​\n"
@@ -2124,6 +1890,406 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s ៖ មិន​អាច​ស្តារ %s ៖ %s (ការប្ដូរ​របស់អ្នក​គឺនៅក្នុង​ %s)\n"
 
+#~ msgid "%s: can't lock password file\n"
+#~ msgstr "%s ៖ មិនអាច​ចាក់សោ​ឯកសារ​ពាក្យ​សម្ងាត់​បានទេ​\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s ៖ មិន​អាច​បើក​ឯកសារ​ពាក្យ​សម្ងាត់​\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s ៖ មិនអាច​ចាក់សោ​​ឯកសារ​ពាក្យ​សម្ងាត់ស្រមោល​បានទេ\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s ៖ មិន​អាច​បើក​ឯកសារពាក្យ​សម្ងាត់​ស្រមោលបានទេ\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s ៖ មិនអាច​សរសេរ​ឯកសារពាក្យសម្ងាត់ស្រមោល​ឡើងវិញ​បានទេ​\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s ៖ មិនអាច​សរសេរ​ឯកសារពាក្យសម្ងាត់​ឡើងវិញបានទេ​\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s ៖ មិនអាច​ធ្វើឲ្យ​ឯកសារ​ពាក្យ​សម្ងាត់​ទាន់សម័យ​បានទេ\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s ៖ មិនអាច​ធ្វើ​ឲ្យ​ឯកសារពាក្យសម្ងាត់​ស្រមោលទាន់សម័យបានទេ\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tឈ្មោះពេញ​ ៖ %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tលេខ​បន្ទប់​ ៖ %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tទូរស័ព្ទ​​​កន្លែង​​​ធ្វើការ ៖ %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tទូរស័ព្ទនៅ​ផ្ទះ ៖ %s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr "មិន​អាច​ចាក់សោ​ឯកសារ​ពាក្យ​សម្ងាត់​បានទេ ។ សូមព្យាយាម​ម្តង​ទៀតនៅ​ពេល​ក្រោយ​ ។\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "មិនអាច​បើក​ឯកសារ​ពាក្យសម្ងាត់​បានឡើយ ។\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s ៖ មិន​អាច​ចាក់​សោ​​​ឯកសារជា​​ក្រុម​បាន​ទេ\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s ៖ មិន​អាច​បើក​ឯកសារ​ជា​ក្រុម​បាន​ទេ​\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s ៖មិន​អាច​ចាក់សោ​ឯកសារ​ gshadow បានទេ\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s ៖ មិន​អាច​បើក​ឯកសារ​ស្រមោល​បានទេ\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s ៖ មានកំហុស​ក្នុងការ​ធ្វើឲ្យឯកសារស្រមោល​ទាន់សម័យ​\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s  ៖ មានកំហុស​ក្នុងការ​ធ្វើឲ្យ​ធាតុ​បញ្ចូល​ក្រុម​​ទាន់សម័យ\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s ៖ បន្ទាត់​ %d ៖ មិន​ស្គាល់​ក្រុម​ %s\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s ៖ បន្ទាត់​ %d ៖ មិនអាចធ្វើឲ្យ​ធាតុបញ្ចូល​ទាន់សម័យបានឡើយ\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s ៖ មិនអាច​ចាក់​សោ​ឯកសារ​ស្រមោល​បានទេ​\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s ៖ មានកំហុស​ក្នុងការ​ធ្វើឲ្យឯកសារស្រមោល​ទាន់សម័យ​\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s ៖ កំហុស​ក្នុងការធ្វើឲ្យ​ឯកសារពាក្យសម្ងាត់ទាន់សម័យ\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s ៖ បន្ទាត់​ %d ៖ មិនស្គាល់​អ្នកប្រើ​ %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s ៖ បន្ទាត់​ %d ៖ មិនអាច​ធ្វើឲ្យធាតុបញ្ចូល​ពាក្យសម្ងាត់​ទាន់សម័យ​បានឡើយ​\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s  ៖ មិន​ស្គាល់​អ្នក​ប្រើ​\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "មិន​ស្គាល់​អ្នក​ប្រើ ៖ %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "របៀបប្រើ ៖ %s ក្រុម [-r|-R] \n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s ក្រុម [-a user]​\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s ក្រុម [-d user]​\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s ក្រុម [-A user,...] [-M user,...]\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s ក្រុម [-M user,...]\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s ៖ មិនអាច​ចាក់សោ​បានឡើយ\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s ៖ មិនអាច​ចាក់សោ​ស្រមោល​បានឡើយ​\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s ៖ មិន​អាច​បើក​​ឯកសារ​បានទេ\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s ៖ មិន​អាច​សរសេរ​ឯកសារ​ឡើង​វិញបានទេ​\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s ៖ មិន​អាច​សរសេរ​​​​​ឯកសារ​ស្រមោល​ឡើង​វិញ បាន​ទេ​\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s ៖ មិនអាច​ដោះសោ​ឯកសារបានទេ\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s ៖ មិន​អាចធ្វើ​ឲ្យ​ធាតុបញ្ចូល​​ទាន់សម័យ​បានទេ​\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s ៖ មិនអាច​ធ្វើឲ្យ​​ធាតុបញ្ចូល​​ស្រមោល​ទាន់សម័យបានទេ​\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "មិន​ស្គាល់​ក្រុម​ ​ ៖ %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s ៖ មិន​អាច​បើក​​ឯកសារ​បានទេ\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s ៖ មិន​អាច​បើក​ឯកសារ​ស្រមោល​បានទេ\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "តើអ្នក​ជា​នណា​ ?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s ៖ មិន​ស្គាល់​សមាជិក​ %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s ៖ កំហុស​ក្នុងការ​បន្ថែម​ធាតុបញ្ចូល​​ក្រុម​ថ្មី​\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s ៖​ មិនអាច​សរសេរ​ឯកសារក្រុមឡើងវិញ​បានទេ​\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s ៖ មិនអាច​សរសេរ​ឯកសារក្រុម​ស្រមោល​ឡើងវិញ​បានទេ​\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s ៖ មិនអាច​ចាក់សោ​ឯកសារក្រុម​បានទេ\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s ៖ មិនអាច​បើក​ឯកសារក្រុម​បានទេ​\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s ៖ មិនអាច​ចាក់សោ​ឯកសារក្រុមស្រមោល​បានទេ\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s ៖ មិនអាច​បើក​ឯកសារក្រុម​ស្រមោល​បានទេ​\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s ៖ GID %u គឺមិនមែន​មាន​តែមួយទេ​\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s ៖ កំហុស​ក្នុងការយក​ធាតុបញ្ចូល​ក្រុមចេញ\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s ៖ កំហុស​ក្នុងការយក​ធាតុបញ្ចូល​ក្រុម​ស្រមោល​ចេញ\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s ៖ មិនអាចយក​ក្រុម​ចម្បង​របស់អ្នកប្រើ​ចេញ​បានទេ ។\n"
+
+#, fuzzy
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "%s ៖ PAM ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវបាន​បរាជ័យ​\n"
+
+#, fuzzy
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "%s ៖ មិនអាច​ចាក់សោ​ឯកសារក្រុម​បានទេ\n"
+
+#, fuzzy
+#~ msgid "Unable to open group file\n"
+#~ msgstr "%s ៖ មិនអាច​បើក​ឯកសារក្រុម​បានទេ​\n"
+
+#, fuzzy
+#~ msgid "Cannot close group file\n"
+#~ msgstr "%s ៖ មិនអាចបើក​ឯកសារក្រុម​បានឡើយ​\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s ៖ %s រក​មិនឃើញ​នៅក្នុង​ /etc/group ទេ\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s ៖ %u មិនមែន​​ GID ដែលមានតែមួយ​ទេ\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s ៖ %s គឺមិនមែនជាឈ្មោះ​ដែលមានតែមួយទេ​\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s ៖ មិន​អាច​សរសេរ​ឯកសារ​ពាក្យ​សម្ងាត់​ឡើង​វិញ​បានឡើយ\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s ​៖ មិន​អាច​ចាក់​សោ​ឯកសារ​ពាក្យ​សម្ងាត់បានឡើយ​\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s ៖ មិន​អាច​បើក​ឯកសារ​ពាក្យ​សម្ងាត់​បានឡើយ\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s ៖ មិន​អាច​ចាក់សោ​ឯកសារ​ %s បានទេ\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s ៖ មិន​អាច​ធ្វើ​ឲ្យ​ធាតុ​ស្រមោល​សម្រាប់​​ %s ទាន់សម័យបានឡើយ\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s ៖ មិនអាច​ធ្វើឲ្យធាតុ​បញ្ចូល​សម្រាប់ក្រុម​ %s ទាន់សម័យ​បានទេ\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s ៖ មិនអាច​ចាក់សោ​ឯកសារក្រុមស្រមោល​បានទេ​\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s ៖ មិនអាច​បើក​ឯកសារក្រុមស្រមោល​បានទេ​\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s ៖ មិនអាច​យក​ក្រុម​ស្រមោល %s ចេញ​បានទេ\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s ៖ មិនអាច​ធ្វើឲ្យ​ឯកសារ​ក្រុម​ស្រមោល​ទាន់សម័យ​បានទេ​\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s ៖ មិនអាច​ធ្វើឲ្យ​ឯកសារក្រុម​ទាន់សម័យបានទេ​\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s ៖ មិនអាច​លុប​ឯកសារក្រុម​ស្រមោលបានទេ​\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "មិន​ស្គាល់​ UID ៖ %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "មិន​ស្គាល់​ GID ៖ %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s ៖ មិនមានក្រុម​ %sឡើយ​\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s ៖ មិនទាន់មានអ្នក​ប្រើ​ %s ទេ​\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s ៖ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ​ '%s'\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s ៖ មិន​អាច​ចាក់​សោ​ /etc/passwd បានឡើយ ។\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s ៖ មិន​អាច​ចាក់​សោ​ /etc/passwd បានឡើយ ។\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s ៖ មិន​អាច​ចាក់​សោ​ /etc/passwd បានឡើយ ។\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s ៖ មិន​អាច​ចាក់​សោ​ /etc/passwd បានឡើយ ។\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s ៖ មិន​អាច​បើក​ឯកសារបានឡើយ​\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s ៖ មានកំហុសក្នុងការ​ធ្វើឲ្យ​ឯកសារទាន់សម័យ\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s ៖ បន្ទាត់​ %d ៖ មិន​អាច​រក​អ្នកប្រើ​ %s ឃើញឡើយ\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s ៖ មិនអាច​ធ្វើឲ្យ​ធាតុបញ្ចូលពាក្យសម្ងាត់​ទាន់សម័យ​សម្រាប់​​ %s បានឡើយ\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s ៖ មិន​អាច​ចាក់​សោ​ឯកសារ​​ពាក្យសម្ងាត់បានឡើយ\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s ៖ មិន​អាច​បើក​ឯកសារ​ឯកសារពាក្យសម្ងាត់បានឡើយ\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s ៖ មិន​អាច​យក​ធាតុបញ្ចូល​​ស្រមោលចេញ​​សម្រាប់ %s បានឡើយ\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s ៖ មិនអាច​ធ្វើឲ្យឯកសារស្រមោល​ទាន់សម័យបានឡើយ​\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s ៖ មិនអាច​ធ្វើឲ្យ​ឯកសារពាក្យសម្ងាត់​ទាន់សម័យបានឡើយ\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s ៖ មិនអាច​ធ្វើឲ្យធាតុបញ្ចូល​ទាន់សម័យ​សម្រាប់ %s បានឡើយ\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s ៖ មិន​អាច​លុប​ឯកសារ​ពាក្យ​សម្ងាត់​ស្រមោល​បានឡើយ\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s ៖ មិន​ស្គាល់​ GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s ៖ មិន​ស្គាល់​ក្រុម​ %s\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s ៖ អស់​សតិ​ក្នុងការធ្វើឲ្យ gshadow ទាន់សម័៧\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s ៖ មិន​អាច​សរសេរ​ឯកសារ​ពាក្យ​សម្ងាត់​ឡើង​វិញ​បានឡើយ\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s ៖ មិន​អាច​សរសេរ​ឯកសារ​ពាក្យ​សម្ងាត់​ស្រមោលឡើងវិញ​​បានឡើយ​\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s ៖ មិន​អាច​ចាក់​សោ​ឯកសារ​ពាក្យ​សម្ងាត់ស្រមោល​បានឡើយ\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s ៖ មិន​អាច​បើក​ឯកសារ​ពាក្យ​សម្ងាត់​ស្រមោលបានឡើយ\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s ៖ មានកំហុសក្នុងការ​ចាក់សោ​ឯកសារក្រុម​\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s ៖ មានកំហុស​ក្នុងការ​បើក​ឯកសារក្រុម\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s ៖មានកំហុសក្នុងការ​ចាក់សោ​ឯកសារក្រុម​ស្រមោល​\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s ៖ មានកំហុស​ក្នុងការ​បើក​ឯកសារក្រុម​ស្រមោល\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s ៖ មានកំហុសក្នុងការ​បន្ថែម​ធាតុបញ្ចូល​ពាក្យសម្ងាត់​ថ្មី​\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s ៖ មានកំហុស​ក្នុងការ​បន្ថែម​ធាតុបញ្ចូល​ពាក្យសម្ងាត់​ស្រមោល​ថ្មី​\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr "%s ៖ ការព្រមាន ៖ CREATE_HOME មិន​បាន​គាំទ្រទេ​ សូម​ប្រើ​ -m ជំនួសវិញ ។\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s  ៖ មានកំហុស​ក្នុងការ​ធ្វើឲ្យ​ធាតុ​បញ្ចូល​ក្រុម​​ទាន់សម័យ\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s  ៖ មានកំហុស​ក្នុងការ​ធ្វើឲ្យ​ធាតុ​បញ្ចូល​ក្រុម​​ទាន់សម័យ\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s ៖ មិនអាចបើក​ឯកសារក្រុម​បានឡើយ​\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s ៖ មិនអាច​បើក​ឯកសារក្រុម​ស្រមោល​បានឡើយ\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s ៖ មានកំហុស​ក្នុងការ​លុប​ធាតុ​បញ្ចូល​ពាក្យសម្ងាត់​\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s ៖ មានកំហុស​ក្នុងការ​លុប​ធាតុបញ្ចូល​ពាក្យសម្ងាត់​ស្រមោល​\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s ៖ មិនទាន់មានអ្នក​ប្រើ​ %s ទេ​\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s ៖ កំហុស​ក្នុងការ​បន្ថែម​ធាតុបញ្ចូល​​ក្រុម​ថ្មី​\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s ៖ uid %lu មិនមែន​មាន​តែ​មួយទេ​\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s  ​៖ មានកំហុស​ក្នុងការ​ផ្លាស់ប្ដូរ​ធាតុបញ្ចូល​ពាក្យសម្ងាត់​\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s ៖ មានកំហុស​ក្នុងការ​យក​ធាតុបញ្ចូល​ពាក្យសម្ងាត់ចេញ\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s ៖ មានកំហុសក្នុងការ​យក​ធាតុបញ្ចូល​ពាក្យសម្ងាត់​ស្រមោល​ចេញ\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s ៖ មិនអាច​យក​​ GID ​ដែលមានតែមួយ​បានឡើយ​\n"
 
@@ -2133,18 +2299,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " លើ '%.100s'"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s ៖ មិន​អាច​ចាក់សោ​ឯកសារ​បានឡើយ សូមព្យាយាម​ម្តង​ទៀតនៅពេលក្រោយ​\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s ៖ បន្ទាត់​ %d ៖ មិន​អាច​បង្កើត​ UID បានឡើយ\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/ko.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.1.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\n"
 "PO-Revision-Date: 2008-03-21 11:48+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu at debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean at lists.debian.org>\n"
@@ -57,6 +57,9 @@
 msgid "  Choose a new password."
 msgstr "  새로운 암호를 선택하십시오."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "암호 사용기한이 %ld일 후에 끝납니다.\n"
@@ -68,7 +71,12 @@
 msgstr "암호 사용기한이 오늘 끝납니다."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "%s tty(단말터미널)를 바꿀 수 없습니다"
 
 msgid "Environment overflow\n"
@@ -89,12 +97,16 @@
 "마지막 로그인 이후 %d번 실패.\n"
 "마지막 로그인은 %s, %s에서.\n"
 
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+#| msgid "Can't get unique GID (no more available GIDs)\n"
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "유일한 GID를 얻을 수 없습니다 (GID가 남아 있지 않습니다)\n"
+
+#, fuzzy, c-format
+#| msgid "Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "유일한 UID를 얻을 수 없습니다 (UID가 남아 있지 않습니다)\n"
 
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "유일한 GID를 얻을 수 없습니다 (GID가 남아 있지 않습니다)\n"
-
 msgid "Too many logins.\n"
 msgstr "로그인 횟수가 너무 많음.\n"
 
@@ -187,9 +199,16 @@
 msgstr "tty(단말터미널) 이름을 확인할 수 없습니다."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: 메모리 부족\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d)에 실패\n"
 
+msgid "No"
+msgstr ""
+
 msgid "Password: "
 msgstr "암호: "
 
@@ -197,6 +216,11 @@
 msgid "%s's Password: "
 msgstr "%s의 암호: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: 입력범위가 너무 깁니다\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -294,42 +318,34 @@
 msgstr "%s: 접근권한 거부됨.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: 사용자 이름을 인식할 수 없습니다.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM 인증이 실패했습니다\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: 암호 파일을 잠글 수 없습니다\n"
+#, fuzzy, c-format
+#| msgid "Cannot lock the password file; try again later.\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "암호 파일을 잠글할 수 없습니다;  나중에 다시 시도하십시오.\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: 암호 파일을 열 수 없습니다\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: %s 파일을 열 수 없습니다\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: 셰도우 암호 파일을 잠글 수 없습니다\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: 프로세스 만들기 실패: %s\n"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: 셰도우 암호 파일을 열 수 없습니다\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: 관리자 권한을 버릴 수 없습니다(%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: 셰도우 암호 파일을 다시 작성할 수 없습니다\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: 암호 파일을 다시 작성할 수 없습니다\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: 암호 파일을 업데이트 할 수 없습니다\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: 셰도우 암호 파일을 업데이트 할 수 없습니다\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: 셰도우 암호 파일이 없습니다\n"
 
@@ -337,9 +353,10 @@
 msgid "%s: failed to drop privileges (%s)\n"
 msgstr "%s: 관리자 권한을 버릴 수 없습니다(%s)\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: 알 수 없는 사용자 %s\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: `%s' 사용자가 없습니다\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -365,57 +382,27 @@
 msgid "Full Name"
 msgstr "이름"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\t이름: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "방 번호"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\t방 번호: %s\n"
-
 msgid "Work Phone"
 msgstr "직장 번화번호"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\t직장 번화번호: %s\n"
-
 msgid "Home Phone"
 msgstr "집 전화번호"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\t집 전화번호: %s\n"
-
 msgid "Other"
 msgstr "기타"
 
 msgid "Cannot change ID to root.\n"
 msgstr "아이디를 루트로 바꿀 수는 없습니다.\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 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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -448,9 +435,10 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s'에 사용할 수 없는 글자가 들어 있습니다\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: 사용자 이름을 인식할 수 없습니다.\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: `%s' 사용자가 없습니다\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -499,8 +487,9 @@
 msgid "%s: invalid numeric argument '%s'\n"
 msgstr "%s: 잘못된 숫자 인자 '%s'\n"
 
-#, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+#, fuzzy, c-format
+#| msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: %s 플래그는 %s 플래그와 함께 사용해야 합니다\n"
 
 #, c-format
@@ -512,30 +501,6 @@
 msgstr "%s: 지원하지 않는 암호화 방법: %s\n"
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: 그룹 파일을 잠글 수 없습니다\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: 그룹 파일을 열 수 없습니다\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: 그룹 셰도우 파일을 잠글 수 없습니다\n"
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-msgstr "%s: 셰도우 파일을 열 수 없습니다\n"
-
-#, c-format
-msgid "%s: error updating gshadow file\n"
-msgstr "%s: 그룹 셰도우 파일을 업데이트하는 데 오류가 발생했습니다\n"
-
-#, 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"
 
@@ -543,38 +508,25 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: %d번 줄: 새 암호가 없습니다\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: %d번 줄: 알 수 없는 그룹 %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: %s 그룹이 없습니다\n"
 
-#, c-format
-msgid "%s: line %d: cannot update group entry\n"
-msgstr "%s: %d번 줄: 그룹 항목을 업데이트 할 수 없습니다\n"
+#, fuzzy, c-format
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: `%s' 사용자가 없습니다\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: 셰도우 파일을 업데이트하는 데 오류가 발생했습니다\n"
-
-#, c-format
-msgid "%s: error updating password 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"
@@ -593,8 +545,9 @@
 msgid "Login Shell"
 msgstr "로그인 쉘"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "사용자 %s의 쉘을 바꿀 수 없습니다.\n"
 
 #, c-format
@@ -605,24 +558,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: 부적절한 입력: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s은(는) 사용할 수 없는 쉘입니다.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "사용법: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: 알 수 없는 사용자\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -652,11 +621,16 @@
 "                                로그인 실패 횟수와 한계값만 관리합니다\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "로그인       실패     최대값  최근                     사용\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%ld초 남았습니다]"
 
 #, c-format
@@ -664,78 +638,71 @@
 msgstr " [%ld초 잠금]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "알 수 없는 사용자: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "사용법: %s [-r|-R] 그룹\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a 사용자] 그룹\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d 사용자] 그룹\n"
+#, fuzzy, c-format
+#| msgid "Unknown user or range: %s\n"
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "알 수 없는 사용자 혹은 범위: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A 사용자,...] [-M 사용자,...] 그룹\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: %s 파일을 열 수 없습니다\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M 사용자,...] 그룹\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: -A를 사용할 때에는 셰도우 그룹 암호가 필요합니다\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: 잠금을 할 수 없습니다\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: 셰도우 잠금을 할 수 없습니다\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "%s의 암호는 바꿀 수 없습니다.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: 파일을 열 수 없습니다\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: -A를 사용할 때에는 셰도우 그룹 암호가 필요합니다\n"
 
-#, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: 파일을 다시 쓸 수 없습니다\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: %s 그룹이 없습니다\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: 셰도우 파일을 다시 쓸 수 없습니다\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: 프로세스 만들기 실패: %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"
-
-#, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: 파일을 닫을 수 없습니다\n"
-
-#, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: 셰도우 파일을 닫을 수 없습니다\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "%s 그룹의 암호를 바꾸는 중\n"
 
@@ -752,9 +719,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: 나중에 다시 시도하십시오\n"
 
-msgid "Who are you?\n"
-msgstr "누구십니까?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "사용자 %s을(를) %s 그룹에 등록 중\n"
@@ -763,9 +727,10 @@
 msgid "Removing user %s from group %s\n"
 msgstr "사용자 %s을(를) 그룹 %s에서 지우는 중\n"
 
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: 알 수 없는 그룹 멤버 %s\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: `%s' 사용자가 없습니다\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -801,113 +766,92 @@
 "  -r, --system                  시스템 계정을 만듭니다\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: 새 그룹을 더하는 데 오류가 발생했습니다\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s은(는) 사용할 수 없는 그룹 이름입니다\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: 그룹 파일을 다시 쓸 수 없습니다\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group ID '%s'\n"
+msgstr "'%s' `%s' 그룹 이름은 쓸 수 없습니다\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: 셰도우 그룹 파일을 다시 쓸 수 없습니다\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: 그룹 파일을 잠글 수 없습니다\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: 그룹 파일을 열 수가 없습니다\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: 셰도우 그룹 파일 잠글 수 없습니다\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: 셰도우 그룹 파일을 열 수 없습니다\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K 옵션에는 <키>=<값> 형태의 입력이 필요합니다\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 msgstr "%s: 그룹 %s이(가) 이미 있습니다\n"
 
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u번은 유일하지 않습니다\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "이미 멤버가 있습니다\n"
 
-#, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: 그룹을 만들 수 없습니다\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "사용법: groupdel 그룹\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: 그룹 입력값을 지우는 데 오류가 발생했습니다\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: 디렉토리 %s의 이름을 %s(으)로 바꿀 수 없습니다\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: 셰도우 그룹 입력값을 지우는 데 오류가 발생했습니다\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: '%s' 사용자의 주요 그룹을 %u번에서 %u번으로 바꿀 수 없습니다.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: 사용자의 주요 그룹은 지울 수 없습니다.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: %s 그룹이 없습니다\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: %s 그룹은 NIS 그룹입니다\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: '%s' 그룹은 NIS 그룹입니다.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s은(는) NIS 마스터입니다\n"
 
-msgid "Member already exists\n"
-msgstr "이미 멤버가 있습니다\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: %s 사용자는 NIS 사용자 입니다\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "지우려는 멤버가 없습니다\n"
+#, fuzzy, c-format
+#| msgid "%s: Out of memory. Cannot update the group database.\n"
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: 메모리가 부족합니다. 그룹 데이터베이스를 업데이트할 수 없습니다.\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
-"사용법: groupmems -a <사용자이름> | -d <사용자이름> | -D | -l [-g <그룹이름"
-">]\n"
 
-msgid "Only root can add members to different groups\n"
-msgstr "루트 사용자만 그룹에 멤버를 더할 수 있습니다\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "그룹 접근 권한이 필요합니다\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "현재 그룹의 소유자가 아닙니다\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "다음에 대해 PAM 인증이 실패했습니다\n"
-
-msgid "Unable to lock group file\n"
-msgstr "그룹 파일을 잠글 수 없습니다\n"
-
-msgid "Unable to open group file\n"
-msgstr "그룹 파일을 열 수 없습니다\n"
-
-msgid "Cannot close group file\n"
-msgstr "그룹 파일을 닫을 수 없습니다\n"
-
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -932,43 +876,20 @@
 "  -p, --password <암호>         새 암호에 암호화한 암호를 사용합니다\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s은(는) /etc/group에 없습니다\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "'%s' `%s' 그룹 이름은 쓸 수 없습니다\n"
 
 #, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: GID %u번은 유일한 GID가 아닙니다\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: %s 그룹은 NIS 그룹입니다\n"
 
 #, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s은(는) 유일한 이름이 아닙니다\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: 알 수 없는 사용자 %s\n"
 
 #, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: passwd 파일을 다시 쓸 수 없습니다\n"
-
-#, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: 암호 파일 잠금을 할 수 없습니다\n"
-
-#, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: 암호 파일을 열 수 없습니다\n"
-
-#, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-"%s: '%s' 사용자의 주요 그룹을 %u번에서 %u번으로 바꿀 수 없습니다. 이 그룹은 "
-"passwd 파일에 들어 있지 않습니다.\n"
-
-#, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: '%s' 사용자의 주요 그룹을 %u번에서 %u번으로 바꿀 수 없습니다.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "사용법: %s [-r] [-s] [그룹 [gshadow]]\n"
 
@@ -980,18 +901,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s 옵션과 -r 옵션을 동시에 쓸 수 없습니다\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: %s 파일을 잠글 수 없습니다\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-msgstr "%s: %s 파일을 열 수 없습니다\n"
-
-#, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: %s 파일을 업데이트 할 수 없습니다\n"
-
 msgid "invalid group file entry"
 msgstr "허용되지 않는 그룹 파일 입력값입니다"
 
@@ -1006,6 +915,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "'%s' 그룹은 허용되지 않습니다\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "'%s' 그룹은 허용되지 않습니다\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "그룹 %s: %s 사용자가 없습니다\n"
@@ -1018,18 +932,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "%s에 일치하는 그룹 파일 입력값이 없습니다\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "%s 그룹을 %s 안에 더할까요?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: %s의 셰도우 입력값을 업데이트 할 수 없습니다\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: %s 그룹 입력값을 업데이트 할 수 없습니다\n"
-
 msgid "invalid shadow group file entry"
 msgstr "허용되지 않은 셰도우 그룹파일 입력값"
 
@@ -1056,30 +963,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: 바뀐 점이 없음\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: 셰도우 그룹 파일을 잠글 수 없습니다\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "사용법: groupdel 그룹\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: 셰도우 그룹 파일을 열 수 없습니다\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "사용법: groupdel 그룹\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: 셰도우 그룹 %s을(를) 지울 수 없습니다\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: %s 파일을 업데이트 할 수 없습니다\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: 셰도우 그룹 파일을 업데이트 할 수 없습니다\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: 그룹 파일을 업데이트 할 수 없습니다\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: 셰도우 그룹 파일을 지울 수 없습니다\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "사용법: id [-a]\n"
 
@@ -1109,6 +1007,10 @@
 "  -u, --user <로그인>           <로그인> 사용자의 최근 기록만 표시합니다\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "사용자이름       포트     어디서           최근정보"
 
@@ -1119,14 +1021,14 @@
 msgstr "**한번도 로그인한 적이 없습니다**"
 
 #, c-format
-msgid "Unknown user or range: %s\n"
-msgstr "알 수 없는 사용자 혹은 범위: %s\n"
-
-#, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: 올 수 없는 인자입니다: %s\n"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "사용법: %s [-p] [이름]\n"
 
@@ -1223,6 +1125,11 @@
 "로그인 시간이 지나갔습니다\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "사용법: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "사용법: newgrp [-] [그룹]\n"
 
@@ -1236,14 +1143,11 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: 프로세스 만들기 실패: %s\n"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "알 수 없는 UID: %u\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: `%s' 사용자가 없습니다\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "알 수 없는 GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "그룹이 너무 많습니다\n"
 
@@ -1261,61 +1165,21 @@
 "  -r, --system                  시스템 계정을 만듭니다\n"
 "%s\n"
 
-#, c-format
-msgid "%s: group ID `%s' is not valid\n"
-msgstr "%s: `%s' 그룹 ID는 쓸 수 없습니다\n"
-
-#, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "'%s' `%s' 그룹 이름은 쓸 수 없습니다\n"
-
-#, c-format
-msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: %s 그룹은 셰도우 그룹이지만, /etc/group에 없습니다\n"
 
-#, c-format
-msgid ""
-"%s: group %s created, failure during the creation of the corresponding "
-"gshadow group\n"
-msgstr "%s: %s 그룹을 만들었습니다, 다음 그룹 셰도우 그룹을 만드는 데 실패\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: 쓸 수 없는 사용자 이름 '%s'\n"
 
 #, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: `%s' 사용자 ID는 쓸 수 없습니다\n"
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: 쓸 수 없는 사용자 이름 '%s'\n"
 
 #, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: `%s' 사용자가 없습니다\n"
-
-#, c-format
-msgid "%s: invalid user name `%s'\n"
-msgstr "%s: `%s' 사용자 이름은 쓸 수 없습니다\n"
-
-#, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: /etc/passwd를 잠글 수 없습니다.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: /etc/shadow를 잠글 수 없습니다.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: /etc/group을 잠글 수 없습니다.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: /etc/gshadow를 잠글 수 없습니다.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1333,9 +1197,10 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: %d번 줄: 그룹을 만들 수 없습니다\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: %d번 줄: %s 사용자가 없습니다\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: `%s' 사용자가 없습니다\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1353,6 +1218,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: %d번 줄: 입력값을 업데이트 할 수 없습니다\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1365,15 +1258,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1442,14 +1335,14 @@
 msgid "The password for %s cannot be changed yet.\n"
 msgstr "%s의 암호는 아직 바꿀 수 없습니다.\n"
 
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: 메모리 부족\n"
-
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 "%s: 사용자의 잠금을 해제하면 암호 없는 계정이 됩니다.\n"
 "이 사용자 계정의 잠금을 풀려면 usermod -p 명령으로 암호를 지정해야 합니다.\n"
@@ -1494,16 +1387,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "유효하지 않은 사용자 이름 '%s'\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "유효하지 않은 사용자 이름 '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "사용자 %s: 그룹이 없습니다 %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "사용자 %s: %s 디렉토리가 없습니다\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "사용자 %s: %s 프로그램이 없습니다\n"
 
 #, c-format
@@ -1514,10 +1415,6 @@
 msgid "add user '%s' in %s? "
 msgstr "사용자 '%s'을(를) %s에 더할까요?"
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: %s의 암호 입력값을 업데이트 할 수 없습니다\n"
-
 msgid "invalid shadow password file entry"
 msgstr "허용되지 않는 셰도우 암호 파일 입력값입니다"
 
@@ -1528,34 +1425,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "사용자 %s: 마지막 암호 바꾼 때가 미래입니다\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: 암호 파일을 잠글 수 없습니다\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: %s 파일을 열 수 없습니다\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: 암호 파일을 잠글 수 없습니다\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "사용법: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: %s의 셰도우 입력값을 지울 수 없습니다\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: 셰도우 파일을 업데이트 할 수 없습니다\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "사용법: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: 암호 파일을 업데이트 할 수 없습니다\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: 사용자 %s의 입력값을 업데이트 할 수 없습니다\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: 셰도우 암호 파일을 지울 수 없습니다\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "su를 통해 이 계정으로 접근하는 것이 거부되었습니다.\n"
 
@@ -1621,6 +1509,16 @@
 "%s: %s\n"
 "(무시됨)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: PAM 인증이 실패했습니다\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "su %s을(를) 하도록 인증이 되지 않았습니다\n"
+
 msgid "No shell\n"
 msgstr "쉘이 없음\n"
 
@@ -1646,14 +1544,6 @@
 msgstr "시스템 정비 모드로 들어가고 있습니다"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: 알 수 없는 GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: 알 수 없는 그룹 %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: 새로운 기본값 파일을 만들 수 없습니다\n"
 
@@ -1673,6 +1563,46 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: 그룹이 너무 많이 명시되었습니다 (최대 %d).\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: useradd [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
+#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#| "                                home directory\n"
+#| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#| "account\n"
+#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#| "  -D, --defaults                print or save modified default useradd\n"
+#| "                                configuration\n"
+#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#| "EXPIRE_DATE\n"
+#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#| "                                user account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#| "  -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"
+#| "  -N, --no-user-group           do not create a group with the same name "
+#| "as\n"
+#| "                                the user\n"
+#| "  -o, --non-unique              allow create user with duplicate\n"
+#| "                                (non-unique) UID\n"
+#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#| "                                account\n"
+#| "  -r, --system                  create a system account\n"
+#| "  -s, --shell SHELL             the login shell for the new user account\n"
+#| "  -u, --uid UID                 force use the UID for the new user "
+#| "account\n"
+#| "  -U, --user-group              create a group with the same name as the "
+#| "user\n"
+#| "\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1693,10 +1623,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1742,15 +1674,6 @@
 "\n"
 
 #, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: 메모리가 부족합니다. 그룹 데이터베이스를 업데이트할 수 없습니다.\n"
-
-#, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr ""
-"%s: 메모리가 부족합니다. 셰도우 그룹 데이터베이스를 업데이트할 수 없습니다.\n"
-
-#, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: 기본 디렉토리 '%s' 잘못되었습니다\n"
 
@@ -1787,50 +1710,14 @@
 msgstr "%s: %s 옵션 및 %s 충돌\n"
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: 쓸 수 없는 사용자 이름 '%s'\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: 암호 파일을 다시 쓸 수가 없습니다\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: 셰도우 암호 파일을 다시 쓸 수가 없습니다\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: 셰도우 암호 파일을 잠글 수 없습니다\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: 셰도우 암호 파일을 열 수 없습니다\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: 그룹 파일을 잠그는 데 오류가 발생했습니다\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: 그룹 파일을 여는 데 오류가 발생했습니다\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: 셰도우 그룹을 잠그는 데 오류가 발생했습니다\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: 그룹 파일을 여는 데 오류가 발생했습니다\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: 새 암호 입력값을 더하는 데 오류가 발생했습니다\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: 새 셰도우 암호 입력값을 더하는 데 오류가 발생했습니다\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: 디렉토리 %s을(를) 만들 수 없습니다\n"
 
@@ -1844,8 +1731,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "메일함의 파일 권한을 설정 중"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: 사용자 %s이(가) 이미 있습니다\n"
 
 #, c-format
@@ -1859,11 +1747,16 @@
 msgid "%s: can't create user\n"
 msgstr "%s: 사용자를 만들 수 없습니다\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u번은 유일하지 않습니다\n"
 
 #, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: 그룹을 만들 수 없습니다\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1871,11 +1764,6 @@
 "%s: 경고: 홈디렉토리가 이미 있습니다.\n"
 "skel 디렉토리에서 파일을 복사하지 않습니다.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr ""
-"%s:경고: CREATE_HOME은 지원하지 않습니다. -m 옵션을 대신 사용하십시오.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1895,51 +1783,26 @@
 "  -r, --remove                  홈 디렉토리와 메일 저장소을 지웁니다\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: 그룹 입력값을 업데이트하는 데 오류가 발생했습니다\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr "%s: %s 그룹은 다른 사용자의 주요 그룹이므로 지울 수 없습니다.\n"
 
 #, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: 셰도우 그룹 항목을 업데이트하는 데 오류가 발생했습니다\n"
-
-#, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: 그룹 파일을 열 수 없습니다\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: 셰도우 그룹 파일을 열 수 없습니다\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: 암호 입력값을 지우는 데 오류가 발생했습니다\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: 셰도우 암호 입력값을 지우는 데 오류가 발생했습니다\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: %s 사용자는 현재 로그인한 상태 입니다\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: 경고: 지울 수 없습니다 "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s은(는) %s의 소유가 아닙니다, 지우지 않습니다\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: 경고: 지울 수 없습니다 "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: 사용자 %s은(는) 없습니다\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: %s 사용자는 NIS 사용자 입니다\n"
 
@@ -2008,10 +1871,22 @@
 "  -U, --unlock                  사용자 계정의 잠금을 해제합니다\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: 새 shadow 그룹 항목을 더하는 데 오류가 발생했습니다\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+"%s: 사용자의 잠금을 해제하면 암호 없는 계정이 됩니다.\n"
+"이 사용자 계정의 잠금을 풀려면 usermod -p 명령으로 암호를 지정해야 합니다.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: 사용자 %s이(가) 이미 있습니다\n"
+
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: 주어진 플래그가 없습니다\n"
@@ -2024,23 +1899,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr "%s: -L, -p, -U 옵션은 한 번에 하나만 쓸 수 있습니다\n"
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: UID %lu번은 유일하지 않습니다\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "이미 멤버가 있습니다\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: 암호 입력값을 바꾸는 데 오류가 발생했습니다\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: 암호 입력값을 지우는 데 오류가 발생했습니다\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: 셰도우 암호 입력값을 지우는 데 오류가 발생했습니다\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: 디렉토리 %s은(는) 이미 있습니다\n"
 
@@ -2061,6 +1925,14 @@
 msgstr "%s: 디렉토리 %s의 이름을 %s(으)로 바꿀 수 없습니다\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: 경고: %s은(는) %s이(가) 소유하고 있지 않습니다\n"
 
@@ -2070,11 +1942,15 @@
 msgid "failed to rename mailbox"
 msgstr "메일함의 이름을 바꾸는 데 실패했습니다"
 
-#, c-format
+#, fuzzy, 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"
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 "%s을(를) 바꿨습니다.\n"
 "앞뒤가 맞으려면 %s도 바꿔야 합니다.\n"
@@ -2102,10 +1978,16 @@
 "                                데이터베이스를 수정합니다\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: 관리자 권한을 버릴 수 없습니다(%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s은(는) 바꾸지 않았습니다\n"
@@ -2119,3 +2001,415 @@
 #, c-format
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: %s을(를) 복구할 수 없습니다: %s (바뀐 사항은 %s에 있습니다)\n"
+
+#~ msgid "%s: can't lock password file\n"
+#~ msgstr "%s: 암호 파일을 잠글 수 없습니다\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: 암호 파일을 열 수 없습니다\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: 셰도우 암호 파일을 잠글 수 없습니다\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: 셰도우 암호 파일을 열 수 없습니다\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: 셰도우 암호 파일을 다시 작성할 수 없습니다\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: 암호 파일을 다시 작성할 수 없습니다\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: 암호 파일을 업데이트 할 수 없습니다\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: 셰도우 암호 파일을 업데이트 할 수 없습니다\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\t이름: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\t방 번호: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\t직장 번화번호: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\t집 전화번호: %s\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "암호 파일을 열 수가 없습니다.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: 그룹 파일을 잠글 수 없습니다\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: 그룹 파일을 열 수 없습니다\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: 그룹 셰도우 파일을 잠글 수 없습니다\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: 셰도우 파일을 열 수 없습니다\n"
+
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: 그룹 셰도우 파일을 업데이트하는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: 그룹 파일을 업데이트하는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: %d번 줄: 알 수 없는 그룹 %s\n"
+
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: %d번 줄: 그룹 항목을 업데이트 할 수 없습니다\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: 셰도우 파일을 잠글 수 없습니다\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: 셰도우 파일을 업데이트하는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: 암호 파일을 업데이트하는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: %d번 줄: 알 수 없는 사용자 %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: %d번 줄: 암호 항목을 업데이트 할 수 없습니다\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: 알 수 없는 사용자\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "알 수 없는 사용자: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "사용법: %s [-r|-R] 그룹\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a 사용자] 그룹\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d 사용자] 그룹\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A 사용자,...] [-M 사용자,...] 그룹\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M 사용자,...] 그룹\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: 잠금을 할 수 없습니다\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: 셰도우 잠금을 할 수 없습니다\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: 파일을 열 수 없습니다\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: 파일을 다시 쓸 수 없습니다\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: 셰도우 파일을 다시 쓸 수 없습니다\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: 파일 잠금을 해제할 수 없습니다\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: 입력값을 업데이트 할 수 없습니다\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: 셰도우 입력값을 업데이트 할 수 없습니다\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "알 수 없는 그룹: %s\n"
+
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: 파일을 닫을 수 없습니다\n"
+
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: 셰도우 파일을 닫을 수 없습니다\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "누구십니까?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: 알 수 없는 그룹 멤버 %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: 새 그룹을 더하는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: 그룹 파일을 다시 쓸 수 없습니다\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: 셰도우 그룹 파일을 다시 쓸 수 없습니다\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: 그룹 파일을 잠글 수 없습니다\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: 그룹 파일을 열 수가 없습니다\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: 셰도우 그룹 파일 잠글 수 없습니다\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: 셰도우 그룹 파일을 열 수 없습니다\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u번은 유일하지 않습니다\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: 그룹 입력값을 지우는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: 셰도우 그룹 입력값을 지우는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: 사용자의 주요 그룹은 지울 수 없습니다.\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "지우려는 멤버가 없습니다\n"
+
+#~ msgid ""
+#~ "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+#~ msgstr ""
+#~ "사용법: groupmems -a <사용자이름> | -d <사용자이름> | -D | -l [-g <그룹이"
+#~ "름>]\n"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "루트 사용자만 그룹에 멤버를 더할 수 있습니다\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "그룹 접근 권한이 필요합니다\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "현재 그룹의 소유자가 아닙니다\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "다음에 대해 PAM 인증이 실패했습니다\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "그룹 파일을 잠글 수 없습니다\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "그룹 파일을 열 수 없습니다\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "그룹 파일을 닫을 수 없습니다\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s은(는) /etc/group에 없습니다\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: GID %u번은 유일한 GID가 아닙니다\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s은(는) 유일한 이름이 아닙니다\n"
+
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: passwd 파일을 다시 쓸 수 없습니다\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: 암호 파일 잠금을 할 수 없습니다\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: 암호 파일을 열 수 없습니다\n"
+
+#~ msgid ""
+#~ "%s: cannot change the primary group of user '%s' from %u to %u, since it "
+#~ "is not in the passwd file.\n"
+#~ msgstr ""
+#~ "%s: '%s' 사용자의 주요 그룹을 %u번에서 %u번으로 바꿀 수 없습니다. 이 그룹"
+#~ "은 passwd 파일에 들어 있지 않습니다.\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: %s 파일을 잠글 수 없습니다\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: %s의 셰도우 입력값을 업데이트 할 수 없습니다\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: %s 그룹 입력값을 업데이트 할 수 없습니다\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: 셰도우 그룹 파일을 잠글 수 없습니다\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: 셰도우 그룹 파일을 열 수 없습니다\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: 셰도우 그룹 %s을(를) 지울 수 없습니다\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: 셰도우 그룹 파일을 업데이트 할 수 없습니다\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: 그룹 파일을 업데이트 할 수 없습니다\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: 셰도우 그룹 파일을 지울 수 없습니다\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "알 수 없는 UID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "알 수 없는 GID: %lu\n"
+
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: `%s' 그룹 ID는 쓸 수 없습니다\n"
+
+#~ msgid ""
+#~ "%s: group %s created, failure during the creation of the corresponding "
+#~ "gshadow group\n"
+#~ msgstr ""
+#~ "%s: %s 그룹을 만들었습니다, 다음 그룹 셰도우 그룹을 만드는 데 실패\n"
+
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: `%s' 사용자 ID는 쓸 수 없습니다\n"
+
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: `%s' 사용자 이름은 쓸 수 없습니다\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: /etc/passwd를 잠글 수 없습니다.\n"
+
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: /etc/shadow를 잠글 수 없습니다.\n"
+
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: /etc/group을 잠글 수 없습니다.\n"
+
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: /etc/gshadow를 잠글 수 없습니다.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: 파일을 열 수가 없습니다\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: 파일을 업데이트 하는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: %d번 줄: %s 사용자가 없습니다\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: %s의 암호 입력값을 업데이트 할 수 없습니다\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: 암호 파일을 잠글 수 없습니다\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: 암호 파일을 잠글 수 없습니다\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: %s의 셰도우 입력값을 지울 수 없습니다\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: 셰도우 파일을 업데이트 할 수 없습니다\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: 암호 파일을 업데이트 할 수 없습니다\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: 사용자 %s의 입력값을 업데이트 할 수 없습니다\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: 셰도우 암호 파일을 지울 수 없습니다\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: 알 수 없는 GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: 알 수 없는 그룹 %s\n"
+
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr ""
+#~ "%s: 메모리가 부족합니다. 셰도우 그룹 데이터베이스를 업데이트할 수 없습니"
+#~ "다.\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: 암호 파일을 다시 쓸 수가 없습니다\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: 셰도우 암호 파일을 다시 쓸 수가 없습니다\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: 셰도우 암호 파일을 잠글 수 없습니다\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: 셰도우 암호 파일을 열 수 없습니다\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: 그룹 파일을 잠그는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: 그룹 파일을 여는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: 셰도우 그룹을 잠그는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: 그룹 파일을 여는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: 새 암호 입력값을 더하는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: 새 셰도우 암호 입력값을 더하는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr ""
+#~ "%s:경고: CREATE_HOME은 지원하지 않습니다. -m 옵션을 대신 사용하십시오.\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: 그룹 입력값을 업데이트하는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: 셰도우 그룹 항목을 업데이트하는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: 그룹 파일을 열 수 없습니다\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: 셰도우 그룹 파일을 열 수 없습니다\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: 암호 입력값을 지우는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: 셰도우 암호 입력값을 지우는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: 사용자 %s은(는) 없습니다\n"
+
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: 새 shadow 그룹 항목을 더하는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: UID %lu번은 유일하지 않습니다\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: 암호 입력값을 바꾸는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: 암호 입력값을 지우는 데 오류가 발생했습니다\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: 셰도우 암호 입력값을 지우는 데 오류가 발생했습니다\n"

Modified: upstream/trunk/po/nb.po
===================================================================
--- upstream/trunk/po/nb.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/nb.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -58,6 +58,9 @@
 msgid "  Choose a new password."
 msgstr "  Velg et nytt passord."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Ditt passord vil utløpe om %ld dager.\n"
@@ -69,7 +72,12 @@
 msgstr "Ditt passord vil utløpe i dag."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Kan ikke endre tty %s"
 
 msgid "Environment overflow\n"
@@ -93,14 +101,14 @@
 "%d mislykte siden forrige innlogging.\n"
 "Forrige var %s på %s.\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "%s: klarer ikke å få entydig GID\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
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s: klarer ikke å få entydig GID\n"
-
 msgid "Too many logins.\n"
 msgstr "For mange innlogginger.\n"
 
@@ -190,9 +198,18 @@
 msgstr "Kan ikke finne ut ditt terminalnavn."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: slapp opp for minne\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) mislyktes\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "Nei\n"
+
 msgid "Password: "
 msgstr "Passord: "
 
@@ -200,6 +217,11 @@
 msgid "%s's Password: "
 msgstr "%s's Passord: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: feltene er for lange\n"
+
 #, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
@@ -298,42 +320,33 @@
 msgstr "%s: Ikke tillatelse.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Kan ikke avgjøre ditt brukernavn.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM autentisering mislyktes\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: kan ikke låse passordfila\n"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: kan ikke låse filene, prøv igjen senere\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: kan ikke åpne passordfila\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: kan ikke åpne fila %s\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: kan ikke låse skyggepassordfila\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: mislykket fork: %s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: kan ikke åpne skyggepassordfila\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: klarte ikke minske privilegier (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: kan ikke gjenskrive skyggepassordfila\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: kan ikke gjenskrive passordfila\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: kan ikke oppdatere passordfila\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: kan ikke oppdatere skyggepassordfila\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: skyggepassordfila finnes ikke\n"
 
@@ -341,9 +354,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: bruker %s finnes ikke\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -368,57 +381,27 @@
 msgid "Full Name"
 msgstr "Fullstendig navn"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tFullstendig navn: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Romnummer"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tRomnummer: %s\n"
-
 msgid "Work Phone"
 msgstr "Jobbtelefon"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tJobbtelefon: %s\n"
-
 msgid "Home Phone"
 msgstr "Hjemtelefon"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tHjemtelefon: %s\n"
-
 msgid "Other"
 msgstr "Annet"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Kan ikke endre ID til root.\n"
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Kan ikke låse passordfila; forsøk senere.\n"
-
-msgid "Cannot open the password file.\n"
-msgstr "Kan ikke åpne passordfila.\n"
-
 #, c-format
-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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -451,9 +434,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: «%s» inneholder ugyldige tegn\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Kan ikke avgjøre ditt brukernavn.\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: bruker %s finnes ikke\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -501,7 +484,7 @@
 msgstr "%s: ugyldig numerisk argument «%s»\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: -a er BARE tillatt sammen med -G\n"
 
 #, c-format
@@ -513,30 +496,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: klarer ikke å låse gruppefila\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: klarer ikke å åpne gruppefila\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: klarer ikke å låse gshadow-fila\n"
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-msgstr "%s: kan ikke åpne shadow-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"
 
@@ -544,38 +503,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: linje %d: mangler nytt passord\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: linje %d: ukjent gruppe %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: gruppa %s finnes ikke\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: bruker %s finnes ikke\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: feil ved oppdatering av shadow-fila\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: feil ved oppdatering av passordfila\n"
-
-#, c-format
-msgid "%s: line %d: unknown user %s\n"
-msgstr "%s: linje %d: ukjent bruker %s\n"
-
-#, 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"
@@ -596,8 +541,9 @@
 msgid "Login Shell"
 msgstr "Innloggingsskall"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Du kan ikke endre skallet til %s.\n"
 
 #, c-format
@@ -608,24 +554,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: ugyldig inntasting: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s er et ugyldig skall.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Bruk: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: ukjent bruker\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -654,11 +616,16 @@
 "                                eller -l) bare for bruker BRUKER\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Logginn       Mislykt Maksimum Siste                   På\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds igjen]"
 
 #, c-format
@@ -666,76 +633,67 @@
 msgstr " [%lds lås]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Ukjent bruker: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Bruk: %s [-r|-R] gruppe\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "      %s [-a bruker] gruppe\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "      %s [-d bruker] gruppe\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Ukjent bruker: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "      %s [-A bruker,...] [-M bruker,...] gruppe\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: kan ikke åpne fila %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "      %s [-M bruker,...] gruppe\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: shadow gruppepassord kreves for -A\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: kan ikke låse\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: klarer ikke å låse shadow-fila\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Passordet for %s kan ikke endres.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: kan ikke åpne fila\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: shadow gruppepassord kreves for -A\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: kan ikke åpne fila\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: gruppa %s finnes ikke\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: kan ikke åpne shadow-fila\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: mislykket fork: %s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -754,9 +712,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Prøv igjen senere\n"
 
-msgid "Who are you?\n"
-msgstr "Hvem er du?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Legger til brukere i  %s gruppen %s\n"
@@ -765,9 +720,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: bruker %s finnes ikke\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -802,116 +757,89 @@
 "                                GID\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: feil ved oppretting av ny gruppeoppføring\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s er ikke et gyldig gruppenavn\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: klarer ikke å omskrive gruppefila\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "ugyldig gruppenavn «%s»\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: klarer ikke å omskrive shadow-fila\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: klarer ikke å låse gruppefila\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: klarer ikke å åpne gruppefila\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: klarer ikke å låse shadow-gruppefila\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: klarer ikke å åpne shadow-gruppefila\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K krever KEY=VALUE\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 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 "%s: GID '%lu' already exists\n"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: kan ikke opprette %s\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "Bruk: groupdel gruppe\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: feil ved fjerning av gruppeoppføring\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: kunne ikke endre navn på mappa %s til %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: feil ved sletting av shadow-gruppeoppføring\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: kan ikke endre bruker «%s» på NIS-klienten.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: kan ikke fjerne brukerens primærgruppe.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: gruppa %s finnes ikke\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: gruppa %s er en NIS gruppe\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: gruppe «%s» er en NIS gruppe.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s er NIS sjefen\n"
 
-msgid "Member already exists\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: bruker %s er ikke en NIS bruker\n"
 
-msgid "Member to remove could not be found\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: slapp opp for minne i update_group\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
 
-msgid "Only root can add members to different groups\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
 msgstr ""
 
-msgid "Group access is required\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr ""
-
 #, fuzzy
-msgid "PAM authentication failed for\n"
-msgstr "%s: PAM autentisering mislyktes\n"
-
-#, fuzzy
-msgid "Unable to lock group file\n"
-msgstr "%s: klarer ikke å låse gruppefila\n"
-
-#, fuzzy
-msgid "Unable to open group file\n"
-msgstr "%s: klarer ikke å åpne gruppefila\n"
-
-#, fuzzy
-msgid "Cannot close group file\n"
-msgstr "%s: kan ikke åpne gruppefila\n"
-
-#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -937,41 +865,19 @@
 "                                GID\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s ikke funnet i /etc/group\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u er ikke en entydig GID\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s er ikke et entydig navn\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: kan ikke skrive passordfila på nytt\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "ugyldig gruppenavn «%s»\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: klarte ikke å låse passordfila\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: gruppa %s er en NIS gruppe\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: klarte ikke å åpne passordfila\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: ukjent bruker %s\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: kan ikke endre bruker «%s» på NIS-klienten.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Bruk: %s [-r] [-s] [gruppe [gshadow]]\n"
 
@@ -983,18 +889,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s og -r kan ikke brukes samtidig\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: kan ikke låse fila %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "ugyldig oppføring i gruppefila"
 
@@ -1009,6 +903,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "ugyldig gruppenavn «%s»\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "ugyldig gruppenavn «%s»\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "gruppe %s: ingen bruker %s\n"
@@ -1021,18 +920,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "fant ingen tilsvarende oppføring i %s\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "Legg til gruppe «%s» i %s?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: kan ikke oppdatere shadow-oppføringen for %s\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: kan ikke oppdatere oppføringen for gruppa %s\n"
-
 msgid "invalid shadow group file entry"
 msgstr "ugyldig oppføring i shadow-gruppefila"
 
@@ -1059,30 +951,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: ingen endringer\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: kan ikke låse shadow-gruppefila\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Bruk: groupdel gruppe\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: kan ikke åpne shadow-gruppefila\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Bruk: groupdel gruppe\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: kan ikke fjerne shadow-gruppe %s\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: kan ikke oppdatere fila %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: kan ikke oppdatere shadow-gruppefila\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: kan ikke oppdatere gruppefila\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: kan ikke slette shadow-gruppefila\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Bruk: id [-a]\n"
 
@@ -1112,6 +995,10 @@
 "  -u, --user BRUKER             skriv oppføringer for bruker BRUKER\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Brukernavn         Port     Fra             Sist"
 
@@ -1121,15 +1008,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Bruk: %s [-p] [navn]\n"
 
@@ -1226,6 +1113,11 @@
 "innloggingstid overskredet\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Bruk: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Bruk: newgrp [-] [gruppe]\n"
 
@@ -1240,14 +1132,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: mislykket fork: %s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "ukjent UID: %u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: bruker %s finnes ikke\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "ukjent GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "for mange grupper\n"
 
@@ -1261,60 +1149,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: gruppa %s finnes ikke\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "ugyldig gruppenavn «%s»\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: ugyldig brukernavn «%s»\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: bruker %s finnes ikke\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: bruker %s finnes ikke\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: ugyldig brukernavn «%s»\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: kan ikke låse /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: kan ikke låse /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: kan ikke låse /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: kan ikke låse /etc/passwd.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1330,9 +1177,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: linje %d: kan ikke opprette GID\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: linje %d: kan ikke finne bruker %s\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: bruker %s finnes ikke\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1363,15 +1210,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1440,13 +1287,10 @@
 msgstr "Passordet for %s kan ikke endres.\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: slapp opp for minne\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1489,16 +1333,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "ugyldig brukernavn «%s»\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "ugyldig brukernavn «%s»\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "bruker %s: ingen gruppe %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "bruker %s: mappe %s finnes ikke\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "bruker %s: programmet %s finnes ikke\n"
 
 #, c-format
@@ -1509,10 +1361,6 @@
 msgid "add user '%s' in %s? "
 msgstr "legg til bruker «%s» i %s? "
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: klarer ikke å endre passord-oppføringen for %s\n"
-
 msgid "invalid shadow password file entry"
 msgstr "ugyldig oppføring i shadow-passordfila"
 
@@ -1523,34 +1371,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "bruker %s: seneste passordendring i fremtiden\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: klarte ikke å låse passordfila\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: kan ikke åpne fila %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: klarte ikke å åpne passordfila\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Bruk: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: klarte ikke å fjerne shadow-oppføring for %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: klarer ikke å oppdatere shadow-fila\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Bruk: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: klarer ikke å oppdatere passordfila\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: klarer ikke å oppdatere oppføring for bruker %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: kan ikke slette shadow-passordfila\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "NEKTET tilgang til su til den kontoen.\n"
 
@@ -1617,6 +1456,16 @@
 "%s: %s\n"
 "(Ignorert)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: PAM autentisering mislyktes\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Du har ikke adgang til å su %s\n"
+
 msgid "No shell\n"
 msgstr "Mangler skall\n"
 
@@ -1642,14 +1491,6 @@
 msgstr "Starter systemvedlikeholds-modus"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: ukjent GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: ukjent gruppe %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: klarer ikke å opprette ny «defaults»-fil\n"
 
@@ -1690,10 +1531,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1732,14 +1575,6 @@
 "  -u, --uid UID                 bruk UID for den nye brukerkontoen\n"
 "\n"
 
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: slapp opp for minne i update_group\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: slapp opp for minne i update_gshadow\n"
-
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: ugyldig basismappe «%s»\n"
@@ -1777,50 +1612,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: ugyldig brukernavn «%s»\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: kan ikke skrive passordfila på nytt\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: kan ikke skrive shadow-passordfila på nytt\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: klarte ikke å låse shadow-passordfila\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: klarte ikke å åpne shadow-passordfila\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: feil ved låsing av gruppefila\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: feil ved åpning av gruppefila\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: feil ved låsing av shadow-gruppefila\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: feil ved åpning av shadow-gruppefila\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: feil ved innlegging av ny passord-oppføring\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: feil ved innlegging av ny shadow passord-oppføring\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: kan ikke opprette mappa %s\n"
 
@@ -1836,8 +1635,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Setter rettigheter for postkassefil"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: bruker %s finnes\n"
 
 #, c-format
@@ -1851,10 +1651,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s: kan ikke opprette %s\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u er ikke entydig\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: kan ikke opprette %s\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1863,10 +1668,6 @@
 "%s: advarsel: hjemmemappa finnes fra før.\n"
 "Kopierer ikke filer dit fra skel-mappa.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr "%s: advarsel: CREATE_HOME ikke støttet, bruk -m istedenfor.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1886,52 +1687,27 @@
 "  -r, --remove                  slett hjemmemappa og postkassa\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: feil ved oppdatering av gruppe-oppføring\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: kan ikke fjerne gruppe %s som er en primærgruppe for en annen bruker.\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: feil ved oppdatering av gruppe-oppføring\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: kan ikke åpne gruppefila\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: kan ikke åpne shadow-gruppefila\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: feil ved sletting av passord-oppføring\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: feil ved sletting av shadow passordoppføring\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: brukeren %s er pålogget\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: advarsel: kan ikke fjerne "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s ikke eid av %s, ikke fjernet\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: advarsel: kan ikke fjerne "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: bruker %s finnes ikke\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: bruker %s er ikke en NIS bruker\n"
 
@@ -1981,9 +1757,16 @@
 "  -f, --inactive INAKTIV        passordet settes inaktivt etter utløp\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: feil ved oppretting av ny gruppeoppføring\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: bruker %s finnes\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -1998,22 +1781,10 @@
 msgstr ""
 
 #, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: uid %lu er ikke entydig\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr ""
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: feil ved endring av passordoppføring\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: feil ved sletting av passordoppføring\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: feil ved sletting av shadow passord-oppføring\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: mappa %s finnes\n"
 
@@ -2035,6 +1806,14 @@
 msgstr "%s: kunne ikke endre navn på mappa %s til %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: advarsel: %s er ikke eid av %s\n"
 
@@ -2048,7 +1827,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -2072,10 +1851,16 @@
 "  -s, --shadow                  rediger shadow- eller gshadow-databasen\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: klarte ikke minske privilegier (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s er ikke endret\n"
@@ -2090,6 +1875,406 @@
 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: can't lock password file\n"
+#~ msgstr "%s: kan ikke låse passordfila\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: kan ikke åpne passordfila\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: kan ikke låse skyggepassordfila\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: kan ikke åpne skyggepassordfila\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: kan ikke gjenskrive skyggepassordfila\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: kan ikke gjenskrive passordfila\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: kan ikke oppdatere passordfila\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: kan ikke oppdatere skyggepassordfila\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tFullstendig navn: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tRomnummer: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tJobbtelefon: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tHjemtelefon: %s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr "Kan ikke låse passordfila; forsøk senere.\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Kan ikke åpne passordfila.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: klarer ikke å låse gruppefila\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: klarer ikke å åpne gruppefila\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: klarer ikke å låse gshadow-fila\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: kan ikke åpne shadow-fila\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: feil ved oppdatering av shadow-fila\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: feil ved oppdatering av gruppe-oppføring\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: linje %d: ukjent gruppe %s\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: linje %d: kan ikke oppdatere oppføring\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: kan ikke låse shadow-fila\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: feil ved oppdatering av shadow-fila\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: feil ved oppdatering av passordfila\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: linje %d: ukjent bruker %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: linje %d: kan ikke oppdatere passordlinja\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: ukjent bruker\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Ukjent bruker: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Bruk: %s [-r|-R] gruppe\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "      %s [-a bruker] gruppe\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "      %s [-d bruker] gruppe\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "      %s [-A bruker,...] [-M bruker,...] gruppe\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "      %s [-M bruker,...] gruppe\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: kan ikke låse\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: klarer ikke å låse shadow-fila\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: kan ikke åpne fila\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: klarer ikke å omskrive fila\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: klarer ikke å omskrive shadow-fila\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: kan ikke låse opp filen\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: klarer ikke å oppdatere oppføringen\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: klarer ikke å oppdatere oppføringen i shadow-fila\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "ukjent gruppe: %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: kan ikke åpne fila\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: kan ikke åpne shadow-fila\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Hvem er du?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: ukjent medlem %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: feil ved oppretting av ny gruppeoppføring\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: klarer ikke å omskrive gruppefila\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: klarer ikke å omskrive shadow-fila\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: klarer ikke å låse gruppefila\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: klarer ikke å åpne gruppefila\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: klarer ikke å låse shadow-gruppefila\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: klarer ikke å åpne shadow-gruppefila\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u er ikke entydig\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: feil ved fjerning av gruppeoppføring\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: feil ved sletting av shadow-gruppeoppføring\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: kan ikke fjerne brukerens primærgruppe.\n"
+
+#, fuzzy
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "%s: PAM autentisering mislyktes\n"
+
+#, fuzzy
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "%s: klarer ikke å låse gruppefila\n"
+
+#, fuzzy
+#~ msgid "Unable to open group file\n"
+#~ msgstr "%s: klarer ikke å åpne gruppefila\n"
+
+#, fuzzy
+#~ msgid "Cannot close group file\n"
+#~ msgstr "%s: kan ikke åpne gruppefila\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s ikke funnet i /etc/group\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u er ikke en entydig GID\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s er ikke et entydig navn\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: kan ikke skrive passordfila på nytt\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: klarte ikke å låse passordfila\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: klarte ikke å åpne passordfila\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: kan ikke låse fila %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: kan ikke oppdatere shadow-oppføringen for %s\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: kan ikke oppdatere oppføringen for gruppa %s\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: kan ikke låse shadow-gruppefila\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: kan ikke åpne shadow-gruppefila\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: kan ikke fjerne shadow-gruppe %s\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: kan ikke oppdatere shadow-gruppefila\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: kan ikke oppdatere gruppefila\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: kan ikke slette shadow-gruppefila\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "ukjent UID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "ukjent GID: %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: gruppa %s finnes ikke\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: bruker %s finnes ikke\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: ugyldig brukernavn «%s»\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: kan ikke låse /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: kan ikke låse /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: kan ikke låse /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: kan ikke låse /etc/passwd.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: kan ikke åpne filer\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: feil ved oppdatering av filer\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: linje %d: kan ikke finne bruker %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: klarer ikke å endre passord-oppføringen for %s\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: klarte ikke å låse passordfila\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: klarte ikke å åpne passordfila\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: klarte ikke å fjerne shadow-oppføring for %s\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: klarer ikke å oppdatere shadow-fila\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: klarer ikke å oppdatere passordfila\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: klarer ikke å oppdatere oppføring for bruker %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: kan ikke slette shadow-passordfila\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: ukjent GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: ukjent gruppe %s\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: slapp opp for minne i update_gshadow\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: kan ikke skrive passordfila på nytt\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: kan ikke skrive shadow-passordfila på nytt\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: klarte ikke å låse shadow-passordfila\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: klarte ikke å åpne shadow-passordfila\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: feil ved låsing av gruppefila\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: feil ved åpning av gruppefila\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: feil ved låsing av shadow-gruppefila\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: feil ved åpning av shadow-gruppefila\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: feil ved innlegging av ny passord-oppføring\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: feil ved innlegging av ny shadow passord-oppføring\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr "%s: advarsel: CREATE_HOME ikke støttet, bruk -m istedenfor.\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: feil ved oppdatering av gruppe-oppføring\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: feil ved oppdatering av gruppe-oppføring\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: kan ikke åpne gruppefila\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: kan ikke åpne shadow-gruppefila\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: feil ved sletting av passord-oppføring\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: feil ved sletting av shadow passordoppføring\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: bruker %s finnes ikke\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: feil ved oppretting av ny gruppeoppføring\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: uid %lu er ikke entydig\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: feil ved endring av passordoppføring\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: feil ved sletting av passordoppføring\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: feil ved sletting av shadow passord-oppføring\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: klarer ikke å få entydig GID\n"
 
@@ -2099,18 +2284,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " på «%.100s»"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: kan ikke låse filene, prøv igjen senere\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: linje %d: kan ikke opprette UID\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/ne.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -56,6 +56,9 @@
 msgid "  Choose a new password."
 msgstr "  नयाँ पासवर्ड रोज्नुहोस् ।"
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "तपाईँको पासवर्डको म्याद %ld दिनमा समाप्त हुन्छ ।\n"
@@ -67,7 +70,12 @@
 msgstr "तपाईँको पासवर्डको म्याद आज समाप्त हुनेछ ।"
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "tty %s लाई परिवर्तन गर्न असक्षम भयो"
 
 msgid "Environment overflow\n"
@@ -91,14 +99,14 @@
 "%d अन्तिम लगइन देखिअसफल भयो ।\n"
 "अन्तिम %s मा %s थियो ।\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\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: Can't get unique UID (no more available UIDs)\n"
 msgstr "%s: अद्वितिय UID प्राप्त गर्न सकिएन\n"
 
-#, fuzzy
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s: अद्वितिय GID प्राप्त गर्न सकिएन\n"
-
 msgid "Too many logins.\n"
 msgstr "अति धेरै लगइनहरू ।\n"
 
@@ -190,9 +198,18 @@
 msgstr "तपाईँको tty नाम निर्धारण गर्न सकिएन।"
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: स्मृति भन्दा बाहिर\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) असफल भयो\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "होइन\n"
+
 msgid "Password: "
 msgstr "पासवर्ड: "
 
@@ -200,6 +217,11 @@
 msgid "%s's Password: "
 msgstr "'%s' को पासवर्ड: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: अति लामो फाँट\n"
+
 #, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
@@ -296,42 +318,33 @@
 msgstr "%s: अनुमति अस्वीकार गरियो ।\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: तपाईँको प्रयोगकर्ता नाम निर्धारण गर्न सकिएन ।\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM आधिकरण असफल भयो\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: पासवर्ड फाइलमा ताल्चा मार्न सकिदैन\n"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: फाइलहरू ताल्चा मार्न सकिएन, पछि फेरी प्रयास गर्नुहोस्\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: पासवर्ड फाइल खोल्न सकिएन\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: फाइल %s खोल्न सकिएन\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: स्याडो पासवर्ड फाइल ताल्चा मार्न सकिएन\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: फोर्क गर्दा असफल: %s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: स्याडो पासवर्ड फाइल खोल्न सकिएन\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: विशेषधिकारहरू छोड्न असफल भयो (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: स्याडो पासवर्ड फाइल पुन:लेखन गर्न सकिएन\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: पासवर्ड फाइल पुन:लेखन गर्न सकिएन\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: पासवर्ड फाइल अद्यावधिक गर्न सकिएन\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: स्याडो पासवर्ड फाइल अद्यावधिक गर्न सकिएन\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: स्याडो पासवर्ड फाइल प्रस्तुत भएको छैन\n"
 
@@ -339,9 +352,9 @@
 msgid "%s: failed to drop privileges (%s)\n"
 msgstr "%s: विशेषधिकारहरू छोड्न असफल भयो (%s)\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: अज्ञात प्रयोगकर्ता %s\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: प्रयोगकर्ता %s अवस्थित छैन\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -366,57 +379,27 @@
 msgid "Full Name"
 msgstr "पुरा नाम"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tपूरा नाम: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "कोठा नम्बर"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tकोठा नम्बर: %s\n"
-
 msgid "Work Phone"
 msgstr "कार्य फोन"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tकार्य फोन: %s\n"
-
 msgid "Home Phone"
 msgstr "गृह फोन"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tगृह फोन: %s\n"
-
 msgid "Other"
 msgstr "अन्य"
 
 msgid "Cannot change ID to root.\n"
 msgstr "ID लाई मूलमा परिवर्तन गर्न सकिदैन ।\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 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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -449,9 +432,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' ले गैरकानूनी क्यारेक्टरहरू समाविष्ट गर्दछ\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: तपाईँको प्रयोगकर्ता नाम निर्धारण गर्न सकिएन ।\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: प्रयोगकर्ता %s अवस्थित छैन\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -500,7 +483,7 @@
 msgstr "%s: अवैध संख्यात्मक तर्क '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: -a फ्ल्याग -G फ्ल्याग संग मात्र अनुमति छ\n"
 
 #, c-format
@@ -512,30 +495,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: समूह फाइल ताल्चा मार्न सकिदैन\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: समूह फाइल खोल्न सकिदैन\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: जि स्याडो फाइल ताल्चा मार्न सकिएन\n"
-
-#, c-format
-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"
 
@@ -543,38 +502,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: रेखा %d: नयाँ पासवर्ड हराइरहेको छ\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: रेखा %d: अज्ञात समूह %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: समूह %s अवस्थित छैन\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: प्रयोगकर्ता %s अवस्थित छैन\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: स्याडो फाइल अद्यावधिक गर्दा त्रुटि\n"
-
-#, c-format
-msgid "%s: error updating password 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"
-
 #, fuzzy
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
@@ -595,8 +540,9 @@
 msgid "Login Shell"
 msgstr "शेल लगइन"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "तपाईँ यस को लागि शेल परिवर्तन गर्न सक्नुहुन्न %s ।\n"
 
 #, c-format
@@ -607,17 +553,14 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: अवैध प्रविष्टि: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s अवैध शेल हो ।\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "उपयोग: अवधि {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: अज्ञात प्रयोगकर्ता\n"
-
 #, fuzzy
 msgid ""
 "Usage: faillog [options]\n"
@@ -625,7 +568,7 @@
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -651,11 +594,16 @@
 "\t\t\t\tप्रयोगकर्ताको लागि LOGIN संगै \n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "सबैभन्दा पछि                  असफल भएको                           लगइन\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds left]"
 
 #, c-format
@@ -663,76 +611,67 @@
 msgstr " [%lds lock]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "अज्ञात प्रयोगकर्ता: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "उपयोग: %s [-r|-R] समूह\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-एउटा प्रयोगकर्ता] समूह\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d प्रयोगकर्ता] समूह\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "अज्ञात प्रयोगकर्ता: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A प्रयोगकर्ता,...] [-M प्रयोगकर्ता,...] समूह\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: फाइल %s खोल्न सकिएन\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M प्रयोगकर्ता,...] समूह\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: स्याडो समूह पासवर्डहरुलाई -A को आवश्यक छ\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: ताल्चा प्राप्त गर्न सकिएन\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: स्याडो ताल्चा प्राप्त गर्न सकिएन\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "%s को लागि पासवर्ड परिवर्तन गर्न सकिदैन ।\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: फाइल खोल्न सकिएन\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: स्याडो समूह पासवर्डहरुलाई -A को आवश्यक छ\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: फाइल खोल्न सकिएन\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: समूह %s अवस्थित छैन\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: स्याडो फाइल खोल्न सकिएन\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: फोर्क गर्दा असफल: %s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -751,9 +690,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: पछि फेरी प्रयास गर्नुहोस्\n"
 
-msgid "Who are you?\n"
-msgstr "तपाईँ को हो ?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "समूह %s मा प्रयोगकर्ता %s थप गरिदैछ\n"
@@ -762,9 +698,9 @@
 msgid "Removing user %s from group %s\n"
 msgstr "समूह %s बाट प्रयोगकर्ता %s हटाइदैछ\n"
 
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: अज्ञात सदस्य %s\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: प्रयोगकर्ता %s अवस्थित छैन\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -798,116 +734,89 @@
 "\t\t\t\t(non-unique) GID\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: नयाँ समूह प्रविष्टि थप गर्दा त्रुटि\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s वैध समूह नाम होइन\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: समूह फाइल पुन:लेखन गर्न सकिएन\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "अवैध समूह नाम '%s'\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: स्याडो समूह फाइल पुन:लेखन गर्न सकिएन\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: समूह फाइल ताल्चा मार्न असक्षम भयो\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: समूह फाइल खोल्न असक्षम भयो\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: स्याडो समूह फाइल ताल्चा मार्न असफल भयो\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: स्याडो समूह फाइल खोल्न असक्षम भयो\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K लाई KEY=VALUE को आवश्यक पर्दछ\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 msgstr "%s: समूह %s अवस्थित छ\n"
 
 #, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u अद्वितिय होइन\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: यो %s सिर्जना गर्न सकिदैन\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "उपयोग: groupdel समूह नाम\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: समूह प्रविष्टि हटाउँदा त्रुटि\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: डाइरेक्ट्री %s लाई %s मा पुन:नामकरण गर्न सकिदैन\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: स्याडो समूह प्रविष्टि हटाउँदा त्रुटि\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: NIS ग्राहकमा प्रयोगकर्ता '%s' परिवर्तन गर्न सकिदैन ।\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: प्रयोगकर्ताको प्राइमेरी समूह हटाउन सकिएन ।\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: समूह %s अवस्थित छैन\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: समूह %s NIS समूह हो\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: समूह '%s' NIS समूह हो ।\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s NIS मास्टर हो\n"
 
-msgid "Member already exists\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: प्रयोगकर्ता %s NIS प्रयोगकर्ता हो\n"
 
-msgid "Member to remove could not be found\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: update_group मा स्मृति भन्दा बाहिर\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
 
-msgid "Only root can add members to different groups\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
 msgstr ""
 
-msgid "Group access is required\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr ""
-
 #, fuzzy
-msgid "PAM authentication failed for\n"
-msgstr "%s: PAM आधिकरण असफल भयो\n"
-
-#, fuzzy
-msgid "Unable to lock group file\n"
-msgstr "%s: समूह फाइल ताल्चा मार्न असक्षम भयो\n"
-
-#, fuzzy
-msgid "Unable to open group file\n"
-msgstr "%s: समूह फाइल खोल्न असक्षम भयो\n"
-
-#, fuzzy
-msgid "Cannot close group file\n"
-msgstr "%s: समूह फाइल खोल्न सकिदैन\n"
-
-#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -932,41 +841,19 @@
 "\t\t\t\t(non-unique) GID\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s /etc/group मा फेला परेन\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u अद्वितिय GID होइन\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s अद्वितिय नाम होइन\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: पासवर्ड फाइल पुन:लेखन गर्न सकिएन\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "अवैध समूह नाम '%s'\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: पासवर्ड फाइल ताल्चा मार्न असक्षम छ\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: समूह %s NIS समूह हो\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: पासवर्ड फाइल खोल्न असक्षम भयो\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: अज्ञात प्रयोगकर्ता %s\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: NIS ग्राहकमा प्रयोगकर्ता '%s' परिवर्तन गर्न सकिदैन ।\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "उपयोग: %s [-r] [-s] [group [gshadow]]\n"
 
@@ -978,18 +865,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s र -r मिल्दोजुल्दो छैन\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: फाइल %s ताल्चा मार्न सकिदैन\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-msgstr "%s: फाइल %s खोल्न सकिएन\n"
-
-#, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: फाइल %s अद्यावधिक गर्न सकिएन\n"
-
 msgid "invalid group file entry"
 msgstr "अवैध समूह फाइल प्रविष्टि"
 
@@ -1004,6 +879,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "अवैध समूह नाम '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "अवैध समूह नाम '%s'\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "समूह %s: प्रयोगकर्ता छैन %s\n"
@@ -1016,18 +896,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "यो %s मा समूह फाइल प्रविष्टि मेल खाएको छैन\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "यस %s मा '%s' समूह थप्नुहुन्छ ?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: यस %s का लागि स्याडो प्रविष्टि अद्यावधिक गर्न सकिएन\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: यस %s समूहका लागि प्रविष्टि अद्यावधिक गर्न सकिएन\n"
-
 msgid "invalid shadow group file entry"
 msgstr "अवैध स्याडो समूह फाइल प्रविष्टि"
 
@@ -1054,30 +927,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: कुनै परिवर्तनहरू छैन\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: स्याडो समूह फाइल ताल्चा मार्न सकिदैन\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "उपयोग: groupdel समूह नाम\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: स्याडो समूह फाइल खोल्न सकिएन\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "उपयोग: groupdel समूह नाम\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: स्याडो समूह %s हटाउन सकिएन\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: फाइल %s अद्यावधिक गर्न सकिएन\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: स्याडो समूह फाइल अद्यावधिक गर्न सकिएन\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: समूह फाइल अद्यावधिक गर्न सकिएन\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: स्याडो समूह फाइल मेट्न सकिएन\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "उपयोग: id [-a]\n"
 
@@ -1108,6 +972,10 @@
 "  -u, --प्रयोगकर्ता LOGIN\t निर्दिष्ट गरिएको LOGIN संगै अन्तिम लग रेकर्डहरू मुद्रण गर्दछ\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "सबै भन्दा पछिल्लो        बाट                पोर्ट        प्रयोगकर्ता नाम"
 
@@ -1117,15 +985,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "उपयोग: %s [-p] [name]\n"
 
@@ -1222,6 +1090,11 @@
 "लगइन समय बढ्यो\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "उपयोग: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "उपयोग: newgrp [-] [group]\n"
 
@@ -1236,14 +1109,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: फोर्क गर्दा असफल: %s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "अज्ञात UID: %u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: प्रयोगकर्ता %s अवस्थित छैन\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "अज्ञात GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "अति धेरै समूहहरू\n"
 
@@ -1257,60 +1126,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: समूह %s अवस्थित छैन\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "अवैध समूह नाम '%s'\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: अवैध प्रयोगकर्ता नाम '%s'\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: प्रयोगकर्ता %s अवस्थित छैन\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: प्रयोगकर्ता %s अवस्थित छैन\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: अवैध प्रयोगकर्ता नाम '%s'\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: /etc/passwd ताल्चा मार्न सकिएन ।\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: /etc/passwd ताल्चा मार्न सकिएन ।\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: /etc/passwd ताल्चा मार्न सकिएन ।\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: /etc/passwd ताल्चा मार्न सकिएन ।\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1326,9 +1154,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: रेखा %d: GID सिर्जना गर्न सकिएन\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: रेखा %d: प्रयोगकर्ता फेला पार्न सकिएन %s\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: प्रयोगकर्ता %s अवस्थित छैन\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1359,15 +1187,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1437,13 +1265,10 @@
 msgstr "%s को लागि पासवर्ड परिवर्तन गर्न सकिदैन ।\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: स्मृति भन्दा बाहिर\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1487,16 +1312,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "अवैध प्रयोगकर्ता नाम '%s'\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "अवैध प्रयोगकर्ता नाम '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "प्रयोगकर्ता %s: समूह छैन %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "प्रयोगकर्ता %s: डाइरेक्ट्री %s अवस्थित छैन\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "प्रयोगकर्ता %s: कार्यक्रम %s अवस्थित छैन\n"
 
 #, c-format
@@ -1507,10 +1340,6 @@
 msgid "add user '%s' in %s? "
 msgstr "'%s' मा %s प्रयोगकर्ता थप्नुहुन्छ ? "
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: %s को लागि पासवर्ड प्रविष्टि अद्यावधिक गर्न सकिएन\n"
-
 msgid "invalid shadow password file entry"
 msgstr "अवैध स्याडो पासवर्ड फाइल प्रविष्टि"
 
@@ -1521,34 +1350,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "प्रयोगकर्ता %s: अन्तिम पासवर्ड भविष्यमा परिवर्तन हुनेछ\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: पासवर्ड फाइल ताल्चा मार्न सकिएन\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: फाइल %s खोल्न सकिएन\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: पासवर्ड फाइल खोल्न सकिएन\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "उपयोग: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: यो %s का लागि स्याडो प्रविष्टि हटाउन सकिएन\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: स्याडो फाइल अद्यावधिक हुन सकेन\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "उपयोग: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: पासवर्ड फाइल अद्यावधिक हुन सकेन\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: प्रयोगकर्ता %s का लागि प्रविष्टि अद्यावधिक गर्न सकिएन\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: स्याडो पासवर्ड फाइल मेट्न सकिएन\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "su बाट त्यो खातामा पहुँच गर्न अस्वीकार गरियो ।\n"
 
@@ -1615,6 +1435,16 @@
 "%s: %s\n"
 "(उपेक्षा गरियो)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: PAM आधिकरण असफल भयो\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "तपाईँ su %s मा प्रमाणिकरण हुनुहुन्न\n"
+
 msgid "No shell\n"
 msgstr "शेल होइन\n"
 
@@ -1640,14 +1470,6 @@
 msgstr "प्रणाली संभार मोड प्रविष्टि गरिदैछ"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: अज्ञात GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: अज्ञात समूह %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: नयाँ पूर्वनिर्धारित फाइल सिर्जना गर्न सकिएन\n"
 
@@ -1688,10 +1510,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1732,14 +1556,6 @@
 "  -u, --uid UID\t\t\t नयाँ प्रयोगकर्ता खाताको लागि UID प्रयोग गर्न जोड दिन्छ\n"
 "\n"
 
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: update_group मा स्मृति भन्दा बाहिर\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: gshadow_group मा स्मृति भन्दा बाहिर\n"
-
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: अवैध डाइरेक्ट्री '%s'\n"
@@ -1777,50 +1593,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: अवैध प्रयोगकर्ता नाम '%s'\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: पासवर्ड फाइल पुन:लेखन गर्न सकिएन\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: स्याडो पासवर्ड फाइल पुन:लेखन गर्न सकिएन\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: स्याडो पासवर्ड फाइल ताल्चा मार्न सकिएन\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: स्याडो पासवर्ड फाइल खोल्न सकिएन\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: समूह फाइल ताल्चा मार्दा त्रुटि\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: समूह फाइल खोल्दा त्रुटि\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: स्याडो समूह फाइल ताल्चा मार्दा त्रुटि\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: स्याडो समूह फाइल खोल्दा त्रुटि\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: नयाँ पासवर्ड प्रविष्टि थप्दा त्रुटि\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: नयाँ स्याडो पासवर्ड प्रविष्टि थप्दा त्रुटि\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: डाइरेकट्री सिर्जना गर्न सकिएन %s\n"
 
@@ -1834,8 +1614,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "मेल बाकस फाइल अनुमतिहरू मिलाउदै"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: प्रयोगकर्ता %s अवस्थित छ\n"
 
 #, c-format
@@ -1849,10 +1630,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s: यो %s सिर्जना गर्न सकिदैन\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u अद्वितिय होइन\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: यो %s सिर्जना गर्न सकिदैन\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1861,10 +1647,6 @@
 "%s: चेतावनी: गृह डाइरेक्ट्री पहिल्यै अवस्थित छ ।\n"
 "यसमा स्केल डाइरेक्ट्रीबाट कुनै फाइल प्रतिलिपी भएको छैन ।\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr "%s: चेतावनी: CREATE_HOME समर्थित छैन, कृपया सट्टामा -m प्रयोग गर्नुहोस् ।\n"
-
 #, fuzzy
 msgid ""
 "Usage: userdel [options] LOGIN\n"
@@ -1884,51 +1666,26 @@
 "  -r, --remove\t\t\tगृह डाइरेक्ट्री र मेल स्पूललाई हटाउँछ \n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: समूह प्रविष्टि अद्यावधिक गर्दा त्रुटि\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr "%s: समूह %s हटाउन सकिदैन जुन अर्को प्रयोगकर्ताको लागि प्राथमिक समूह हो ।\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: समूह प्रविष्टि अद्यावधिक गर्दा त्रुटि\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: समूह फाइल खोल्न सकिदैन\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: स्याडो समूह फाइल खोल्न सकिदैन\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: पासवर्ड प्रविष्टि मेट्दा त्रुटि\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: स्याडो पासवर्ड प्रविष्टि मेट्दा त्रुटि\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: प्रयोगकर्ता %s हालै लग गरियो\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: चेतावनी: हट्न सक्दैन "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s चाँहि %s को स्वामित्वमा छैन, हटिरहेको छैन\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: चेतावनी: हट्न सक्दैन "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: प्रयोगकर्ता %s अवस्थित छैन\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: प्रयोगकर्ता %s NIS प्रयोगकर्ता हो\n"
 
@@ -1991,9 +1748,16 @@
 "  -U, --unlock\t\t\tप्रयोगकर्ता खाताको ताल्चा खोल्नुहोस्\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: नयाँ समूह प्रविष्टि थप गर्दा त्रुटि\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: प्रयोगकर्ता %s अवस्थित छ\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -2008,22 +1772,10 @@
 msgstr ""
 
 #, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: uid %lu अद्वितिय होइन\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr ""
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: पासवर्ड प्रविष्टि परिवर्तन गर्दा त्रुटि\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: पासवर्ड प्रविष्टि हटाउँदा त्रुटि\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: स्याडो पासवर्ड प्रविष्टि हटाउँदा त्रुटि\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: डाइरेक्ट्री %s अवस्थित छ\n"
 
@@ -2044,6 +1796,14 @@
 msgstr "%s: डाइरेक्ट्री %s लाई %s मा पुन:नामकरण गर्न सकिदैन\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: चेतावनी: %s चाँहि %s को स्वामित्वमा छैन\n"
 
@@ -2057,7 +1817,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 #, fuzzy
@@ -2082,10 +1842,16 @@
 "  -s, --shadow\t\t\t स्याडो वा जि स्याडो डेटाबेस सम्पादन गर्दछ\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: विशेषधिकारहरू छोड्न असफल भयो (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s परिवर्तन हुदैन\n"
@@ -2100,6 +1866,406 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: पुन:भण्डारण गर्न सकिदैन %s: %s (तपाईँको परिवर्तनहरू %s मा छ)\n"
 
+#~ msgid "%s: can't lock password file\n"
+#~ msgstr "%s: पासवर्ड फाइलमा ताल्चा मार्न सकिदैन\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: पासवर्ड फाइल खोल्न सकिएन\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: स्याडो पासवर्ड फाइल ताल्चा मार्न सकिएन\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: स्याडो पासवर्ड फाइल खोल्न सकिएन\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: स्याडो पासवर्ड फाइल पुन:लेखन गर्न सकिएन\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: पासवर्ड फाइल पुन:लेखन गर्न सकिएन\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: पासवर्ड फाइल अद्यावधिक गर्न सकिएन\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: स्याडो पासवर्ड फाइल अद्यावधिक गर्न सकिएन\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tपूरा नाम: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tकोठा नम्बर: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tकार्य फोन: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tगृह फोन: %s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr "पासवर्ड फाइल ताल्चा मार्न सकिएन; फेरी पछि प्रयास गर्नुहोस् ।\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "पासवर्ड फाइल खोल्न सकिएन ।\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: समूह फाइल ताल्चा मार्न सकिदैन\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: समूह फाइल खोल्न सकिदैन\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: जि स्याडो फाइल ताल्चा मार्न सकिएन\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: स्याडो फाइल खोल्न सकिएन\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: स्याडो फाइल अद्यावधिक गर्दा त्रुटि\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: समूह प्रविष्टि अद्यावधिक गर्दा त्रुटि\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: रेखा %d: अज्ञात समूह %s\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: रेखा %d: प्रविष्टि अद्यावधिक गर्न सकिएन\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: स्याडो फाइल ताल्चा मार्न सकिएन\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: स्याडो फाइल अद्यावधिक गर्दा त्रुटि\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: पासवर्ड फाइल अद्यावधिक गर्दा त्रुटि\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: रेखा %d: अज्ञात प्रयोगकर्ता %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: रेखा %d: पासवर्ड प्रविष्टि अद्यावधिक गर्न सकिदैन\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: अज्ञात प्रयोगकर्ता\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "अज्ञात प्रयोगकर्ता: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "उपयोग: %s [-r|-R] समूह\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-एउटा प्रयोगकर्ता] समूह\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d प्रयोगकर्ता] समूह\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A प्रयोगकर्ता,...] [-M प्रयोगकर्ता,...] समूह\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M प्रयोगकर्ता,...] समूह\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: ताल्चा प्राप्त गर्न सकिएन\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: स्याडो ताल्चा प्राप्त गर्न सकिएन\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: फाइल खोल्न सकिएन\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: फाइल पुन:लेखन गर्न सकिएन\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: स्याडो फाइल पुन:लेखन गर्न सकिएन\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: फाइल अनलग गर्न सकिएन\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: प्रविष्टि अद्यावधिक गर्न सकिएन\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: स्याडो प्रविष्टि अद्यावधिक गर्न सकिएन\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "अज्ञात समूह: %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: फाइल खोल्न सकिएन\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: स्याडो फाइल खोल्न सकिएन\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "तपाईँ को हो ?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: अज्ञात सदस्य %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: नयाँ समूह प्रविष्टि थप गर्दा त्रुटि\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: समूह फाइल पुन:लेखन गर्न सकिएन\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: स्याडो समूह फाइल पुन:लेखन गर्न सकिएन\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: समूह फाइल ताल्चा मार्न असक्षम भयो\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: समूह फाइल खोल्न असक्षम भयो\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: स्याडो समूह फाइल ताल्चा मार्न असफल भयो\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: स्याडो समूह फाइल खोल्न असक्षम भयो\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u अद्वितिय होइन\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: समूह प्रविष्टि हटाउँदा त्रुटि\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: स्याडो समूह प्रविष्टि हटाउँदा त्रुटि\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: प्रयोगकर्ताको प्राइमेरी समूह हटाउन सकिएन ।\n"
+
+#, fuzzy
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "%s: PAM आधिकरण असफल भयो\n"
+
+#, fuzzy
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "%s: समूह फाइल ताल्चा मार्न असक्षम भयो\n"
+
+#, fuzzy
+#~ msgid "Unable to open group file\n"
+#~ msgstr "%s: समूह फाइल खोल्न असक्षम भयो\n"
+
+#, fuzzy
+#~ msgid "Cannot close group file\n"
+#~ msgstr "%s: समूह फाइल खोल्न सकिदैन\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s /etc/group मा फेला परेन\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u अद्वितिय GID होइन\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s अद्वितिय नाम होइन\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: पासवर्ड फाइल पुन:लेखन गर्न सकिएन\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: पासवर्ड फाइल ताल्चा मार्न असक्षम छ\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: पासवर्ड फाइल खोल्न असक्षम भयो\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: फाइल %s ताल्चा मार्न सकिदैन\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: यस %s का लागि स्याडो प्रविष्टि अद्यावधिक गर्न सकिएन\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: यस %s समूहका लागि प्रविष्टि अद्यावधिक गर्न सकिएन\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: स्याडो समूह फाइल ताल्चा मार्न सकिदैन\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: स्याडो समूह फाइल खोल्न सकिएन\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: स्याडो समूह %s हटाउन सकिएन\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: स्याडो समूह फाइल अद्यावधिक गर्न सकिएन\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: समूह फाइल अद्यावधिक गर्न सकिएन\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: स्याडो समूह फाइल मेट्न सकिएन\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "अज्ञात UID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "अज्ञात GID: %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: समूह %s अवस्थित छैन\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: प्रयोगकर्ता %s अवस्थित छैन\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: अवैध प्रयोगकर्ता नाम '%s'\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: /etc/passwd ताल्चा मार्न सकिएन ।\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: /etc/passwd ताल्चा मार्न सकिएन ।\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: /etc/passwd ताल्चा मार्न सकिएन ।\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: /etc/passwd ताल्चा मार्न सकिएन ।\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: फाइलहरू खओल्न सकिएन\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: फाइलहरू अद्यावधिक गर्दा त्रुटि\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: रेखा %d: प्रयोगकर्ता फेला पार्न सकिएन %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: %s को लागि पासवर्ड प्रविष्टि अद्यावधिक गर्न सकिएन\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: पासवर्ड फाइल ताल्चा मार्न सकिएन\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: पासवर्ड फाइल खोल्न सकिएन\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: यो %s का लागि स्याडो प्रविष्टि हटाउन सकिएन\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: स्याडो फाइल अद्यावधिक हुन सकेन\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: पासवर्ड फाइल अद्यावधिक हुन सकेन\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: प्रयोगकर्ता %s का लागि प्रविष्टि अद्यावधिक गर्न सकिएन\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: स्याडो पासवर्ड फाइल मेट्न सकिएन\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: अज्ञात GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: अज्ञात समूह %s\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: gshadow_group मा स्मृति भन्दा बाहिर\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: पासवर्ड फाइल पुन:लेखन गर्न सकिएन\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: स्याडो पासवर्ड फाइल पुन:लेखन गर्न सकिएन\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: स्याडो पासवर्ड फाइल ताल्चा मार्न सकिएन\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: स्याडो पासवर्ड फाइल खोल्न सकिएन\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: समूह फाइल ताल्चा मार्दा त्रुटि\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: समूह फाइल खोल्दा त्रुटि\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: स्याडो समूह फाइल ताल्चा मार्दा त्रुटि\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: स्याडो समूह फाइल खोल्दा त्रुटि\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: नयाँ पासवर्ड प्रविष्टि थप्दा त्रुटि\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: नयाँ स्याडो पासवर्ड प्रविष्टि थप्दा त्रुटि\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr "%s: चेतावनी: CREATE_HOME समर्थित छैन, कृपया सट्टामा -m प्रयोग गर्नुहोस् ।\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: समूह प्रविष्टि अद्यावधिक गर्दा त्रुटि\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: समूह प्रविष्टि अद्यावधिक गर्दा त्रुटि\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: समूह फाइल खोल्न सकिदैन\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: स्याडो समूह फाइल खोल्न सकिदैन\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: पासवर्ड प्रविष्टि मेट्दा त्रुटि\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: स्याडो पासवर्ड प्रविष्टि मेट्दा त्रुटि\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: प्रयोगकर्ता %s अवस्थित छैन\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: नयाँ समूह प्रविष्टि थप गर्दा त्रुटि\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: uid %lu अद्वितिय होइन\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: पासवर्ड प्रविष्टि परिवर्तन गर्दा त्रुटि\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: पासवर्ड प्रविष्टि हटाउँदा त्रुटि\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: स्याडो पासवर्ड प्रविष्टि हटाउँदा त्रुटि\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: अद्वितिय GID प्राप्त गर्न सकिएन\n"
 
@@ -2109,18 +2275,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr "'%.100s' मा"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: फाइलहरू ताल्चा मार्न सकिएन, पछि फेरी प्रयास गर्नुहोस्\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: रेखा %d: UID सिर्जना गर्न सकिएन\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/nl.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -55,6 +55,9 @@
 msgid "  Choose a new password."
 msgstr "  U dient een nieuw wachtwoord te kiezen."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Uw wachtwoord vervalt binnen %ld dagen.\n"
@@ -66,7 +69,12 @@
 msgstr "Uw wachtwoord vervalt vandaag."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Kan tty %s niet veranderen"
 
 msgid "Environment overflow\n"
@@ -90,14 +98,14 @@
 "%d mislukte pogingen sinds u zich de laatste keer aanmeldde.\n"
 "De laatste mislukte poging %s was op %s.\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "%s: kan geen unieke GID verkrijgen\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
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s: kan geen unieke GID verkrijgen\n"
-
 msgid "Too many logins.\n"
 msgstr "Te veel aanmeldingen.\n"
 
@@ -189,9 +197,18 @@
 msgstr "Kan de naam van uw tty niet bepalen"
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: onvoldoende geheugen\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) is mislukt\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "Nee\n"
+
 msgid "Password: "
 msgstr "Wachtwoord: "
 
@@ -199,6 +216,11 @@
 msgid "%s's Password: "
 msgstr "Wachtwoord van %s: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: velden zijn te lang\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -294,42 +316,33 @@
 msgstr "%s: toegang geweigerd.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Kan uw gebruikersnaam niet bepalen.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM-authentificatie is mislukt\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: kan wachtwoordbestand niet vergrendelen\n"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: kan bestanden niet vergrendelen; probeer het later nog eens\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: kan wachtwoordbestand niet openen\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: kan bestand %s niet openen\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: kan schaduwwachtwoordenbestand niet vergrendelen\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: afsplisten van proces is mislukt: %s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: kan schaduwwachtwoordenbestand niet openen\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: afgeven van rechten is mislukt (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: kan het schaduwwachtwoordbestand niet herschrijven\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: kan het wachtwoordbestand niet herschrijven\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: kan wachtwoordbestand niet bijwerken\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: kan schaduwwachtwoordbestand niet bijwerken\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: het schaduwwachtwoordenbestand is afwezig\n"
 
@@ -337,9 +350,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: gebruiker %s bestaat niet\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -365,58 +378,27 @@
 msgid "Full Name"
 msgstr "Volledige naam"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tVolledige naam: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Kamernummer"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tKamernummer: %s\n"
-
 msgid "Work Phone"
 msgstr "Telefoon werk"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tTelefoon werk: %s\n"
-
 msgid "Home Phone"
 msgstr "Telefoon thuis"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tTelefoon thuis: %s\n"
-
 msgid "Other"
 msgstr "Varia"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Kan ID niet veranderen naar root.\n"
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr ""
-"Kan het wachtwoordbestand niet vergrendelen; probeer het later nog eens.\n"
-
-msgid "Cannot open the password file.\n"
-msgstr "Kan het wachtwoordbestand niet openen.\n"
-
 #, c-format
-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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -449,9 +431,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' bevat ongeldige tekens\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Kan uw gebruikersnaam niet bepalen.\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: gebruiker %s bestaat niet\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -499,7 +481,7 @@
 msgstr "%s: ongeldig numeriek argument '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: optie -a is ENKEL toegestaan in combinatie met optie -G\n"
 
 #, c-format
@@ -511,30 +493,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: kan groepbestand niet vergrendelen\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: kan groepbestand niet openen\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: kan het 'gshadow'-bestand niet vergrendelen\n"
-
-#, c-format
-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"
 
@@ -542,38 +500,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: regel %d: nieuw wachtwoord ontbreekt\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: regel %d: onbekende groep %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: groep %s bestaan niet\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: gebruiker %s bestaat niet\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: fout tijdens bijwerken van schaduwbestand\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: fout tijdens bijwerken van wachtwoordbestand\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"
@@ -592,8 +536,9 @@
 msgid "Login Shell"
 msgstr "Aanmeld-shell"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "U mag de shell voor %s niet aanpassen.\n"
 
 #, c-format
@@ -604,24 +549,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: ongeldige ingang: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s is geen geldige shell.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Gebruik: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: onbekende gebruiker\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -649,11 +610,16 @@
 "                        gebruikt worden), maar enkel voor gebruiker LOGIN\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Gebruiker Missingen Maximum Laatste          Op\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds over]"
 
 #, c-format
@@ -661,76 +627,67 @@
 msgstr " [%lds slot]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Onbekende gebruiker %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Gebruik: %s [-r|-R] groep\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "         %s [-a gebruiker] groep\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "         %s [-d gebruiker] groep\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Onbekende gebruiker %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "         %s [-A gebruiker,...] [-M gebruiker,...] groep\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: kan bestand %s niet openen\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "         %s [-M gebruiker,...] groep\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: schaduw groepwachtwoorden zijn vereist voor -A\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: kan geen vergrendeling verkrijgen\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: kan geen schaduwvergrendeling verkrijgen\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Het wachtwoord voor %s kan niet veranderd worden.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: kan bestand niet openen\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: schaduw groepwachtwoorden zijn vereist voor -A\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: kan bestand niet openen\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: groep %s bestaan niet\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: kan het schaduwbestand niet openen\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: afsplisten van proces is mislukt: %s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -749,9 +706,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: U kunt het later nog eens proberen\n"
 
-msgid "Who are you?\n"
-msgstr "Wie bent u?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Gebruiker %s wordt toegevoegd aan groep %s\n"
@@ -760,9 +714,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: gebruiker %s bestaat niet\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -797,113 +751,89 @@
 "                                (niet-unieke) GID toe\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: fout tijdens toevoegen nieuwe groepingang\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s is geen geldige groepsnaam\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: kan groepbestand niet herschrijven\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "ongeldige groepsnaam '%s'\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: kan schaduwgroepbestand niet herschrijven\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: kan groepbestand niet vergrendelen\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: kan groepbestand niet openen\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: kan schaduwgroepbestand niet vergrendelen\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: kan schaduwgroepbestand niet openen\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K vereist SLEUTEL=WAARDE\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 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"
-
 #, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: kan %s niet aanmaken\n"
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "Lid bestaat reeds\n"
 
 msgid "Usage: groupdel group\n"
 msgstr "Gebruik: groupdel groep\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: fout bij het verwijderen van de groepingang\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: kan map %s niet hernoemen naar %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: fout tijdens het verwijderen van de schaduwgroepingang\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: kan gebruiker '%s' niet veranderen op NIS-client.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: kan de primaire groep van een gebruiker niet verwijderen.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: groep %s bestaan niet\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: groep %s is een NIS-groep\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: groep '%s' is een NIS-groep.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s is de NIS-master\n"
 
-msgid "Member already exists\n"
-msgstr "Lid bestaat reeds\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: gebruiker %s is een NIS-gebruiker\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Te verwijderen lid kon niet gevonden worden\n"
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: onvoldoende geheugen in update_group()\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
-"Gebruik: groupmems -a GEBRUIKERSNAAM | -d GEBRUIKERSNAAM | -D | -l [-g "
-"GROEPNAAM]\n"
 
-msgid "Only root can add members to different groups\n"
-msgstr "Alleen root kan gebruikers toevoegen aan verschillende groepen\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "Groeptoegang is vereist\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Niet de primaire eigenaar van de huidige groep\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "PAM-authentificatie is mislukt\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Kan groepbestand niet vergrendelen\n"
-
-msgid "Unable to open group file\n"
-msgstr "Kan groepbestand niet openen\n"
-
-msgid "Cannot close group file\n"
-msgstr "Kan groepbestand niet sluiten\n"
-
 #, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
@@ -927,41 +857,19 @@
 "                                (niet-unieke) GID toe\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s is niet gevonden in /etc/group\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u is geen unieke GID\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s is geen unieke naam\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: kan wachtwoordbestand niet herschrijven\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "ongeldige groepsnaam '%s'\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: kan wachtwoordbestand niet vergrendelen\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: groep %s is een NIS-groep\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: kan wachtwoordbestand niet openen\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: onbekende gebruiker %s\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: kan gebruiker '%s' niet veranderen op NIS-client.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Gebruik: %s [-r] [-s] [groep [gshaduw]]\n"
 
@@ -973,18 +881,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s en -r zijn niet compatibel\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: kan bestand %s niet vergrendelen\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "ongeldige ingang in het groepbestand"
 
@@ -999,6 +895,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "ongeldige groepsnaam '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "ongeldige groepsnaam '%s'\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "groep %s: geen gebruiker %s\n"
@@ -1011,18 +912,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "geen ingang in %s die overeenkomt met die in het 'group'-bestand\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "groep '%s' toevoegen in %s?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: kan schaduwingang voor %s niet bijwerken\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: kan ingang voor groep %s niet bijwerken\n"
-
 msgid "invalid shadow group file entry"
 msgstr "ongeldige ingang in het schaduwgroepbestand"
 
@@ -1049,30 +943,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: geen aanpassingen\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: kan schaduwgroepbestand niet vergrendelen\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Gebruik: groupdel groep\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: kan schaduwgroepbestand niet openen\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Gebruik: groupdel groep\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: kan schaduwgroep %s niet verwijderen\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: kan bestand %s niet bijwerken\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: kan schaduwgroepbestand niet bijwerken\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: kan groepbestand niet bijwerken\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: kan schaduwgroepbestand niet verwijderen\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Gebruik: id [-a]\n"
 
@@ -1104,6 +989,10 @@
 "  -u, --user LOGIN    print het lastlog-record van de gebruiker LOGIN\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Gebruikersnaam   Poort    Vanaf            Laatste"
 
@@ -1113,15 +1002,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Gebruik: %s [-p] [naam]\n"
 
@@ -1219,6 +1108,11 @@
 "aanmeldtijd overschreden\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Gebruik: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Gebruik: newgrp [-] [groep]\n"
 
@@ -1233,14 +1127,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: afsplisten van proces is mislukt: %s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "onbekende UID: %u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: gebruiker %s bestaat niet\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "onbekende GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "te veel groepen\n"
 
@@ -1254,60 +1144,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: groep %s bestaan niet\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "ongeldige groepsnaam '%s'\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: ongeldige gebruikersnaam '%s'\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: gebruiker %s bestaat niet\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: gebruiker %s bestaat niet\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: ongeldige gebruikersnaam '%s'\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: kan /etc/passwd niet vergrendelen.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: kan /etc/passwd niet vergrendelen.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: kan /etc/passwd niet vergrendelen.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: kan /etc/passwd niet vergrendelen.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1323,9 +1172,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: regel %d: kan geen GID aanmaken\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: regel %d: kan gebruiker %s niet vinden\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: gebruiker %s bestaat niet\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1343,6 +1192,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: regel %d: kan ingang niet bijwerken\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1355,15 +1232,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1443,13 +1320,10 @@
 msgstr "Het wachtwoord voor %s kan niet veranderd worden.\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: onvoldoende geheugen\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1492,16 +1366,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "ongeldige gebruikersnaam '%s'\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "ongeldige gebruikersnaam '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "gebruiker %s: geen groep %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "gebruiker %s: map %s bestaat niet\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "gebruiker %s: programma %s bestaat niet\n"
 
 #, c-format
@@ -1512,10 +1394,6 @@
 msgid "add user '%s' in %s? "
 msgstr "gebruiker '%s' toevoegen in %s?"
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: kan 'passwd'-ingang voor %s niet bijwerken\n"
-
 msgid "invalid shadow password file entry"
 msgstr "ongeldige ingang in het schaduwwachtwoordbestand"
 
@@ -1526,34 +1404,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "gebruiker %s: laatste wachtwoordverandering is in de toekomst\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: kan 'passwd'-bestand niet vergrendelen\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: kan bestand %s niet openen\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: kan 'passwd'-bestand niet openen\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Gebruik: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: kan schaduwingang voor %s niet verwijderen\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: kan schaduwbestand niet bijwerken\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Gebruik: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: kan 'passwd'-bestand niet bijwerken\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: kan ingang voor gebruiker %s niet bijwerken\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: kan schaduwwachtwoordbestand niet verwijderen\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Toegang van 'su' tot die account is GEWEIGERD.\n"
 
@@ -1620,6 +1489,16 @@
 "%s: %s\n"
 "(Genegeerd)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: PAM-authentificatie is mislukt\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "U bent niet gerechtigd om 'su %s' uit te voeren\n"
+
 msgid "No shell\n"
 msgstr "Geen shell\n"
 
@@ -1645,14 +1524,6 @@
 msgstr "Systeemonderhoudsmodus wordt opgestart"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: onbekende GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: onbekende groep %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: kan geen nieuw standaardwaardenbestand aanmaken\n"
 
@@ -1693,10 +1564,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1743,14 +1616,6 @@
 "gebruikersaccount\n"
 "\n"
 
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: onvoldoende geheugen in update_group()\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: onvoldoende geheugen in update_gshadow()\n"
-
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: ongeldige basismap '%s'\n"
@@ -1788,50 +1653,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: ongeldige gebruikersnaam '%s'\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: kan wachtwoordbestand niet herschrijven\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: kan schaduwwachtwoordbestand niet herschrijven\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: kan schaduwwachtwoordbestand niet vergrendelen\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: kan schaduwwachtwoordbestand niet openen\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: fout tijdens vergrendelen groepbestand\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: fout tijdens openen groepbestand\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: fout tijdens vergrendelen schaduwgroepbestand\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: fout tijdens openen schaduwgroepbestand\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: fout tijdens toevoegen nieuwe wachtwoordingang\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: fout tijdens toevoegen schaduwwachtwoordingang\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: kan map %s niet aanmaken\n"
 
@@ -1847,8 +1676,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Bestandsrechten van mailbox-bestand worden ingesteld"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: gebruiker %s bestaat al\n"
 
 #, c-format
@@ -1862,10 +1692,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s: kan %s niet aanmaken\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u is niet uniek\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: kan %s niet aanmaken\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1874,12 +1709,6 @@
 "%s: waarschuwing: de thuismap bestaat reeds.\n"
 "Er worden geen bestanden uit de skelet-map overgekopieerd.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr ""
-"%s: waarschuwing: CREATE_HOME wordt niet ondersteund, u dient in plaats "
-"hiervan -m te gebruiken.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1901,53 +1730,28 @@
 "bestand\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr ":%s: fout tijdens bijwerken groepingang\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: kan de groep %s niet verwijderen, daar deze de primaire groep van een "
 "andere gebruiker is.\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr ":%s: fout tijdens bijwerken groepingang\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: kan groepbestand niet openen\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: kan schaduwgroepbestand niet openen\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: fout tijdens verwijderen wachtwoordingang\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: fout tijdens verwijderen schaduwwachtwoordingang\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: gebruiker %s is momenteel niet aangemeld\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: waarschuwing: kan niet verwijderen "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s is niet van %s, wordt niet verwijderd\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: waarschuwing: kan niet verwijderen "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: gebruiker %s bestaat niet\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: gebruiker %s is een NIS-gebruiker\n"
 
@@ -2016,9 +1820,16 @@
 "  -U, --unlock                  ontgrendel de gebruikersaccount\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: fout tijdens toevoegen nieuwe groepingang\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: gebruiker %s bestaat al\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -2032,23 +1843,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: UID %lu is niet uniek\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "Lid bestaat reeds\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: fout tijdens aanpassen wachtwoordingang\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: fout tijdens verwijderen wachtwoordingang\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: fout tijdens verwijderen schaduwwachtwoordingang\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: map %s bestaat al\n"
 
@@ -2070,6 +1870,14 @@
 msgstr "%s: kan map %s niet hernoemen naar %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: waarschuwing: %s is niet van %s\n"
 
@@ -2083,7 +1891,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -2107,10 +1915,16 @@
 "  -s, --shadow                  shadow- of gshadow-database bewerken\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: afgeven van rechten is mislukt (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s is onveranderd\n"
@@ -2125,6 +1939,423 @@
 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: can't lock password file\n"
+#~ msgstr "%s: kan wachtwoordbestand niet vergrendelen\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: kan wachtwoordbestand niet openen\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: kan schaduwwachtwoordenbestand niet vergrendelen\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: kan schaduwwachtwoordenbestand niet openen\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: kan het schaduwwachtwoordbestand niet herschrijven\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: kan het wachtwoordbestand niet herschrijven\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: kan wachtwoordbestand niet bijwerken\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: kan schaduwwachtwoordbestand niet bijwerken\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tVolledige naam: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tKamernummer: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tTelefoon werk: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tTelefoon thuis: %s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr ""
+#~ "Kan het wachtwoordbestand niet vergrendelen; probeer het later nog eens.\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Kan het wachtwoordbestand niet openen.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: kan groepbestand niet vergrendelen\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: kan groepbestand niet openen\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: kan het 'gshadow'-bestand niet vergrendelen\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: kan het schaduwbestand niet openen\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: fout tijdens bijwerken van schaduwbestand\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr ":%s: fout tijdens bijwerken groepingang\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: regel %d: onbekende groep %s\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: regel %d: kan ingang niet bijwerken\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: kan het 'shadow'-bestand niet vergrendelen\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: fout tijdens bijwerken van schaduwbestand\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: fout tijdens bijwerken van wachtwoordbestand\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: regel %d: onbekende gebruiker %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: regel %d: kan wachtwoordingang niet bijwerken\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: onbekende gebruiker\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Onbekende gebruiker %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Gebruik: %s [-r|-R] groep\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "         %s [-a gebruiker] groep\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "         %s [-d gebruiker] groep\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "         %s [-A gebruiker,...] [-M gebruiker,...] groep\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "         %s [-M gebruiker,...] groep\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: kan geen vergrendeling verkrijgen\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: kan geen schaduwvergrendeling verkrijgen\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: kan bestand niet openen\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: kan bestand niet herschrijven\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: kan schaduwbestand niet herschrijven\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: kan bestand niet ontgrendelen\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: kan ingang niet bijwerken\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: kan schaduwingang niet bijwerken\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "onbekende groep: %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: kan bestand niet openen\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: kan het schaduwbestand niet openen\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Wie bent u?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: onbekende gebruiker %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: fout tijdens toevoegen nieuwe groepingang\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: kan groepbestand niet herschrijven\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: kan schaduwgroepbestand niet herschrijven\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: kan groepbestand niet vergrendelen\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: kan groepbestand niet openen\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: kan schaduwgroepbestand niet vergrendelen\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: kan schaduwgroepbestand niet openen\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u is niet uniek\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: fout bij het verwijderen van de groepingang\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: fout tijdens het verwijderen van de schaduwgroepingang\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: kan de primaire groep van een gebruiker niet verwijderen.\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Te verwijderen lid kon niet gevonden worden\n"
+
+#~ msgid ""
+#~ "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+#~ msgstr ""
+#~ "Gebruik: groupmems -a GEBRUIKERSNAAM | -d GEBRUIKERSNAAM | -D | -l [-g "
+#~ "GROEPNAAM]\n"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "Alleen root kan gebruikers toevoegen aan verschillende groepen\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "Groeptoegang is vereist\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Niet de primaire eigenaar van de huidige groep\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "PAM-authentificatie is mislukt\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Kan groepbestand niet vergrendelen\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Kan groepbestand niet openen\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Kan groepbestand niet sluiten\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s is niet gevonden in /etc/group\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u is geen unieke GID\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s is geen unieke naam\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: kan wachtwoordbestand niet herschrijven\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: kan wachtwoordbestand niet vergrendelen\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: kan wachtwoordbestand niet openen\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: kan bestand %s niet vergrendelen\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: kan schaduwingang voor %s niet bijwerken\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: kan ingang voor groep %s niet bijwerken\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: kan schaduwgroepbestand niet vergrendelen\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: kan schaduwgroepbestand niet openen\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: kan schaduwgroep %s niet verwijderen\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: kan schaduwgroepbestand niet bijwerken\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: kan groepbestand niet bijwerken\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: kan schaduwgroepbestand niet verwijderen\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "onbekende UID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "onbekende GID: %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: groep %s bestaan niet\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: gebruiker %s bestaat niet\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: ongeldige gebruikersnaam '%s'\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: kan /etc/passwd niet vergrendelen.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: kan /etc/passwd niet vergrendelen.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: kan /etc/passwd niet vergrendelen.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: kan /etc/passwd niet vergrendelen.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: kan bestanden niet openen\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: fout tijdens bijwerken bestanden\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: regel %d: kan gebruiker %s niet vinden\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: kan 'passwd'-ingang voor %s niet bijwerken\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: kan 'passwd'-bestand niet vergrendelen\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: kan 'passwd'-bestand niet openen\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: kan schaduwingang voor %s niet verwijderen\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: kan schaduwbestand niet bijwerken\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: kan 'passwd'-bestand niet bijwerken\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: kan ingang voor gebruiker %s niet bijwerken\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: kan schaduwwachtwoordbestand niet verwijderen\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: onbekende GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: onbekende groep %s\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: onvoldoende geheugen in update_gshadow()\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: kan wachtwoordbestand niet herschrijven\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: kan schaduwwachtwoordbestand niet herschrijven\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: kan schaduwwachtwoordbestand niet vergrendelen\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: kan schaduwwachtwoordbestand niet openen\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: fout tijdens vergrendelen groepbestand\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: fout tijdens openen groepbestand\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: fout tijdens vergrendelen schaduwgroepbestand\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: fout tijdens openen schaduwgroepbestand\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: fout tijdens toevoegen nieuwe wachtwoordingang\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: fout tijdens toevoegen schaduwwachtwoordingang\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr ""
+#~ "%s: waarschuwing: CREATE_HOME wordt niet ondersteund, u dient in plaats "
+#~ "hiervan -m te gebruiken.\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr ":%s: fout tijdens bijwerken groepingang\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr ":%s: fout tijdens bijwerken groepingang\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: kan groepbestand niet openen\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: kan schaduwgroepbestand niet openen\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: fout tijdens verwijderen wachtwoordingang\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: fout tijdens verwijderen schaduwwachtwoordingang\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: gebruiker %s bestaat niet\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: fout tijdens toevoegen nieuwe groepingang\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: UID %lu is niet uniek\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: fout tijdens aanpassen wachtwoordingang\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: fout tijdens verwijderen wachtwoordingang\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: fout tijdens verwijderen schaduwwachtwoordingang\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: kan geen unieke GID verkrijgen\n"
 
@@ -2134,18 +2365,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " op `%.100s'"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: kan bestanden niet vergrendelen; probeer het later nog eens\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: regel %d: kan geen UID aanmaken\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/nn.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -54,6 +54,9 @@
 msgid "  Choose a new password."
 msgstr "  Lag eit nytt passord."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Passordet ditt vil utgå om %ld dagar.\n"
@@ -65,7 +68,12 @@
 msgstr "Passordet ditt vil utgå i dag."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Klarer ikkje skifta tty %s"
 
 msgid "Environment overflow\n"
@@ -85,12 +93,12 @@
 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"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: klarer ikkje få unikt gid\n"
 
-#, fuzzy
-msgid "Can't get unique GID (no more available GIDs)\n"
+#, fuzzy, c-format
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "%s: klarer ikkje få unikt gid\n"
 
 msgid "Too many logins.\n"
@@ -184,9 +192,17 @@
 msgstr "%s: Klarer ikkje avgjere brukarnamnet ditt.\n"
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: tomt for minne\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) feila\n"
 
+#, fuzzy
+msgid "No"
+msgstr "Nei"
+
 msgid "Password: "
 msgstr "Passord: "
 
@@ -194,6 +210,11 @@
 msgid "%s's Password: "
 msgstr "%s sitt passord: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: felta er for lange\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -277,41 +298,31 @@
 msgstr "%s: nekta tilgang\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Klarer ikkje avgjere brukarnamnet ditt.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM-autentisering feila\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: klarer ikkje låsa passordfil\n"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: klarer ikkje låsa filer, prøv igjen seinare\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: klarer ikkje opna passordfil\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: klarer ikkje opna fila %s\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: klarer ikkje låsa skuggepassordfila\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: ugyldig telefonnummer, arbeid: «%s»\n"
 
 #, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: klarer ikkje opna skuggepassordfila\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: klarer ikkje skriva ny skuggepassordfil\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: klarer ikkje skriva ny passordfil\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: klarer ikkje oppdatere passordfil\n"
-
-#, c-format
-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"
@@ -320,9 +331,9 @@
 msgid "%s: failed to drop privileges (%s)\n"
 msgstr ""
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: ukjend brukar %s\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: brukar %s finst ikkje\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -347,57 +358,26 @@
 msgid "Full Name"
 msgstr "Fullt namn"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tFullt namn: %s\n"
+#, fuzzy, c-format
+msgid "\t%s: %s\n"
+msgstr "passwd: %s\n"
 
 msgid "Room Number"
 msgstr "Romnummer"
 
-#, fuzzy, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "Romnummer"
-
 msgid "Work Phone"
 msgstr "Telefon, arbeid"
 
-#, fuzzy, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "Telefon, arbeid"
-
 msgid "Home Phone"
 msgstr "Telefon, heime"
 
-#, fuzzy, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "Telefon, heime"
-
 msgid "Other"
 msgstr "Anna"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Klarer ikkje endra ID til root.\n"
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Klarer ikkje låsa passordfila, prøv igjen seinare.\n"
-
-msgid "Cannot open the password file.\n"
-msgstr "Klarer ikkje opna passordfila.\n"
-
 #, c-format
-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"
-
-#, c-format
 msgid "%s: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -429,9 +409,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: «%s» inneheld ulovlege teikn\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Klarer ikkje avgjere brukarnamnet ditt.\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: brukar %s finst ikkje\n"
 
 #, fuzzy, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -471,9 +451,10 @@
 msgid "%s: invalid numeric argument '%s'\n"
 msgstr "%s: ugyldig nummerisk argument «%s»\n"
 
-#, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: do not include \"l\" with other flags\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
+msgstr "%s: ta ikkje med «l» med andre flagg\n"
 
 #, c-format
 msgid "%s: the -c, -e, and -m flags are exclusive\n"
@@ -484,30 +465,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: klarer ikkje låsa gruppefil\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: klarer ikkje opna gruppefil\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: klarer ikkje låsa skuggepassordfila\n"
-
-#, c-format
-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"
 
@@ -516,37 +473,23 @@
 msgstr "%s: linje %d: manglar nytt passord\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: linje %d: ukjent brukar %s\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: gruppe %s eksisterer ikkje\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: brukar %s finst ikkje\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: feil ved oppdatering av skuggepassordfila\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: feil ved oppdatering av passordfila\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"
@@ -559,8 +502,9 @@
 msgid "Login Shell"
 msgstr "Innloggingskal"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Du treng ikkje endra skal for %s.\n"
 
 #, c-format
@@ -571,24 +515,21 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Ugyldig inntasting: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s er eit ugyldig skal.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Bruk: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: ukjent brukar\n"
-
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -601,11 +542,16 @@
 "\n"
 msgstr ""
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr ""
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds igjen]"
 
 #, c-format
@@ -613,76 +559,67 @@
 msgstr " [%lds lås]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Ukjent brukar: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Bruk: %s [-r|-R] gruppe\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "      %s [-a brukar] gruppe\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "      %s [-d brukar] gruppe\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Ukjent brukar: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "      %s [-A brukar,...] [-M brukar,...] gruppe\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: klarer ikkje opna fila %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "      %s [-M brukar,...] gruppe\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: skuggepassord for gruppe krevst for -A\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: klarer ikkje få lås\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: klarer ikkje få lås på skuggefil\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Passordet for %s kan ikkje endrast.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: klarer ikkje opna fil\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: skuggepassord for gruppe krevst for -A\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: klarer ikkje opna fil\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: gruppe %s eksisterer ikkje\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: klarer ikkje opna skuggepassordfila\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: ugyldig telefonnummer, arbeid: «%s»\n"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -701,9 +638,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Prøv igjen seinare\n"
 
-msgid "Who are you?\n"
-msgstr "Kven er du?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Legg brukaren %s til gruppa %s\n"
@@ -712,9 +646,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: brukar %s finst ikkje\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -736,115 +670,87 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: feil ved oppretting av ny gruppeoppføring\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s er ikkje eit gyldig gruppenamn\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: klarer ikkje skriva ny gruppefil\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "ugyldig gruppenamn «%s»\n"
 
-#, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: klarer ikkje skriva ny skuggegruppefil\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: klarer ikkje låsa gruppefil\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: klarer ikkje opna gruppefil\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: klarer ikkje låsa skuggegruppefil\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: klarer ikkje opna skuggegruppefil\n"
-
 #, fuzzy, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -O krev NAME=VERDI\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 msgstr "%s: gruppa %s finst allereie\n"
 
-#, fuzzy, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: gid %u er ikkje unikt\n"
+#, c-format
+msgid "%s: GID '%lu' already exists\n"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: kan ikkje oppretta %s\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "Bruk: goupdel gruppe\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: feil ved fjerning av gruppeoppføring\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: klarte ikkje endra namn på mappa %s til %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: feil ved fjerning av oppføring for skuggegruppe\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: klarer ikkje endra brukar «%s» på NIS-klient.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: klarer ikkje fjerna primærgruppa til brukaren.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: gruppe %s eksisterer ikkje\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: gruppe %s er ei NIS-gruppe\n"
+#, fuzzy, c-format
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: gruppe «%s» er ei NIS-gruppe.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s er NIS-hovudet\n"
 
-msgid "Member already exists\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: brukar %s er ikkje ein NIS brukar\n"
 
-msgid "Member to remove could not be found\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: slapp opp for minne i update_group\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
 
-msgid "Only root can add members to different groups\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
 msgstr ""
 
-msgid "Group access is required\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr ""
-
-#, fuzzy
-msgid "PAM authentication failed for\n"
-msgstr "%s: PAM-autentisering feila\n"
-
-#, fuzzy
-msgid "Unable to lock group file\n"
-msgstr "%s: klarer ikkje låsa gruppefil\n"
-
-#, fuzzy
-msgid "Unable to open group file\n"
-msgstr "%s: klarer ikkje opna gruppefil\n"
-
-#, fuzzy
-msgid "Cannot close group file\n"
-msgstr "%s: klarer ikkje opna gruppefila\n"
-
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -858,41 +764,19 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s ikkje funne i /etc/group\n"
-
 #, fuzzy, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u er ikkje ein unik gid\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "ugyldig gruppenamn «%s»\n"
 
 #, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s er ikkje eit unikt namn\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: gruppe %s er ei NIS-gruppe\n"
 
-#, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: klarer ikkje skriva ny passordfil\n"
-
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: klarer ikkje låsa passordfil\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: ukjend brukar %s\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: klarer ikkje opna passordfil\n"
-
-#, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: klarer ikkje endra brukar «%s» på NIS-klient.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Bruk: %s [-r] [-s] [gruppe [gskugge]]\n"
 
@@ -904,18 +788,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s og -r er inkompatible\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: klarer ikkje låse fila %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "ugyldig oppføring for gruppefil"
 
@@ -930,6 +802,10 @@
 msgid "invalid group name '%s'\n"
 msgstr "ugyldig gruppenamn «%s»\n"
 
+#, fuzzy, c-format
+msgid "invalid group ID '%lu'\n"
+msgstr "ugyldig gruppenamn «%s»\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "gruppe %s: ingen brukar %s\n"
@@ -943,17 +819,9 @@
 msgstr "ingen passande oppføring for gruppefil\n"
 
 #, fuzzy, c-format
-msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "skuggegruppe %s: ingen brukar %s\n"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: klarer ikkje oppdatere skuggeoppføring for %s\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: klarer ikkje oppdatere oppføring for gruppa %s\n"
-
 msgid "invalid shadow group file entry"
 msgstr "ugyldig oppføring av skuggegruppefil"
 
@@ -980,30 +848,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: ingen endringar\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: klarer ikkje låsa skuggegruppefil\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Bruk: goupdel gruppe\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: klarer ikkje opna skuggegruppefil\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Bruk: goupdel gruppe\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: klarer ikkje fjerna skuggegruppe %s\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: klarer ikkje oppdatere fila %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: klarer ikkje oppdatere skuggegruppefil\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: klarer ikkje oppdatere gruppefil\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: klan ikkje slette skuggegruppefil\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Bruk: id [-a]\n"
 
@@ -1025,6 +884,10 @@
 "\n"
 msgstr ""
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Brukarnamn       Port     Frå              Siste"
 
@@ -1034,15 +897,15 @@
 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 ""
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Bruk: %s [-p] [namn]\n"
 
@@ -1141,6 +1004,11 @@
 "\n"
 msgstr ""
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Bruk: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Bruk: newgrp [-] [gruppe]\n"
 
@@ -1156,13 +1024,9 @@
 msgstr "%s: ugyldig telefonnummer, arbeid: «%s»\n"
 
 #, fuzzy, c-format
-msgid "unknown UID: %u\n"
-msgstr "ukjent GID: %lu\n"
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: brukar %s finst ikkje\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "ukjent GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "for mange grupper\n"
 
@@ -1176,60 +1040,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: gruppe %s eksisterer ikkje\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "ugyldig gruppenamn «%s»\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: ugyldig brukarnamn «%s»\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: brukar %s finst ikkje\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: brukar %s finst ikkje\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: ugyldig brukarnamn «%s»\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: klarer ikkje låsa /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: klarer ikkje låsa /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: klarer ikkje låsa /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: klarer ikkje låsa /etc/passwd.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1245,9 +1068,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: linje %d: klarer ikkje laga GID\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: linje %d: klarer ikkje finne brukar %s\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: brukar %s finst ikkje\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1277,15 +1100,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1334,13 +1157,10 @@
 msgstr "Passordet for %s kan ikkje endrast.\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: tomt for minne\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1384,16 +1204,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "ugyldig brukarnamn «%s»\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "ugyldig brukarnamn «%s»\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "brukar %s: inga gruppe %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "brukar %s: mappe %s finst ikkje\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "brukar %s: program %s finst ikkje\n"
 
 #, fuzzy, c-format
@@ -1404,10 +1232,6 @@
 msgid "add user '%s' in %s? "
 msgstr "skuggegruppe %s: ingen brukar %s\n"
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: klarer ikkje oppdatere oppføring i passordfila for %s\n"
-
 msgid "invalid shadow password file entry"
 msgstr "ugyldig oppføring i skuggepassordfila"
 
@@ -1418,34 +1242,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "brukar %s: siste passordendring i framtida\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: klarer ikkje låda passordfil\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: klarer ikkje opna fila %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: klarer ikkje opna passordfil\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Bruk: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: klarer ikkje fjerna oppføring for %s i skuggepassordfila\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: klarer ikkje oppdatere skuggepassordfil\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Bruk: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: klarer ikkje oppdatere passordfil\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: klarer ikkje oppdatere oppføring for brukar %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: klarer ikkje sletta skuggepassordfil\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Tilgang til su for den kontoen er AVVIST.\n"
 
@@ -1500,6 +1315,16 @@
 "%s: %s\n"
 "(Ignorert)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: PAM-autentisering feila\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Du er ikkje autorisert til su %s\n"
+
 msgid "No shell\n"
 msgstr "Ingen skal\n"
 
@@ -1525,14 +1350,6 @@
 msgstr "Startar modus for systemvedlikehald"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: ukjent GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: ukjent gruppe %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: klarer ikkje opprette fil for standardverdiar\n"
 
@@ -1572,10 +1389,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1591,14 +1410,6 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: slapp opp for minne i update_group\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: slapp opp for minne i update_gshadow\n"
-
-#, fuzzy, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: ugyldig startmappe «%s»\n"
 
@@ -1635,50 +1446,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: ugyldig brukarnamn «%s»\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: klarer ikkje skriva ny passordfil\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: klarer ikkje skriva ny skuggepassordfil\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: klarer ikkje låsa skuggepassordfil\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: klarer ikkje opna skuggepassordfil\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: feil ved låsing av gruppefil\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: feil ved opning av gruppefil\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: feil ved låsing av skuggegruppefil\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: feil ved opning av skuggegruppefil\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: feil når passordoppføring blei lagt til\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: feil når oppføring av skuggepassord blei lag til\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: kan ikkje oppretta mappa %s\n"
 
@@ -1692,8 +1467,9 @@
 msgid "Setting mailbox file permissions"
 msgstr ""
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: brukar %s finst\n"
 
 #, c-format
@@ -1708,19 +1484,19 @@
 msgstr "%s: kan ikkje oppretta %s\n"
 
 #, fuzzy, c-format
-msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: gid %u er ikkje unikt\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: kan ikkje oppretta %s\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr "%s: åtvaring: CREATE_HOME ikkje støtta, bruk -m istaden.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1732,51 +1508,24 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: feil ved oppdatering av gruppeoppføring\n"
-
 #, fuzzy, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr "%s: klarer ikkje fjerna primærgruppa til brukaren.\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: feil ved oppdatering av gruppeoppføring\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: klarer ikkje opna gruppefila\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: klarer ikkje opna skuggepassordfila\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: feil ved sletting av passordoppføring\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: feil ved sletting av skuggepassordoppføring\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: brukaren %s er pålogga\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: åtvaring: kan ikkje fjerna "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s ikkje eigd av %s, ikkje fjerna\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: åtvaring: kan ikkje fjerna "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: brukar %s finst ikkje\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: brukar %s er ikkje ein NIS brukar\n"
 
@@ -1816,9 +1565,16 @@
 "\n"
 msgstr ""
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: feil ved oppretting av ny gruppeoppføring\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: brukar %s finst\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -1833,22 +1589,10 @@
 msgstr ""
 
 #, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: uid %lu er ikkje unik\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr ""
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: feil ved endring av passordoppføring\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: feil ved sletting av passordoppføring\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: feil ved sletting av oppføring for skuggepassord\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: mappa %s finst\n"
 
@@ -1869,6 +1613,14 @@
 msgstr "%s: klarte ikkje endra namn på mappa %s til %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: åtvaring: %s er ikkje eigd av %s\n"
 
@@ -1882,7 +1634,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -1897,10 +1649,15 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+msgid "%s: failed to remove %s\n"
+msgstr "%s: ugyldig telefonnummer, arbeid: «%s»\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s er ikkje endra\n"
@@ -1915,7 +1672,415 @@
 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: can't lock password file\n"
+#~ msgstr "%s: klarer ikkje låsa passordfil\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: klarer ikkje opna passordfil\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: klarer ikkje låsa skuggepassordfila\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: klarer ikkje opna skuggepassordfila\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: klarer ikkje skriva ny skuggepassordfil\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: klarer ikkje skriva ny passordfil\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: klarer ikkje oppdatere passordfil\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: klarer ikkje oppdatere skuggepassordfil\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tFullt namn: %s\n"
+
 #, fuzzy
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "Romnummer"
+
+#, fuzzy
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "Telefon, arbeid"
+
+#, fuzzy
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "Telefon, heime"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr "Klarer ikkje låsa passordfila, prøv igjen seinare.\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Klarer ikkje opna passordfila.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: klarer ikkje låsa gruppefil\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: klarer ikkje opna gruppefil\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: klarer ikkje låsa skuggepassordfila\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: klarer ikkje opna skuggepassordfila\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: feil ved oppdatering av skuggepassordfila\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: feil ved oppdatering av gruppeoppføring\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: linje %d: ukjent brukar %s\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: linje %d: kan ikkje oppdatere oppføring\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: klarer ikkje låsa skuggepassordfila\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: feil ved oppdatering av skuggepassordfila\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: feil ved oppdatering av passordfila\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: linje %d: ukjent brukar %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: linje %d: klarer ikkje oppdatere passordet\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: ukjent brukar\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Ukjent brukar: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Bruk: %s [-r|-R] gruppe\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "      %s [-a brukar] gruppe\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "      %s [-d brukar] gruppe\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "      %s [-A brukar,...] [-M brukar,...] gruppe\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "      %s [-M brukar,...] gruppe\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: klarer ikkje få lås\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: klarer ikkje få lås på skuggefil\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: klarer ikkje opna fil\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: klarer ikkje skriva ny fila\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: klarer ikkje skriva ny skuggefil\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: klarer ikkje låsa opp fil\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: klarer ikkje oppdatere oppføring\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: klarer ikkje oppdatere skuggeoppføring\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "ukjent gruppe: %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: klarer ikkje opna fil\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: klarer ikkje opna skuggepassordfila\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Kven er du?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: ukjent medlem %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: feil ved oppretting av ny gruppeoppføring\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: klarer ikkje skriva ny gruppefil\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: klarer ikkje skriva ny skuggegruppefil\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: klarer ikkje låsa gruppefil\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: klarer ikkje opna gruppefil\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: klarer ikkje låsa skuggegruppefil\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: klarer ikkje opna skuggegruppefil\n"
+
+#, fuzzy
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: gid %u er ikkje unikt\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: feil ved fjerning av gruppeoppføring\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: feil ved fjerning av oppføring for skuggegruppe\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: klarer ikkje fjerna primærgruppa til brukaren.\n"
+
+#, fuzzy
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "%s: PAM-autentisering feila\n"
+
+#, fuzzy
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "%s: klarer ikkje låsa gruppefil\n"
+
+#, fuzzy
+#~ msgid "Unable to open group file\n"
+#~ msgstr "%s: klarer ikkje opna gruppefil\n"
+
+#, fuzzy
+#~ msgid "Cannot close group file\n"
+#~ msgstr "%s: klarer ikkje opna gruppefila\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s ikkje funne i /etc/group\n"
+
+#, fuzzy
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u er ikkje ein unik gid\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s er ikkje eit unikt namn\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: klarer ikkje skriva ny passordfil\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: klarer ikkje låsa passordfil\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: klarer ikkje opna passordfil\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: klarer ikkje låse fila %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: klarer ikkje oppdatere skuggeoppføring for %s\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: klarer ikkje oppdatere oppføring for gruppa %s\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: klarer ikkje låsa skuggegruppefil\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: klarer ikkje opna skuggegruppefil\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: klarer ikkje fjerna skuggegruppe %s\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: klarer ikkje oppdatere skuggegruppefil\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: klarer ikkje oppdatere gruppefil\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: klan ikkje slette skuggegruppefil\n"
+
+#, fuzzy
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "ukjent GID: %lu\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "ukjent GID: %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: gruppe %s eksisterer ikkje\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: brukar %s finst ikkje\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: ugyldig brukarnamn «%s»\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: klarer ikkje låsa /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: klarer ikkje låsa /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: klarer ikkje låsa /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: klarer ikkje låsa /etc/passwd.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: klarer ikkje opna filer\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: feil ved oppdatering av filer\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: linje %d: klarer ikkje finne brukar %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: klarer ikkje oppdatere oppføring i passordfila for %s\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: klarer ikkje låda passordfil\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: klarer ikkje opna passordfil\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: klarer ikkje fjerna oppføring for %s i skuggepassordfila\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: klarer ikkje oppdatere skuggepassordfil\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: klarer ikkje oppdatere passordfil\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: klarer ikkje oppdatere oppføring for brukar %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: klarer ikkje sletta skuggepassordfil\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: ukjent GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: ukjent gruppe %s\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: slapp opp for minne i update_gshadow\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: klarer ikkje skriva ny passordfil\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: klarer ikkje skriva ny skuggepassordfil\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: klarer ikkje låsa skuggepassordfil\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: klarer ikkje opna skuggepassordfil\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: feil ved låsing av gruppefil\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: feil ved opning av gruppefil\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: feil ved låsing av skuggegruppefil\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: feil ved opning av skuggegruppefil\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: feil når passordoppføring blei lagt til\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: feil når oppføring av skuggepassord blei lag til\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr "%s: åtvaring: CREATE_HOME ikkje støtta, bruk -m istaden.\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: feil ved oppdatering av gruppeoppføring\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: feil ved oppdatering av gruppeoppføring\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: klarer ikkje opna gruppefila\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: klarer ikkje opna skuggepassordfila\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: feil ved sletting av passordoppføring\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: feil ved sletting av skuggepassordoppføring\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: brukar %s finst ikkje\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: feil ved oppretting av ny gruppeoppføring\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: uid %lu er ikkje unik\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: feil ved endring av passordoppføring\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: feil ved sletting av passordoppføring\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: feil ved sletting av oppføring for skuggepassord\n"
+
+#, fuzzy
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: klarer ikkje få unikt gid\n"
 
@@ -1927,9 +2092,6 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " på «%.100s»"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: klarer ikkje låsa filer, prøv igjen seinare\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: linje %d: klarer ikkje laga UID\n"
 
@@ -1937,10 +2099,6 @@
 #~ 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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/pl.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -57,6 +57,9 @@
 msgid "  Choose a new password."
 msgstr "  Wybierz nowe hasło."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Twoje hasło straci ważność w ciągu %ld dni.\n"
@@ -68,7 +71,12 @@
 msgstr "Dziś twoje hasło straci ważność."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Nie można zmienić tty %s"
 
 msgid "Environment overflow\n"
@@ -95,14 +103,14 @@
 "%d nieudanych prób logowania od ostatniego logowania.\n"
 "Ostatnie logowanie: dnia %s na terminalu %s.\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\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"
+
+#, 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
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s: nie można uzyskać niepowtarzalnego GID\n"
-
 msgid "Too many logins.\n"
 msgstr "Zbyt wiele otwartych sesji.\n"
 
@@ -193,9 +201,18 @@
 msgstr "Nie można ustalić nazwy twojego terminala."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: brak pamięci\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) nie powiodło się\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "Nie\n"
+
 msgid "Password: "
 msgstr "Hasło: "
 
@@ -203,6 +220,11 @@
 msgid "%s's Password: "
 msgstr "Hasło użytkownika %s: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: pola zbyt długie\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -301,42 +323,33 @@
 msgstr "%s: Operacja niedozwolona.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Nie można ustalić twojej nazwy użytkownika.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 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"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: nie można zablokować plików, spróbuj później\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: nie można otworzyć pliku z hasłami\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: nie można otworzyć pliku %s\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: nie można zablokować pliku z ukrytymi hasłami\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: failure forking: %s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: niepowiodło się porzucenie uprawnień (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: nie można przepisać 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"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: nie można zaktualizować pliku z hasłami\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: nie można zaktualizować pliku z ukrytymi hasłami\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: brak pliku z ukrytymi hasłami\n"
 
@@ -344,9 +357,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: użytkownik %s nie istnieje\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -372,57 +385,27 @@
 msgid "Full Name"
 msgstr "Imię i nazwisko"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tImię i nazwisko: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Numer pokoju"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tNumer pokoju: %s\n"
-
 msgid "Work Phone"
 msgstr "Telefon do pracy"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tTelefon do pracy: %s\n"
-
 msgid "Home Phone"
 msgstr "Telefon domowy"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tTelefon domowy: %s\n"
-
 msgid "Other"
 msgstr "Inne"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Nie można zmienić ID na root.\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"
-
-msgid "Cannot open the password file.\n"
-msgstr "Nie można otworzyć pliku z hasłami.\n"
-
 #, c-format
-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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -455,9 +438,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' zawiera nieprawidłowe znaki\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Nie można ustalić twojej nazwy użytkownika.\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: użytkownik %s nie istnieje\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -506,7 +489,7 @@
 msgstr "%s: nieprawidłowy argument numeryczny '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: opcja -a można użyć TYLKO z pcją -G\n"
 
 #, c-format
@@ -518,30 +501,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: nie można zablokować pliku z grupami\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: nie można otworzyć pliku z grupami\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: nie można zablokować pliku gshadow\n"
-
-#, c-format
-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"
 
@@ -549,38 +508,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: linia %d: brakuje nowego hasła\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: linia %d: nieznana grupa %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: grupa %s nie istnieje\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: użytkownik %s nie istnieje\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: błąd podczas aktualizacji pliku z ukrytymi hasłami\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: błąd podczas aktualizacji pliku z 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"
@@ -599,8 +544,9 @@
 msgid "Login Shell"
 msgstr "Powłoka logowania"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Nie możesz zmieniać powłoki dla %s.\n"
 
 #, c-format
@@ -611,24 +557,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Nieprawidłowy wpis: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s jest nieprawidłową powłoką.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Użycie: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: nieznany użytkownik\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -656,11 +618,16 @@
 "                        -m lub -l) tylko dla użytkownika o loginie LOGIN\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Nieudane Maks.   Ostanio                  Na\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [pozostało %lds]"
 
 #, c-format
@@ -668,76 +635,67 @@
 msgstr " [blokada %lds]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Nieznany użytkownik: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Użycie: %s [-r|-R] grupa\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "        %s [-a użytkownik] grupa\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "        %s [-d użytkownik] grupa\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Nieznany użytkownik: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "        %s [-A użytkownik,...] [-M użytkownik,...] grupa\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: nie można otworzyć pliku %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "        %s [-M użytkownik,...] grupa\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: plik z ukrytymi hasłami grup wymagany dla -A\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: nie można zablokować\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: nie można zablokować pliku z ukrytymi hasłami\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Hasło dla %s nie może być zmienione.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: nie można otworzyć pliku\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: plik z ukrytymi hasłami grup wymagany dla -A\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: nie można otworzyć pliku\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: grupa %s nie istnieje\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: failure forking: %s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -756,9 +714,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Spróbuj ponownie później\n"
 
-msgid "Who are you?\n"
-msgstr "Kim jesteś?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Dodaję nowego użytkownika %s do grupy %s\n"
@@ -767,9 +722,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: użytkownik %s nie istnieje\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -803,111 +758,89 @@
 "  -o, --non-unique           pozwól na utworzenie grupy z nieunikalnym GID\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: błąd podczas dodawania nowej grupy\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s: nie jest prawidłową nazwą grupy\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: nie można przepisać pliku z grupami\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "nieprawidłowa nazwa grupy '%s'\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: nie można przepisać pliku z ukrytymi hasłami grup\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: nie można zablokować pliku z grupami\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: nie można otworzyć pliku z grupami\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: nie można zablokować pliku z ukrytymi hasłami grup\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami grup\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K wymaga KLUCZ=WARTOŚĆ\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 msgstr "%s: grupa %s istnieje\n"
 
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u nie jest niepowtarzalny\n"
-
 #, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: nie można utworzyć %s\n"
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "Członek grupy już istnieje\n"
 
 msgid "Usage: groupdel group\n"
 msgstr "Użycie: groupdel grupa\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: błąd podczas usuwania grupy\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: nie można zmienić nazwy katalogu z %s na %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: błąd podczas usuwania wpisu z pliku z ukrytymi hasłami grup\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: nie można zmienić użytkownika '%s' na kliencie NIS.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: nie można usunąć podstawowej grupy użytkowników.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: grupa %s nie istnieje\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: grupa %s jest grupą NIS\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: grupa '%s' jest grupą NIS.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s jest głównym serwerem NIS\n"
 
-msgid "Member already exists\n"
-msgstr "Członek grupy już istnieje\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: użytkownik %s jest użytkownikiem NIS\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Nie znaleziony członek grupy do usunięcia\n"
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: zabrakło pamięci w update_group\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
-msgstr "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
 
-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 "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "Wymagane prawa dostępu do grupy\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Nie jesteś głównym właścicielem bieżącej grupy\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "Błąd uwierzytelniania przez PAM dla\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Nie można zablokować pliku z grupami\n"
-
-msgid "Unable to open group file\n"
-msgstr "Nie można otworzyć pliku z grupami\n"
-
-msgid "Cannot close group file\n"
-msgstr "Nie można zamknąć pliku z grupami\n"
-
 #, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
@@ -933,41 +866,19 @@
 "GID\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: nie znaleziono %s w /etc/group\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u nie jest niepowtarzalnym GID\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s nie jest niepowtarzalną nazwą\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: nie można przepisać pliku z hasłami\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "nieprawidłowa nazwa grupy '%s'\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: nie można zablokować pliku z hasłami\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: grupa %s jest grupą NIS\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: nie można otworzyć pliku z hasłami\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: nieznany użytkownik %s\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: nie można zmienić użytkownika '%s' na kliencie NIS.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Użycie: %s [-r] [-s] [grupa [gshadow]]\n"
 
@@ -979,18 +890,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s i -r są niekompatybilne\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: nie można zablokować pliku %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "nieprawidłowy wpis do pliku grup"
 
@@ -1005,6 +904,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "nieprawidłowa nazwa grupy '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "nieprawidłowa nazwa grupy '%s'\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "grupa %s: nie ma użytkownika %s\n"
@@ -1017,18 +921,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "brak pasującego wpisu w pliku group %s\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "dodać grupę '%s' w %s ?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: nie można zaktualizować wpisu w pliku z ukrytymi hasłami dla %s\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: nie można zaktualizować wpisu dla grupy %s\n"
-
 msgid "invalid shadow group file entry"
 msgstr "nieprawidłowy wpis w pliku z ukrytymi hasłami grup"
 
@@ -1057,30 +954,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: bez zmian\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: nie można zablokować pliku z ukrytymi hasłami grup\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Użycie: groupdel grupa\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami grup\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Użycie: groupdel grupa\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: nie można usunąć grupy %s z pliku ukrytych haseł grup\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: nie można zaktualizować pliku %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: nie można zaktualizować pliku z ukrytymi hasłami grup\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: nie można zaktualizować pliku z grupami\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: nie można skasować pliku z ukrytymi hasłami grup\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Użycie: id [-a]\n"
 
@@ -1111,6 +999,10 @@
 "                        o loginie LOGIN\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Użytkownik       Port     Z                Ostatnio"
 
@@ -1120,15 +1012,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Użycie: %s [-p] [nazwa]\n"
 
@@ -1225,6 +1117,11 @@
 "przekroczony czas logowania\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Użycie: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Użycie: newgrp [-] [grupa]\n"
 
@@ -1239,14 +1136,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: failure forking: %s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "nieznany UID: %u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: użytkownik %s nie istnieje\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "nieznany GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "zbyt wiele grup\n"
 
@@ -1260,60 +1153,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: grupa %s nie istnieje\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "nieprawidłowa nazwa grupy '%s'\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: nieprawidłowa nazwa użytkownika '%s'\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: użytkownik %s nie istnieje\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: użytkownik %s nie istnieje\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: nieprawidłowa nazwa użytkownika '%s'\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: nie można zablokować /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: nie można zablokować /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: nie można zablokować /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: nie można zablokować /etc/passwd.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1329,9 +1181,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: linia %d: nie można utworzyć GID\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: linia %d: nie można znaleźć użytkownika %s\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: użytkownik %s nie istnieje\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1349,6 +1201,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: linia %d: nie można zaktualizować wpisu\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1361,15 +1241,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1444,13 +1324,10 @@
 msgstr "Hasło dla %s nie może być zmienione.\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: brak pamięci\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1493,16 +1370,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "nieprawidłowa nazwa użytkownika '%s'\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "nieprawidłowa nazwa użytkownika '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "użytkownik %s: brak grupy %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "użytkownik %s: katalog %s nie istnieje\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "użytkownik %s: program %s nie istnieje\n"
 
 #, c-format
@@ -1513,10 +1398,6 @@
 msgid "add user '%s' in %s? "
 msgstr "dodać grupę '%s' w %s ?"
 
-#, c-format
-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"
-
 msgid "invalid shadow password file entry"
 msgstr "nieprawidłowy wpis w pliku z hasłami"
 
@@ -1527,34 +1408,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "użytkownik %s: ostatnia zmiana hasła w przyszłości\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: nie można zablokować pliku z hasłami\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: nie można otworzyć pliku %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: nie można otworzyć pliku z hasłami\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Użycie: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: nie można usunąć wpisu z pliku z ukrytymi hasłami dla %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: nie można zaktualizować pliku z ukrytymi hasłami\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Użycie: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: nie można zaktualizować pliku z hasłami\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: nie można zaktualizować wpisu dla użytkownika %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: nie można skasować pliku z ukrytymi hasłami\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Dostęp do polecenia su z tego konta ZABRONIONY.\n"
 
@@ -1619,6 +1491,16 @@
 "%s: %s\n"
 "(Zignorowano)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: błąd podczas uwierzytelniania przez PAM\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Nie masz autoryzacji by używać su %s\n"
+
 msgid "No shell\n"
 msgstr "Brak powłoki\n"
 
@@ -1644,14 +1526,6 @@
 msgstr "Wchodzę w tryb konserwacji systemu"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: nieznany GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: nieznana grupa %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: nie można utworzyć nowego pliku z ustawieniami domyślnymi\n"
 
@@ -1692,10 +1566,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1741,14 +1617,6 @@
 "                                tworzonego konta\n"
 "\n"
 
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: zabrakło pamięci w update_group\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: zabrakło pamięci w update_gshadow\n"
-
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: nieprawidłowy katalog bazowy '%s'\n"
@@ -1786,50 +1654,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: nieprawidłowa nazwa użytkownika '%s'\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: nie można przepisać pliku z hasłami\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: nie można przepisać pliku z ukrytymi hasłami\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: nie można zablokować pliku z ukrytymi hasłami\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: błąd podczas blokowania pliku z grupami\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: błąd podczas otwierania pliku z grupami\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: błąd podczas blokowania pliku z ukrytymi hasłami grup\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: błąd podczas otwierania pliku z ukrytymi hasłami grup\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: błąd podczas dodawania nowego wpisu do pliku z hasłami\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: błąd podczas dodawania nowego wpisu do pliku z ukrytymi hasłami\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: nie można utworzyć katalogu %s\n"
 
@@ -1845,8 +1677,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Ustawianie praw dostępu do pliku mailbox"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: użytkownik %s istnieje\n"
 
 #, c-format
@@ -1859,10 +1692,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s: nie można utworzyć %s\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u nie jest niepowtarzalny\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: nie można utworzyć %s\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1871,10 +1709,6 @@
 "%s: uwaga: katalog domowy już istnieje.\n"
 "Pliki z katalogu skel nie są kopiowane.\n"
 
-#, c-format
-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"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1894,53 +1728,28 @@
 "  -r, --remove              usuń katalog domowy i spool pocztowy\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: błąd podczas aktualizacji wpisu grupy\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: nie można usunąć grupy %s która jest grupą podstawową\n"
 "dla innego użytkownika.\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: błąd podczas aktualizacji wpisu grupy\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: nie można otworzyć pliku z grupami\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami grup\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: błąd podczas usuwania wpisu z pliku z hasłami\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: błąd podczas usuwania wpisu z pliku z ukrytymi hasłami\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: użytkownik %s jest aktualnie zalogowany\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: ostrzeżenie: nie można usunąć "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: właścicielem %s nie jest %s, nie usuwam\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: ostrzeżenie: nie można usunąć "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: użytkownik %s nie istnieje\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: użytkownik %s jest użytkownikiem NIS\n"
 
@@ -2005,9 +1814,16 @@
 "  -U, --unlock                odblokuj konto użytkownika\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: błąd podczas dodawania nowej grupy\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: użytkownik %s istnieje\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -2021,23 +1837,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: uid %lu nie jest niepowtarzalny\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "Członek grupy już istnieje\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: błąd podczas zmiany wpisu w pliku z hasłami\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: błąd podczas usuwania wpisu z pliku z hasłami\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: błąd podczas usuwania wpisu z pliku z ukrytymi hasłami\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: katalog %s istnieje\n"
 
@@ -2059,6 +1864,14 @@
 msgstr "%s: nie można zmienić nazwy katalogu z %s na %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: ostrzeżenie: właścicielem %s nie jest %s\n"
 
@@ -2072,7 +1885,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -2096,10 +1909,16 @@
 "  -s, --shadow          edycja bazy shadow lub gshadow\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: niepowiodło się porzucenie uprawnień (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s jest niezmieniony\n"
@@ -2114,6 +1933,421 @@
 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: can't lock password file\n"
+#~ msgstr "%s: nie można zablokować pliku z hasłami\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: nie można otworzyć pliku z hasłami\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: nie można zablokować pliku z ukrytymi hasłami\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: nie można przepisać pliku z ukrytymi hasłami\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: nie można przepisać pliku z hasłami\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: nie można zaktualizować pliku z hasłami\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: nie można zaktualizować pliku z ukrytymi hasłami\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tImię i nazwisko: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tNumer pokoju: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tTelefon do pracy: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tTelefon domowy: %s\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"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Nie można otworzyć pliku z hasłami.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: nie można zablokować pliku z grupami\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: nie można otworzyć pliku z grupami\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: nie można zablokować pliku gshadow\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: błąd podczas aktualizacji pliku z ukrytymi hasłami\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: błąd podczas aktualizacji wpisu grupy\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: linia %d: nieznana grupa %s\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: linia %d: nie można zaktualizować wpisu\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: nie można zablokować pliku z ukrytymi hasłami\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: błąd podczas aktualizacji pliku z ukrytymi hasłami\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: błąd podczas aktualizacji pliku z hasłami\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: linia %d: nieznany użytkownik %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: linia %d: nie można zaktualizować wpisu do bazy haseł\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: nieznany użytkownik\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Nieznany użytkownik: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Użycie: %s [-r|-R] grupa\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "        %s [-a użytkownik] grupa\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "        %s [-d użytkownik] grupa\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "        %s [-A użytkownik,...] [-M użytkownik,...] grupa\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "        %s [-M użytkownik,...] grupa\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: nie można zablokować\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: nie można zablokować pliku z ukrytymi hasłami\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: nie można otworzyć pliku\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: nie można przepisać pliku\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: nie można przepisać pliku z ukrytymi hasłami\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: nie można usunąć blokady z pliku\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: nie można zaktualizować wpisu\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: nie można zaktualizować wpisu do pliku z ukrytymi hasłami\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "nieznana grupa: %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: nie można otworzyć pliku\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Kim jesteś?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: nieznany członek %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: błąd podczas dodawania nowej grupy\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: nie można przepisać pliku z grupami\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: nie można przepisać pliku z ukrytymi hasłami grup\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: nie można zablokować pliku z grupami\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: nie można otworzyć pliku z grupami\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: nie można zablokować pliku z ukrytymi hasłami grup\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami grup\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u nie jest niepowtarzalny\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: błąd podczas usuwania grupy\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: błąd podczas usuwania wpisu z pliku z ukrytymi hasłami grup\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: nie można usunąć podstawowej grupy użytkowników.\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Nie znaleziony członek grupy do usunięcia\n"
+
+#~ msgid ""
+#~ "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+#~ msgstr ""
+#~ "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "Tylko root może dodać członka do różnych grup\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "Wymagane prawa dostępu do grupy\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Nie jesteś głównym właścicielem bieżącej grupy\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "Błąd uwierzytelniania przez PAM dla\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Nie można zablokować pliku z grupami\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Nie można otworzyć pliku z grupami\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Nie można zamknąć pliku z grupami\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: nie znaleziono %s w /etc/group\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u nie jest niepowtarzalnym GID\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s nie jest niepowtarzalną nazwą\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: nie można przepisać pliku z hasłami\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: nie można zablokować pliku z hasłami\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: nie można otworzyć pliku z hasłami\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: nie można zablokować pliku %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr ""
+#~ "%s: nie można zaktualizować wpisu w pliku z ukrytymi hasłami dla %s\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: nie można zaktualizować wpisu dla grupy %s\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: nie można zablokować pliku z ukrytymi hasłami grup\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami grup\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: nie można usunąć grupy %s z pliku ukrytych haseł grup\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: nie można zaktualizować pliku z ukrytymi hasłami grup\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: nie można zaktualizować pliku z grupami\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: nie można skasować pliku z ukrytymi hasłami grup\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "nieznany UID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "nieznany GID: %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: grupa %s nie istnieje\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: użytkownik %s nie istnieje\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: nieprawidłowa nazwa użytkownika '%s'\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: nie można zablokować /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: nie można zablokować /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: nie można zablokować /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: nie można zablokować /etc/passwd.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: nie można otworzyć plików\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: błąd podczas aktualizowania plików\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: linia %d: nie można znaleźć użytkownika %s\n"
+
+#~ 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"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: nie można zablokować pliku z hasłami\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: nie można otworzyć pliku z hasłami\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: nie można usunąć wpisu z pliku z ukrytymi hasłami dla %s\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: nie można zaktualizować pliku z ukrytymi hasłami\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: nie można zaktualizować pliku z hasłami\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: nie można zaktualizować wpisu dla użytkownika %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: nie można skasować pliku z ukrytymi hasłami\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: nieznany GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: nieznana grupa %s\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: zabrakło pamięci w update_gshadow\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: nie można przepisać pliku z hasłami\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: nie można przepisać pliku z ukrytymi hasłami\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: nie można zablokować pliku z ukrytymi hasłami\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: błąd podczas blokowania pliku z grupami\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: błąd podczas otwierania pliku z grupami\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: błąd podczas blokowania pliku z ukrytymi hasłami grup\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: błąd podczas otwierania pliku z ukrytymi hasłami grup\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: błąd podczas dodawania nowego wpisu do pliku z hasłami\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr ""
+#~ "%s: błąd podczas dodawania nowego wpisu do pliku z ukrytymi hasłami\n"
+
+#~ 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"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: błąd podczas aktualizacji wpisu grupy\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: błąd podczas aktualizacji wpisu grupy\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: nie można otworzyć pliku z grupami\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami grup\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: błąd podczas usuwania wpisu z pliku z hasłami\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: błąd podczas usuwania wpisu z pliku z ukrytymi hasłami\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: użytkownik %s nie istnieje\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: błąd podczas dodawania nowej grupy\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: uid %lu nie jest niepowtarzalny\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: błąd podczas zmiany wpisu w pliku z hasłami\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: błąd podczas usuwania wpisu z pliku z hasłami\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: błąd podczas usuwania wpisu z pliku z ukrytymi hasłami\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: nie można uzyskać niepowtarzalnego GID\n"
 
@@ -2123,18 +2357,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " na '%.100s'"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: nie można zablokować plików, spróbuj później\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: linia %d: nie można utworzyć UID\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/pt.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\n"
 "PO-Revision-Date: 2008-03-21 00:32+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -56,6 +56,9 @@
 msgid "  Choose a new password."
 msgstr "  Escolha uma nova palavra-passe."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "A sua palavra-passe vai caducar em %ld dias.\n"
@@ -67,7 +70,12 @@
 msgstr "A sua palavra-passe vai caducar hoje."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Foi impossível mudar o tty %s"
 
 msgid "Environment overflow\n"
@@ -87,13 +95,17 @@
 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"
 
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+#| msgid "Can't get unique GID (no more available GIDs)\n"
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr ""
-"Não foi possível obter um UID único (não existem mais UIDs disponíveis)\n"
+"Não foi possível obter um GID único (não existem mais GIDs disponíveis)\n"
 
-msgid "Can't get unique GID (no more available GIDs)\n"
+#, fuzzy, c-format
+#| msgid "Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr ""
-"Não foi possível obter um GID único (não existem mais GIDs disponíveis)\n"
+"Não foi possível obter um UID único (não existem mais UIDs disponíveis)\n"
 
 msgid "Too many logins.\n"
 msgstr "Demasiados logins.\n"
@@ -188,9 +200,18 @@
 msgstr "Não é possível determinar nome do seu tty."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: falta de memória\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "O malloc(%d) falhou\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "Não\n"
+
 msgid "Password: "
 msgstr "Palavra-passe: "
 
@@ -198,6 +219,11 @@
 msgid "%s's Password: "
 msgstr "Palavra-passe de %s: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: valores demasiado grandes\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -296,45 +322,35 @@
 msgstr "%s: Permissão negada.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Não é possível determinar o seu nome de utilizador.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: A autenticação PAM falhou\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
 msgstr ""
-"%s: não é possível obter acesso exclusivo ao ficheiro de palavras-passe\n"
+"%s: não é possível obter acesso excluviso a ficheiros, tente mais tarde\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: não é possível abrir o ficheiro de palavras-passe\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: não é possível abrir o ficheiro %s\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr ""
-"%s: não é possível obter acesso exclusivo ao ficheiro de palavras-passe "
-"shadow\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: o fork falhou: %s\n"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: não é possível abrir o ficheiro de palavras-passe shadow\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: falhou baixar privilégios (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: não é possível reescrever o ficheiro de palavras-passe shadow\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: não é possível reescrever o ficheiro de palavras-passe\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: não é possível actualizar o ficheiro de palavras-passe\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: não é possível actualizar o ficheiro de palavras-passe shadow\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: o ficheiro de palavras-passe shadow não está presente\n"
 
@@ -342,9 +358,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: o utilizador `%s' não existe\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -371,61 +388,27 @@
 msgid "Full Name"
 msgstr "Nome Completo"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tNome Completo: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Número da Sala"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tNúmero da Sala: %s\n"
-
 msgid "Work Phone"
 msgstr "Telefone do Emprego"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tTelefone do Emprego: %s\n"
-
 msgid "Home Phone"
 msgstr "Telefone de Casa"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tTelefone de Casa: %s\n"
-
 msgid "Other"
 msgstr "Outra Informação"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Não é possível alterar o ID para root.\n"
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr ""
-"Não é possível obter acesso exclusivo ao ficheiro de palavras-passe; tente "
-"novamente mais tarde.\n"
-
-msgid "Cannot open the password file.\n"
-msgstr "Não é possível abrir o ficheiro de palavras-passe.\n"
-
 #, c-format
-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 a entrada da palavra-passe.\n"
-
-msgid "Cannot commit password file changes.\n"
-msgstr ""
-"Não é possível gravar as alteração efectuadas ao ficheiro de palavras-"
-"passe.\n"
-
-msgid "Cannot unlock the password file.\n"
-msgstr "Não é possível libertar o ficheiro de palavras-passe.\n"
-
-#, c-format
 msgid "%s: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -458,9 +441,10 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' contém caracteres não permitidos.\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Não é possível determinar o seu nome de utilizador.\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: o utilizador `%s' não existe\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -512,8 +496,9 @@
 msgid "%s: invalid numeric argument '%s'\n"
 msgstr "%s: argumento numérico inválido '%s'\n"
 
-#, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+#, fuzzy, c-format
+#| msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: a flag %s SÓ é permitida com a flag %s\n"
 
 #, c-format
@@ -525,30 +510,6 @@
 msgstr "%s: método de encriptação não suportado: %s\n"
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: não é possível obter acesso exclusivo ao ficheiro dos grupos\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: não é possível abrir o ficheiro dos grupos\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: não é possível obter acesso exclusivo ao ficheiro gshadow\n"
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-msgstr "%s: não é possível abrir o ficheiro shadow\n"
-
-#, c-format
-msgid "%s: error updating gshadow file\n"
-msgstr "%s: erro ao actualizar o ficheiro gshadow\n"
-
-#, c-format
-msgid "%s: error updating group file\n"
-msgstr "%s: erro ao actualizar o ficheiro group\n"
-
-#, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: linha %d: linha demasiado grande\n"
 
@@ -556,38 +517,25 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: linha %d: falta a nova palavra-passe\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: linha %d: grupo %s desconhecido\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: o grupo %s não existe.\n"
 
-#, c-format
-msgid "%s: line %d: cannot update group entry\n"
-msgstr "%s: linha %d: não é possível actualizar a entrada em group\n"
+#, fuzzy, c-format
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: o utilizador `%s' não existe\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: erro a actualizar o ficheiro shadow\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: erro a actualizar o ficheiro de palavras-passe\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 a entrada da palavra-passe\n"
-
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -607,8 +555,9 @@
 msgid "Login Shell"
 msgstr "Shell de Login"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Não pode alterar a shell de %s.\n"
 
 #, c-format
@@ -619,24 +568,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Entrada inválida: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s é uma shell inválida.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Utilização: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: utilizador desconhecido\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -668,11 +633,16 @@
 "                                utilizador com o login LOGIN\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Falhas   Máximo  Última                   Em\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [faltam %lds]"
 
 #, c-format
@@ -680,78 +650,71 @@
 msgstr " [%lds lock]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Utilizador Deconhecido: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Utilização: %s [-r|-R] grupo\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a utilizador] grupo\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d utilizador] grupo\n"
+#, fuzzy, c-format
+#| msgid "Unknown user or range: %s\n"
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Utilizador ou gama desconhecidos: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A utilizador,...] [-M utilizador,...] grupo\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: não é possível abrir o ficheiro %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M utilizador,...] grupo\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: são necessárias palavras-passe shadow de grupo para -A\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: não é possível obter acesso exclusivo\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: não é possível obter acesso exclusivo a shadow\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "A palavra-passe para %s não pode ser alterada.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: não é possível abrir o ficheiro\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: são necessárias palavras-passe shadow de grupo para -A\n"
 
-#, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: não é possível reescrever o ficheiro\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: o grupo %s não existe.\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: não é possível reescrever o ficheiro de shadow\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: o fork falhou: %s\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 a entrada\n"
-
-#, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr "%s: não é possível actualizar a entrada do shadow\n"
-
-#, c-format
-msgid "unknown group: %s\n"
-msgstr "grupo desconhecido: %s\n"
-
-#, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: não é possível fechar o ficheiro\n"
-
-#, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: não é possível fechar o ficheiro shadow\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "A alterar a palavra-passe para o grupo %s\n"
 
@@ -768,9 +731,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Tente de novo mais tarde\n"
 
-msgid "Who are you?\n"
-msgstr "Quem é você?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "A adicionar o utilizador %s ao grupo %s\n"
@@ -779,9 +739,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: o utilizador `%s' não existe\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -818,114 +779,95 @@
 "  -r, --system                  criar uma conta de sistema\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: erro ao adicionar a entrada do novo grupo\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s não é um nome válido para o grupo\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: não é possível reescrever o ficheiro dos grupos\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group ID '%s'\n"
+msgstr "%s: nome de grupo `%s' é inválido\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: não é possível reescrever o ficheiro de shadow dos grupos\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: não é possível obter acesso exclusivo ao ficheiro dos grupos\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: não é possível abrir o ficheiro dos grupos\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr ""
-"%s: não é possivel obter acesso exclusivo ao ficheiro de shadow dos grupos\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: não é possível abrir o ficheiro de shadow dos grupos\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K necessita de KEY=VALOR\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 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"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "O membro já existe\n"
 
-#, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: não é possível criar grupo\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "Utilização: groupdel grupo\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: erro ao remover a entrada do grupo\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: não é possível renomear o directório %s para %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: erro ao remover a entrada de shadow do grupo\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr ""
+"%s: não é possível alterar o grupo primário do utilizador '%s' de %u para %"
+"u.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: não é possível remover o grupo primário do utilizador.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: o grupo %s não existe.\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: o grupo %s é um grupo NIS\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: o grupo '%s' é um grupo NIS.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s é o NIS master\n"
 
-msgid "Member already exists\n"
-msgstr "O membro já existe\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: o utilizador %s é um utilizador NIS\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "O membro a remover não foi encontrado\n"
+#, fuzzy, c-format
+#| msgid "%s: Out of memory. Cannot update the group database.\n"
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr ""
+"%s: Memória esgotada. Não foi possível actualizar a base de dados group.\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
-"Utilização: groupmems -a nomeutilizador | -d nomeutilizador | -D | -l [-g "
-"nomegrupo]\n"
 
-msgid "Only root can add members to different groups\n"
-msgstr "Apenas o root pode acrescentar membros a diferentes grupos\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "É necessário acesso ao grupo\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Não é o dono primário do actual grupo\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "A autenticação PAM falhou para\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Não é possível obter acesso exclusivo ao ficheiro dos grupos\n"
-
-msgid "Unable to open group file\n"
-msgstr "Não é possível abrir o ficheiro dos grupos\n"
-
-msgid "Cannot close group file\n"
-msgstr "Não é possível abrir o ficheiro dos grupos\n"
-
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -950,46 +892,20 @@
 "                                nova palavra-passe\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s não foi encontrado em /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "%s: nome de grupo `%s' é inválido\n"
 
 #, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u não é um GID único\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: o grupo %s é um grupo NIS\n"
 
 #, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s não é um nome único\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: utilizador desconhecido %s\n"
 
 #, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: não foi possível sobreescrever o ficheiro passwd\n"
-
-#, c-format
-msgid "%s: unable to lock password file\n"
-msgstr ""
-"%s: não foi possível obter acesso exclusivo ao ficheiro de palavras-passe\n"
-
-#, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: não foi possível abrir o ficheiro de palavras-passe\n"
-
-#, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-"%s: não foi possível mudar o grupo primário do utilizador '%s' de %u para %"
-"u, já que não está no ficheiro passwd.\n"
-
-#, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr ""
-"%s: não é possível alterar o grupo primário do utilizador '%s' de %u para %"
-"u.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Utilização: %s [-r] [-s] [grupo [gshadow]]\n"
 
@@ -1001,18 +917,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s e -r são incompatíveis\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: não é possível obter acesso exclusivo ao ficheiro %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "uma entrada no ficheiro dos grupos é inválida"
 
@@ -1027,6 +931,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "o nome de grupo '%s' é inválido\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "o nome de grupo '%s' é inválido\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "grupo %s: não existe o utilizador %s\n"
@@ -1039,18 +948,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "nenhuma entrada coincidente de ficheiro de grupo em %s\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "adicionar o grupo '%s' em %s ?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: não é possível actualizar o registo de shadow de %s\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: não é possível actualizar o registo do grupo %s\n"
-
 msgid "invalid shadow group file entry"
 msgstr "a entrada no ficheiro de shadow dos grupos é inválida"
 
@@ -1077,31 +979,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: não houve alterações\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr ""
-"%s: não é possível obter acesso exclusivo ao ficheiro de shadow dos grupos\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Utilização: groupdel grupo\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: não é possível abrir o ficheiro de shadow dos grupos\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Utilização: groupdel grupo\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: não é possível remover o grupo shadow %s\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: não é possível actualizar o ficheiro %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: não é possível actualizar o ficheiro de shadow do grupo\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: não é possível actualizar o ficheiro do grupo\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: não é possível apagar o ficheiro de shadow dos grupos.\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Utilização: id [-a]\n"
 
@@ -1134,6 +1026,10 @@
 "                                utilizador LOGIN\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Utilizador       Porto    De               Último"
 
@@ -1144,14 +1040,14 @@
 msgstr "**Nunca entrou no sistema**"
 
 #, c-format
-msgid "Unknown user or range: %s\n"
-msgstr "Utilizador ou gama desconhecidos: %s\n"
-
-#, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: argumento inesperado: %s\n"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Utilização: %s [-p] [nome]\n"
 
@@ -1248,6 +1144,11 @@
 "tempo para login excedido\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Utilização: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Utilização: newgrp [-] [grupo]\n"
 
@@ -1261,14 +1162,11 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: o fork falhou: %s\n"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "GID desconhecido: %u\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: o utilizador `%s' não existe\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "GID desconhecido: %lu\n"
-
 msgid "too many groups\n"
 msgstr "demasiados grupos\n"
 
@@ -1286,63 +1184,21 @@
 "  -r, --system                  criar contas de sistema\n"
 "%s\n"
 
-#, c-format
-msgid "%s: group ID `%s' is not valid\n"
-msgstr "%s: o grupo ID `%s' não é válido\n"
-
-#, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "%s: nome de grupo `%s' é inválido\n"
-
-#, c-format
-msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: o grupo %s é um grupo shadow, mas não existe em /etc/group\n"
 
-#, c-format
-msgid ""
-"%s: group %s created, failure during the creation of the corresponding "
-"gshadow group\n"
-msgstr ""
-"%s: o grupo %s foi criado, falha durante a criação do correspondente grupo "
-"gshadow\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: o nome de utilizador '%s' é inválido\n"
 
 #, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: o ID `%s' de utilizador não é válido\n"
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: o nome de utilizador '%s' é inválido\n"
 
 #, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: o utilizador `%s' não existe\n"
-
-#, c-format
-msgid "%s: invalid user name `%s'\n"
-msgstr "%s: o nome de utilizador `%s' é inválido\n"
-
-#, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: não é possível obter acesso exclusivo a /etc/passwd.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: não é possível obter acesso exclusivo a /etc/shadow.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: não é possível obter acesso exclusivo a /etc/group.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: não é possível obter acesso exclusivo a /etc/gshadow.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1360,9 +1216,10 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: linha %d: não é possível criar o grupo\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: linha %d: não é possivel encontrar o utilizador %s\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: o utilizador `%s' não existe\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1380,6 +1237,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: linha %d: não é possível actualizar o registo\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1392,15 +1277,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1480,14 +1365,14 @@
 msgid "The password for %s cannot be changed yet.\n"
 msgstr "A palavra-passe para %s ainda não pode ser alterada.\n"
 
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: falta de memória\n"
-
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 "%s: desbloquear o utilizador iria resultar numa conta sem palavra-passe.\n"
 "Você deve definir a palavra-passe com usermod -p para desbloquear esta conta "
@@ -1533,16 +1418,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "o nome de utilizador '%s' é inválido\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "o nome de utilizador '%s' é inválido\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "utilizador %s: o grupo %u não existe\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "utilizador %s: o directório %s não existe\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "utilizador %s: o programa %s não existe\n"
 
 #, c-format
@@ -1553,10 +1446,6 @@
 msgid "add user '%s' in %s? "
 msgstr "acrescentar utilizador '%s' em %s?"
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: não é possível actualizar a entrada em passwd de %s\n"
-
 msgid "invalid shadow password file entry"
 msgstr "entrada no ficheiro de shadow de palavras-passe inválida"
 
@@ -1567,34 +1456,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "utilizador %s: a última alteração de palavra-passe foi no futuro\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: não é possível obter acesso exclusivo ao ficheiro passwd\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: não é possível abrir o ficheiro %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: não é possível abrir o ficheiro passwd\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Utilização: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: não é possível remover o registo shadow de %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: não é possível actualizar o ficheiro shadow\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Utilização: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: não é possível actualizar o ficheiro passwd\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: não é possível actualizar a entrada do utilizador %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: não é possível apagar o ficheiro de shadow de palavras-passe\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Acesso a su para essa conta foi NEGADO.\n"
 
@@ -1660,6 +1540,16 @@
 "%s: %s\n"
 "(Ignorado)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: A autenticação PAM falhou\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Não está autorizado a fazer su %s\n"
+
 msgid "No shell\n"
 msgstr "Sem shell\n"
 
@@ -1685,14 +1575,6 @@
 msgstr "A Entrar no Modo de Manutenção do Sistema"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: GID %s desconhecido\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: grupo %s desconhecido\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr ""
 "%s: não é possível criar um novo ficheiro de configurações pré-definidas\n"
@@ -1714,6 +1596,46 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: estão especificados demasiados grupos (max %d).\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: useradd [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
+#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#| "                                home directory\n"
+#| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#| "account\n"
+#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#| "  -D, --defaults                print or save modified default useradd\n"
+#| "                                configuration\n"
+#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#| "EXPIRE_DATE\n"
+#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#| "                                user account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#| "  -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"
+#| "  -N, --no-user-group           do not create a group with the same name "
+#| "as\n"
+#| "                                the user\n"
+#| "  -o, --non-unique              allow create user with duplicate\n"
+#| "                                (non-unique) UID\n"
+#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#| "                                account\n"
+#| "  -r, --system                  create a system account\n"
+#| "  -s, --shell SHELL             the login shell for the new user account\n"
+#| "  -u, --uid UID                 force use the UID for the new user "
+#| "account\n"
+#| "  -U, --user-group              create a group with the same name as the "
+#| "user\n"
+#| "\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1734,10 +1656,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1794,17 +1718,6 @@
 "\n"
 
 #, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr ""
-"%s: Memória esgotada. Não foi possível actualizar a base de dados group.\n"
-
-#, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr ""
-"%s: Memória esgotada. Não foi possível actualizar a base de dados shadow "
-"group\n"
-
-#, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: directório base inválido '%s'\n"
 
@@ -1841,54 +1754,14 @@
 msgstr "%s: conflito entre as opções %s e %s\n"
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: o nome de utilizador '%s' é inválido\n"
-
-#, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: não foi possível reescrever o ficheiro de palavras-passe\n"
-
-#, c-format
-msgid "%s: cannot rewrite shadow password file\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
-"%s: não foi possível reescrever o ficheiro de shadow de palavras-passe\n"
 
 #, c-format
-msgid "%s: cannot lock shadow password file\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
 msgstr ""
-"%s: não é possível obter acesso exclusivo ao ficheiro de palavras-passe "
-"shadow\n"
 
 #, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: não é possível abrir o ficheiro de palavras-passe shadow\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: erro ao tentar obter acesso exclusivo ao ficheiro dos grupos\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: erro ao tentar abrir o ficheiro dos grupos\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr ""
-"%s: erro ao tentar obter acesso exclusivo ao ficheiro de shadow dos grupos\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: erro ao tentar abrir o ficheiro de shadow dos grupos\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: erro ao adicionar a entrada da nova palavra-passe\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: erro ao adicionar uma nova entrada de palavra-passe shadow\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: não é possível criar o directório %s\n"
 
@@ -1904,8 +1777,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "A definir as permissões do ficheiro mailbox"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: o utilizador %s existe\n"
 
 #, c-format
@@ -1919,11 +1793,16 @@
 msgid "%s: can't create user\n"
 msgstr "%s: não é possível criar o utilizador\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u não é único\n"
 
 #, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: não é possível criar grupo\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1931,11 +1810,6 @@
 "%s: aviso: o directório home já existe.\n"
 "Não irá copiar quaisquer ficheiros o directório skel para lá.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr ""
-"%s: aviso: CREATE_HOME não é suportado, por favor em vez disso utilize -m.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1955,52 +1829,27 @@
 "  -r, --remove                  remover o directório home e o spool de mail\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: erro ao actualizar a entrada do grupo\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: não é possível remover %s que é o grupo primário para outro utilizador.\n"
 
 #, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: erro ao actualizar a entrada shadow em group\n"
-
-#, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: não é possível abrir o ficheiro dos grupos\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: não é possível abrir o ficheiro de shadow dos grupos\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: erro ao apagar a entrada da palavra-passe\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: erro ao apagar a entrada da palavra-passe shadow\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: o utilizador %s está actualmente no sistema\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: aviso: não é possível remover "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: o %s não pertence a %s, não será removido\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: aviso: não é possível remover "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: o utilizador %s não existe\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: o utilizador %s é um utilizador NIS\n"
 
@@ -2073,10 +1922,23 @@
 "  -U, --unlock                  desbloquear a conta do utilizador\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: erro ao adicionar a nova entrada shadow em group\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+"%s: desbloquear o utilizador iria resultar numa conta sem palavra-passe.\n"
+"Você deve definir a palavra-passe com usermod -p para desbloquear esta conta "
+"de utilizador.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: o utilizador %s existe\n"
+
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: não foram especificadas flags\n"
@@ -2089,23 +1951,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr "%s: as flags -L, -p e -U são exclusivas\n"
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: o uid %lu não é único\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "O membro já existe\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: erro ao alterar a entrada da palavra-passe\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: erro ao remover a entrada da palavra-passe\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: erro ao remover a entrada da palavra-passe shadow\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: o directório %s existe\n"
 
@@ -2127,6 +1978,14 @@
 msgstr "%s: não é possível renomear o directório %s para %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: aviso: o %s não pertence a %s\n"
 
@@ -2136,11 +1995,15 @@
 msgid "failed to rename mailbox"
 msgstr "falha ao renomear a caixa do correio"
 
-#, c-format
+#, fuzzy, 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"
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 "Você alterou %s.\n"
 "Poderá ter de modificar %s para manter a consistência.\n"
@@ -2165,10 +2028,16 @@
 "  -s, --shadow                  editar a base de dados shadow ou gshadow\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: falhou baixar privilégios (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: o %s não foi alterado\n"
@@ -2183,6 +2052,442 @@
 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: can't lock password file\n"
+#~ msgstr ""
+#~ "%s: não é possível obter acesso exclusivo ao ficheiro de palavras-passe\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: não é possível abrir o ficheiro de palavras-passe\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr ""
+#~ "%s: não é possível obter acesso exclusivo ao ficheiro de palavras-passe "
+#~ "shadow\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: não é possível abrir o ficheiro de palavras-passe shadow\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: não é possível reescrever o ficheiro de palavras-passe shadow\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: não é possível reescrever o ficheiro de palavras-passe\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: não é possível actualizar o ficheiro de palavras-passe\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: não é possível actualizar o ficheiro de palavras-passe shadow\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tNome Completo: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tNúmero da Sala: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tTelefone do Emprego: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tTelefone de Casa: %s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr ""
+#~ "Não é possível obter acesso exclusivo ao ficheiro de palavras-passe; "
+#~ "tente novamente mais tarde.\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Não é possível abrir o ficheiro de palavras-passe.\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 a entrada da palavra-passe.\n"
+
+#~ msgid "Cannot commit password file changes.\n"
+#~ msgstr ""
+#~ "Não é possível gravar as alteração efectuadas ao ficheiro de palavras-"
+#~ "passe.\n"
+
+#~ msgid "Cannot unlock the password file.\n"
+#~ msgstr "Não é possível libertar o ficheiro de palavras-passe.\n"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: não é possível obter acesso exclusivo ao ficheiro dos grupos\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: não é possível abrir o ficheiro dos grupos\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: não é possível obter acesso exclusivo ao ficheiro gshadow\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: não é possível abrir o ficheiro shadow\n"
+
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: erro ao actualizar o ficheiro gshadow\n"
+
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: erro ao actualizar o ficheiro group\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: linha %d: grupo %s desconhecido\n"
+
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: linha %d: não é possível actualizar a entrada em group\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: não é possível obter acesso exclusivo ao ficheiro shadow\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: erro a actualizar o ficheiro shadow\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: erro a actualizar o ficheiro de palavras-passe\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: linha %d: utilizador %s desconhecido\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr ""
+#~ "%s: linha %d: não é possível actualizar a entrada da palavra-passe\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: utilizador desconhecido\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Utilizador Deconhecido: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Utilização: %s [-r|-R] grupo\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a utilizador] grupo\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d utilizador] grupo\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A utilizador,...] [-M utilizador,...] grupo\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M utilizador,...] grupo\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: não é possível obter acesso exclusivo\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: não é possível obter acesso exclusivo a shadow\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: não é possível abrir o ficheiro\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: não é possível reescrever o ficheiro\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: não é possível reescrever o ficheiro de shadow\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: não é possível libertar o ficheiro\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: não é possível actualizar a entrada\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: não é possível actualizar a entrada do shadow\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "grupo desconhecido: %s\n"
+
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: não é possível fechar o ficheiro\n"
+
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: não é possível fechar o ficheiro shadow\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Quem é você?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: membro desconhecido %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: erro ao adicionar a entrada do novo grupo\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: não é possível reescrever o ficheiro dos grupos\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: não é possível reescrever o ficheiro de shadow dos grupos\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: não é possível obter acesso exclusivo ao ficheiro dos grupos\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: não é possível abrir o ficheiro dos grupos\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr ""
+#~ "%s: não é possivel obter acesso exclusivo ao ficheiro de shadow dos "
+#~ "grupos\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: não é possível abrir o ficheiro de shadow dos grupos\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u não é único\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: erro ao remover a entrada do grupo\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: erro ao remover a entrada de shadow do grupo\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: não é possível remover o grupo primário do utilizador.\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "O membro a remover não foi encontrado\n"
+
+#~ 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"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "Apenas o root pode acrescentar membros a diferentes grupos\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "É necessário acesso ao grupo\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Não é o dono primário do actual grupo\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "A autenticação PAM falhou para\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Não é possível obter acesso exclusivo ao ficheiro dos grupos\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Não é possível abrir o ficheiro dos grupos\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Não é possível abrir o ficheiro dos grupos\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s não foi encontrado em /etc/group\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u não é um GID único\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s não é um nome único\n"
+
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: não foi possível sobreescrever o ficheiro passwd\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr ""
+#~ "%s: não foi possível obter acesso exclusivo ao ficheiro de palavras-"
+#~ "passe\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: não foi possível abrir o ficheiro de palavras-passe\n"
+
+#~ msgid ""
+#~ "%s: cannot change the primary group of user '%s' from %u to %u, since it "
+#~ "is not in the passwd file.\n"
+#~ msgstr ""
+#~ "%s: não foi possível mudar o grupo primário do utilizador '%s' de %u para "
+#~ "%u, já que não está no ficheiro passwd.\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: não é possível obter acesso exclusivo ao ficheiro %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: não é possível actualizar o registo de shadow de %s\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: não é possível actualizar o registo do grupo %s\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr ""
+#~ "%s: não é possível obter acesso exclusivo ao ficheiro de shadow dos "
+#~ "grupos\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: não é possível abrir o ficheiro de shadow dos grupos\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: não é possível remover o grupo shadow %s\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: não é possível actualizar o ficheiro de shadow do grupo\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: não é possível actualizar o ficheiro do grupo\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: não é possível apagar o ficheiro de shadow dos grupos.\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "GID desconhecido: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "GID desconhecido: %lu\n"
+
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: o grupo ID `%s' não é válido\n"
+
+#~ msgid ""
+#~ "%s: group %s created, failure during the creation of the corresponding "
+#~ "gshadow group\n"
+#~ msgstr ""
+#~ "%s: o grupo %s foi criado, falha durante a criação do correspondente "
+#~ "grupo gshadow\n"
+
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: o ID `%s' de utilizador não é válido\n"
+
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: o nome de utilizador `%s' é inválido\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: não é possível obter acesso exclusivo a /etc/passwd.\n"
+
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: não é possível obter acesso exclusivo a /etc/shadow.\n"
+
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: não é possível obter acesso exclusivo a /etc/group.\n"
+
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: não é possível obter acesso exclusivo a /etc/gshadow.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: não é possível abrir ficheiros\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: erro ao actualizar ficheiros\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: linha %d: não é possivel encontrar o utilizador %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: não é possível actualizar a entrada em passwd de %s\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: não é possível obter acesso exclusivo ao ficheiro passwd\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: não é possível abrir o ficheiro passwd\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: não é possível remover o registo shadow de %s\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: não é possível actualizar o ficheiro shadow\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: não é possível actualizar o ficheiro passwd\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: não é possível actualizar a entrada do utilizador %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: não é possível apagar o ficheiro de shadow de palavras-passe\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: GID %s desconhecido\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: grupo %s desconhecido\n"
+
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr ""
+#~ "%s: Memória esgotada. Não foi possível actualizar a base de dados shadow "
+#~ "group\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: não foi possível reescrever o ficheiro de palavras-passe\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr ""
+#~ "%s: não foi possível reescrever o ficheiro de shadow de palavras-passe\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr ""
+#~ "%s: não é possível obter acesso exclusivo ao ficheiro de palavras-passe "
+#~ "shadow\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: não é possível abrir o ficheiro de palavras-passe shadow\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: erro ao tentar obter acesso exclusivo ao ficheiro dos grupos\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: erro ao tentar abrir o ficheiro dos grupos\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr ""
+#~ "%s: erro ao tentar obter acesso exclusivo ao ficheiro de shadow dos "
+#~ "grupos\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: erro ao tentar abrir o ficheiro de shadow dos grupos\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: erro ao adicionar a entrada da nova palavra-passe\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: erro ao adicionar uma nova entrada de palavra-passe shadow\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr ""
+#~ "%s: aviso: CREATE_HOME não é suportado, por favor em vez disso utilize -"
+#~ "m.\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: erro ao actualizar a entrada do grupo\n"
+
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: erro ao actualizar a entrada shadow em group\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: não é possível abrir o ficheiro dos grupos\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: não é possível abrir o ficheiro de shadow dos grupos\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: erro ao apagar a entrada da palavra-passe\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: erro ao apagar a entrada da palavra-passe shadow\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: o utilizador %s não existe\n"
+
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: erro ao adicionar a nova entrada shadow em group\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: o uid %lu não é único\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: erro ao alterar a entrada da palavra-passe\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: erro ao remover a entrada da palavra-passe\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: erro ao remover a entrada da palavra-passe shadow\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: não é possível obter um GID único\n"
 
@@ -2192,19 +2497,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " em '%.100s'"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr ""
-#~ "%s: não é possível obter acesso excluviso a ficheiros, tente mais tarde\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: linha %d: não é possível criar o UID\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/pt_BR.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\n"
 "PO-Revision-Date: 2008-03-20 12:40-0300\n"
 "Last-Translator: leoblink182 <leorock182 at gmail.com>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -56,6 +56,9 @@
 msgid "  Choose a new password."
 msgstr "  Escolha uma nova senha."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Sua senha irá expirar em %ld dias.\n"
@@ -67,7 +70,12 @@
 msgstr "Sua senha irá expirar hoje."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Não foi possível mudar tty %s"
 
 msgid "Environment overflow\n"
@@ -91,14 +99,14 @@
 "%d falhas desde o último login.\n"
 "O último foi %s em %s.\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\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: Can't get unique UID (no more available UIDs)\n"
 msgstr "%s : não foi possível obter UID único\n"
 
-#, fuzzy
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s : não foi possível obter GID único\n"
-
 msgid "Too many logins.\n"
 msgstr "Muitos logins.\n"
 
@@ -192,9 +200,18 @@
 msgstr "Não foi possível determinar o nome de seu tty."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s : sem memória\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) falhou\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "Não\n"
+
 msgid "Password: "
 msgstr "Senha : "
 
@@ -202,6 +219,11 @@
 msgid "%s's Password: "
 msgstr "Senha de %s : "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s : campos muito extensos\n"
+
 #, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
@@ -299,42 +321,34 @@
 msgstr "%s : Permissão negada.\n"
 
 #, c-format
+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 "%s: PAM authentication failed\n"
 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"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr ""
+"%s : não foi possível obter lock de arquivos, tente novamente mais tarde\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s : não foi possível abrir o arquivo de senhas\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s : não foi possível abrir arquivo %s\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"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: falha iniciando: %s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s : não foi possível abrir arquivo de senhas shadow\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: falha ao abandonar privilégios (%s)\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"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s : não foi possível reescrever arquivo de senhas\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s : não foi possível atualizar arquivo de senhas\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s : não foi possível atualizar arquivos de senhas shadow\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"
 
@@ -342,9 +356,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s : usuário %s não existe\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -371,59 +385,27 @@
 msgid "Full Name"
 msgstr "Nome Completo"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tNome Completo : %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Número da Sala"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tNúmero da Sala: %s\n"
-
 msgid "Work Phone"
 msgstr "Fone de Trabalho"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tFone de Trabalho: %s\n"
-
 msgid "Home Phone"
 msgstr "Fone Doméstico"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tFone Doméstico: %s\n"
-
 msgid "Other"
 msgstr "Outro"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Não foi possível mudar o ID para root.\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"
-
-msgid "Cannot open the password file.\n"
-msgstr "Não foi possível abrir arquivo de senhas.\n"
-
 #, c-format
-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"
-
-#, c-format
 msgid "%s: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -455,9 +437,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s : \"%s\" contém caracteres ilegais\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s : Não foi possível determinar seu nome de usuário.\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s : usuário %s não existe\n"
 
 #, fuzzy, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -510,7 +492,7 @@
 msgstr "%s : argumento numérico `%s' inválido\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: flag -a é permitida SOMENTE com a flag -G\n"
 
 #, c-format
@@ -522,30 +504,6 @@
 msgstr "%s: metodo de encriptação não suportado : %s\n"
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s : não foi possível obter lock no arquivo de grupo\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s : não foi possível abrir arquivo de grupo\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s : nao foi possível obter lock no arquivo gshadow\n"
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-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"
 
@@ -553,38 +511,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s : linha %d : nova senha faltando\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s : linha %d : grupo %s desconhecido\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s : grupo %s não existe\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s : usuário %s não existe\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s : erro atualizando arquivo shadow\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s : erro atualizando arquivo de senhas\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"
@@ -603,8 +547,9 @@
 msgid "Login Shell"
 msgstr "Shell de Login"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Você não pode mudar o shell para %s.\n"
 
 #, c-format
@@ -615,24 +560,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s : Entrada inválida : %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s é um shell inválido.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Uso : expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s : usuário desconhecido\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -658,11 +619,16 @@
 "                        as opções -r, -m ou -l) para usuário com LOGIN\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Falhas   Máximo  Último                   Em\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds restante]"
 
 #, c-format
@@ -670,76 +636,67 @@
 msgstr " [%lds lock]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Usuário Desconhecido : %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Uso : %s [-r|-R] grupo\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "      %s [-a usuário] grupo\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "      %s [-d usuário] grupo\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Usuário Desconhecido : %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "      %s [-A usuário,...] [-M usuário,...] grupo\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s : não foi possível abrir arquivo %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "      %s [-M usuário,...] grupo\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s : senhas de grupo shadow requeridas para -A\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s : não foi possível obter lock\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s : nõ foi possível obter lock shadow\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "A senha para %s não pode ser modificada.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s : não foi possível abrir arquivo\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s : senhas de grupo shadow requeridas para -A\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s : não foi possível abrir arquivo\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s : grupo %s não existe\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s : não foi possível abrir arquivo shadow\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: falha iniciando: %s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -758,9 +715,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s : Tente novamente mais tarde\n"
 
-msgid "Who are you?\n"
-msgstr "Quem é você ?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Adicionando usuário %s ao grupo %s\n"
@@ -769,9 +723,9 @@
 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 desconhecido\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s : usuário %s não existe\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -805,118 +759,89 @@
 "                                (não-único)\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s : erro adicionando nova entrada de grupo\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s : %s não é um nome de grupo válido\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s : não foi possível regravar arquivo de grupo\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "nome de grupo `%s' inválido\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s : não foi possível regravar arquivo de grupo shadow\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s : não foi possível obter lock em arquivo de grupo\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s : não foi possível abrir arquivo de grupo\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s : não foi possível obter lock em arquivo de grupo shadow\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s : não foi possível abrir arquivo de grupo shadow\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s : -K requer CHAVE=VALOR\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 msgstr "%s : grupo %s existe\n"
 
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s : GID %u não é único\n"
-
 #, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s : não foi possível criar %s\n"
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "Membros já existem\n"
 
 msgid "Usage: groupdel group\n"
 msgstr "Uso : groupdel grupo\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s : erro removendo entrada de grupo\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s : não foi possível renomear diretório %s para %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s : erro removendo entrada de grupo shadow\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s : não foi possível mudar o usuário `%s' no cliente NIS.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s : não foi possível remover grupo primário do usuário.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s : grupo %s não existe\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s : grupo %s é um grupo NIS\n"
+#, fuzzy, c-format
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s : grupo `%s' é um grupo NIS.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s : %s é o mestre NIS\n"
 
-msgid "Member already exists\n"
-msgstr "Membros já existem\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s : usuário %s é um usuário NIS\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Não foi possivel encontrar membro para remover\n"
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s : sem memória em update_group\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
-"Uso :  membrosdogrupo -a nomedousuario | -d nomedousuario | -D | -l [-g "
-"nomedogrupo]\n"
 
-msgid "Only root can add members to different groups\n"
-msgstr "Somente o root pode adicionar membros para diferentes grupos\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "Acesso ao grupo é necessário\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "proprietario do grupo atual\n"
-
 #, fuzzy
-msgid "PAM authentication failed for\n"
-msgstr "%s : autenticação PAM falhou\n"
-
-#, fuzzy
-msgid "Unable to lock group file\n"
-msgstr "%s : não foi possível obter lock em arquivo de grupo\n"
-
-#, fuzzy
-msgid "Unable to open group file\n"
-msgstr "%s : não foi possível abrir arquivo de grupo\n"
-
-#, fuzzy
-msgid "Cannot close group file\n"
-msgstr "%s : não foi possível abrir arquivo de grupo\n"
-
-#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -941,43 +866,19 @@
 "                                (não-único)\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s : %s não encontrado em /etc/group\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s : %u não é um GID único\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s : %s não é um nome único\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s : não foi possível reescrever arquivo de senhas\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "nome de grupo `%s' inválido\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s : não foi possível obter lock em arquivo de senhas\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s : grupo %s é um grupo NIS\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s : não foi possível abrir arquivo de senhas\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s : usuário %s desconhecido\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-"%s: não foi possivel mudar o grupo primário do usuario '%s' de %u para %u, "
-"uma vez que  não se encontra no arquivo passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s : não foi possível mudar o usuário `%s' no cliente NIS.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Uso : %s [-r] [-s] [grupo [gshadow]]\n"
 
@@ -989,18 +890,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s : -s e -r são incompatíveis\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s : não foi possível obter lock no arquivo %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "entrada inválida no arquivo de grupo"
 
@@ -1015,6 +904,10 @@
 msgid "invalid group name '%s'\n"
 msgstr "nome de grupo `%s' inválido\n"
 
+#, fuzzy, c-format
+msgid "invalid group ID '%lu'\n"
+msgstr "nome de grupo `%s' inválido\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "grupo %s : nenhum usuário %s\n"
@@ -1028,17 +921,9 @@
 msgstr "entrada no arquivo de grupo não casa\n"
 
 #, fuzzy, c-format
-msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "grupo shadow %s : nenhum usuário %s\n"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s : não foi possível atualizar entrada shadow para %s\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s : não foi possível atualizar entrada para grupo %s\n"
-
 msgid "invalid shadow group file entry"
 msgstr "entrada inválida no arquivo de grupo shadow"
 
@@ -1065,30 +950,21 @@
 msgid "%s: no changes\n"
 msgstr "%s : nenhuma mudança\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s : não foi possível obter lock em arquivo de grupo shadow\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Uso : groupdel grupo\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s : não foi possível abrir arquivo de grupo shadow\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Uso : groupdel grupo\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s : não foi possível remover grupo shadow %s\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s : não foi possível atualizar arquivo %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s : não foi possível atualizar arquivo de grupo shadow\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s : não foi possível atualizar arquivo de grupo\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s : não foi possível remover arquivo de grupo shadow\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Uso : id [-a]\n"
 
@@ -1121,6 +997,10 @@
 "                                LOGIN especificado\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Nome de Usuário         Porta     De             Último"
 
@@ -1130,15 +1010,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Uso : %s [-p] [nome]\n"
 
@@ -1235,6 +1115,11 @@
 "tempo de login excedido\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Uso : id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Uso : newgrp [-] [grupo]\n"
 
@@ -1249,14 +1134,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: falha iniciando: %s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "GID desconhecido : %u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s : usuário %s não existe\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "GID desconhecido : %lu\n"
-
 msgid "too many groups\n"
 msgstr "muitos grupos\n"
 
@@ -1275,62 +1156,19 @@
 "%s\n"
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s : grupo %s não existe\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "nome de grupo `%s' inválido\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s : nome de usuário '%s' inválido\n"
 
-#, 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 ""
-"%s: grupo %s criado, falha durante a criação do grupo correspondente ao "
-"gshadow\n"
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s : usuário %s não existe\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s : usuário %s não existe\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s : nome de usuário '%s' inválido\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s : não foi possível obter de /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s : não foi possível obter de /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s : não foi possível obter de /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s : não foi possível obter de /etc/passwd.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1346,9 +1184,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s : linha %d : não foi possível criar GID\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s : linha %d : não foi possível encontrar usuário %s\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s : usuário %s não existe\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1379,15 +1217,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1461,14 +1299,14 @@
 msgid "The password for %s cannot be changed yet.\n"
 msgstr "A senha para %s não pode ser modificada.\n"
 
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s : sem memória\n"
-
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 "%s: Desbloqueio de usuario mostrará resultado em passwordless account.\n"
 "Você deve arrumar a senha com usermod-p  para desbloquear esta conta.\n"
@@ -1514,16 +1352,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "nome de usuário '%s' inválido\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "nome de usuário '%s' inválido\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "usuário %s : nenhum grupo %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "usuário %s : diretório %s não existe\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "usuário %s : programa %s não existe\n"
 
 #, fuzzy, c-format
@@ -1534,10 +1380,6 @@
 msgid "add user '%s' in %s? "
 msgstr "grupo shadow %s : nenhum usuário %s\n"
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s : não foi possível atualizar entrada passwd para %s\n"
-
 msgid "invalid shadow password file entry"
 msgstr "entrada de arquivos de senhas shadow inválida"
 
@@ -1548,34 +1390,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "usuário %s : última mudança de senha no futuro\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s : não foi possível obter lock em arquivo passwd\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s : não foi possível abrir arquivo %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s : não foi possível abrir arquivo passwd.\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Uso : id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s : não foi possível remover entrada shadow para %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s : não foi possível atualizar arquivo shadow\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Uso : id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s : não foi possível atualizar arquivo passwd\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s : não foi possível atualizar entrada para usuário %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s : não foi possível remover arquivo de senhas shadow\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Acesso ao su para esta conta NEGADO.\n"
 
@@ -1642,6 +1475,16 @@
 "%s : %s\n"
 "(Ignorado)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s : autenticação PAM falhou\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Você não está autorizado a usar o su para %s\n"
+
 msgid "No shell\n"
 msgstr "Sem shell\n"
 
@@ -1667,14 +1510,6 @@
 msgstr "Entrando em Modo de Manutenção do Sistema"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s : GID %s desconhecido\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s : grupo %s desconhecido\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s : não foi possível criar novo arquivo de padrões\n"
 
@@ -1715,10 +1550,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1767,14 +1604,6 @@
 "\n"
 
 #, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s : sem memória em update_group\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s : sem memória em update_gshadow\n"
-
-#, fuzzy, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s : diretório base `%s'inválido\n"
 
@@ -1811,50 +1640,14 @@
 msgstr "%s: opções %s e %s conflito\n"
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s : nome de usuário '%s' inválido\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s : não foi possível reescrever arquivo de senhas\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s : não foi possível reescrever arquivo de senhas shadow\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s : não foi possível obter lock em arquivo de senhas shadow\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s : não foi possível abrir arquivo de senhas shadow\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s : erro obtendo lock em arquivo de grupo\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s : erro abrindo arquivo de grupo\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s : erro obtendo lock em arquivo de grupo shadow\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s : erro abrindo arquivo de grupo shadow\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s : erro adicionando nova entrada de senha\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s : erro adicionando nova entrada de senha shadow\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s : não foi possível criar diretório %s\n"
 
@@ -1870,8 +1663,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Configurando caixa-postal arquivos de permissao"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s : usuário %s existe\n"
 
 #, c-format
@@ -1885,10 +1679,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s : não foi possível criar %s\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s : UID %u não é único\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s : não foi possível criar %s\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1897,10 +1696,6 @@
 "%s: aviso: o diretório pessoal já existe.\n"
 "Não copiando nenhum arquivo do diretótio skel.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr "%s : aviso CREATE_HOME não é suportado, por favor, utilize -m.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1919,53 +1714,28 @@
 " -h, --help                    exibi a mensagem de ajudar e sai\n"
 "-r, --remove                remove o diretorio home e spool\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s : erro atualizando entrada de grupo\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s : Não foi possível remover grupo %s, o qual é um grupo primário de outro "
 "usuário.\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s : erro atualizando entrada de grupo\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s : não foi possível abrir arquivo de grupo\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s : não foi possível abrir arquivo de grupo shadow\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s : erro removendo entrada de senha\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s : erro removendo entrada de senha shadow\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s : o usuário %s está logado no momento\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s : aviso : não foi possível remover "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s : %s não é propriedade de %s, não removendo\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s : aviso : não foi possível remover "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s : usuário %s não existe\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s : usuário %s é um usuário NIS\n"
 
@@ -2032,9 +1802,21 @@
 "\n"
 
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s : erro adicionando nova entrada de grupo\n"
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+"%s: Desbloqueio de usuario mostrará resultado em passwordless account.\n"
+"Você deve arrumar a senha com usermod-p  para desbloquear esta conta.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s : usuário %s existe\n"
+
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s : nenhuma flag informada\n"
@@ -2047,23 +1829,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr "%s: the -L, -p, and -U flags são exclusivas\n"
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s : o uid %lu não é único\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "Membros já existem\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s : erro modificando entrada de senha\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s : erro removendo entrada de senha\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s erro removendo entrada de senha shadow\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s : diretório %s existe\n"
 
@@ -2084,6 +1855,14 @@
 msgstr "%s : não foi possível renomear diretório %s para %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s : aviso : %s não é propriedade de %s\n"
 
@@ -2093,11 +1872,15 @@
 msgid "failed to rename mailbox"
 msgstr "falha ao renomear caixa-postal"
 
-#, c-format
+#, fuzzy, 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"
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 "Você modificou %s.\n"
 "Talvez você precise modificar %s para ter coerência.\n"
@@ -2124,10 +1907,16 @@
 "  -s, --shadow                  editar base de dados shadow ou gshadow\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: falha ao abandonar privilégios (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s : %s não foi modificado\n"
@@ -2142,6 +1931,440 @@
 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: can't lock password file\n"
+#~ msgstr "%s : não foi possível obter lock em arquivo de senhas\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s : não foi possível abrir o arquivo de senhas\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s : não foi possível obter lock em arquivos de senhas shadow\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s : não foi possível abrir arquivo de senhas shadow\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s : não foi possível reescrever arquivo de senhas shadow\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s : não foi possível reescrever arquivo de senhas\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s : não foi possível atualizar arquivo de senhas\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s : não foi possível atualizar arquivos de senhas shadow\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tNome Completo : %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tNúmero da Sala: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tFone de Trabalho: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tFone Doméstico: %s\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"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Não foi possível abrir arquivo de senhas.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s : não foi possível obter lock no arquivo de grupo\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s : não foi possível abrir arquivo de grupo\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s : nao foi possível obter lock no arquivo gshadow\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s : não foi possível abrir arquivo shadow\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s : erro atualizando arquivo shadow\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s : erro atualizando entrada de grupo\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s : linha %d : grupo %s desconhecido\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s : linha %d : não foi possível atualizar entrada\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s : nao foi possível obter lock em arquivo shadow\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s : erro atualizando arquivo shadow\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s : erro atualizando arquivo de senhas\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s : linha %d : usuário %s desconhecido\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s : linha %d : não foi possível atualizar entrada de senha\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s : usuário desconhecido\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Usuário Desconhecido : %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Uso : %s [-r|-R] grupo\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "      %s [-a usuário] grupo\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "      %s [-d usuário] grupo\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "      %s [-A usuário,...] [-M usuário,...] grupo\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "      %s [-M usuário,...] grupo\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s : não foi possível obter lock\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s : nõ foi possível obter lock shadow\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s : não foi possível abrir arquivo\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s : não foi possível regravar arquivo\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s : não foi possível regravar arquivo shadow\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s : não foi possível remover o lock do arquivo\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s : não foi possível atualizar entrada\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s : não foi possível atualizar entrada shadow\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "grupo desconhecido : %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s : não foi possível abrir arquivo\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s : não foi possível abrir arquivo shadow\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Quem é você ?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s : membro %s desconhecido\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s : erro adicionando nova entrada de grupo\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s : não foi possível regravar arquivo de grupo\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s : não foi possível regravar arquivo de grupo shadow\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s : não foi possível obter lock em arquivo de grupo\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s : não foi possível abrir arquivo de grupo\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s : não foi possível obter lock em arquivo de grupo shadow\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s : não foi possível abrir arquivo de grupo shadow\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s : GID %u não é único\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s : erro removendo entrada de grupo\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s : erro removendo entrada de grupo shadow\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s : não foi possível remover grupo primário do usuário.\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Não foi possivel encontrar membro para remover\n"
+
+#~ msgid ""
+#~ "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+#~ msgstr ""
+#~ "Uso :  membrosdogrupo -a nomedousuario | -d nomedousuario | -D | -l [-g "
+#~ "nomedogrupo]\n"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "Somente o root pode adicionar membros para diferentes grupos\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "Acesso ao grupo é necessário\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "proprietario do grupo atual\n"
+
+#, fuzzy
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "%s : autenticação PAM falhou\n"
+
+#, fuzzy
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "%s : não foi possível obter lock em arquivo de grupo\n"
+
+#, fuzzy
+#~ msgid "Unable to open group file\n"
+#~ msgstr "%s : não foi possível abrir arquivo de grupo\n"
+
+#, fuzzy
+#~ msgid "Cannot close group file\n"
+#~ msgstr "%s : não foi possível abrir arquivo de grupo\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s : %s não encontrado em /etc/group\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s : %u não é um GID único\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s : %s não é um nome único\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s : não foi possível reescrever arquivo de senhas\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s : não foi possível obter lock em arquivo de senhas\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s : não foi possível abrir arquivo de senhas\n"
+
+#~ msgid ""
+#~ "%s: cannot change the primary group of user '%s' from %u to %u, since it "
+#~ "is not in the passwd file.\n"
+#~ msgstr ""
+#~ "%s: não foi possivel mudar o grupo primário do usuario '%s' de %u para %"
+#~ "u, uma vez que  não se encontra no arquivo passwd.\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s : não foi possível obter lock no arquivo %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s : não foi possível atualizar entrada shadow para %s\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s : não foi possível atualizar entrada para grupo %s\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s : não foi possível obter lock em arquivo de grupo shadow\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s : não foi possível abrir arquivo de grupo shadow\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s : não foi possível remover grupo shadow %s\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s : não foi possível atualizar arquivo de grupo shadow\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s : não foi possível atualizar arquivo de grupo\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s : não foi possível remover arquivo de grupo shadow\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "GID desconhecido : %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "GID desconhecido : %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s : grupo %s não existe\n"
+
+#~ msgid ""
+#~ "%s: group %s created, failure during the creation of the corresponding "
+#~ "gshadow group\n"
+#~ msgstr ""
+#~ "%s: grupo %s criado, falha durante a criação do grupo correspondente ao "
+#~ "gshadow\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s : usuário %s não existe\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s : nome de usuário '%s' inválido\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s : não foi possível obter de /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s : não foi possível obter de /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s : não foi possível obter de /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s : não foi possível obter de /etc/passwd.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s : não foi possível abrir arquivos\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s : erro atualizando arquivos\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s : linha %d : não foi possível encontrar usuário %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s : não foi possível atualizar entrada passwd para %s\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s : não foi possível obter lock em arquivo passwd\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s : não foi possível abrir arquivo passwd.\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s : não foi possível remover entrada shadow para %s\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s : não foi possível atualizar arquivo shadow\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s : não foi possível atualizar arquivo passwd\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s : não foi possível atualizar entrada para usuário %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s : não foi possível remover arquivo de senhas shadow\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s : GID %s desconhecido\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s : grupo %s desconhecido\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s : sem memória em update_gshadow\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s : não foi possível reescrever arquivo de senhas\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s : não foi possível reescrever arquivo de senhas shadow\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s : não foi possível obter lock em arquivo de senhas shadow\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s : não foi possível abrir arquivo de senhas shadow\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s : erro obtendo lock em arquivo de grupo\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s : erro abrindo arquivo de grupo\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s : erro obtendo lock em arquivo de grupo shadow\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s : erro abrindo arquivo de grupo shadow\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s : erro adicionando nova entrada de senha\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s : erro adicionando nova entrada de senha shadow\n"
+
+#~ 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"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s : erro atualizando entrada de grupo\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s : erro atualizando entrada de grupo\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s : não foi possível abrir arquivo de grupo\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s : não foi possível abrir arquivo de grupo shadow\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s : erro removendo entrada de senha\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s : erro removendo entrada de senha shadow\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s : usuário %s não existe\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s : erro adicionando nova entrada de grupo\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s : o uid %lu não é único\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s : erro modificando entrada de senha\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s : erro removendo entrada de senha\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s erro removendo entrada de senha shadow\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s : não foi possível obter GID único\n"
 
@@ -2153,19 +2376,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " em `%.100s'"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr ""
-#~ "%s : não foi possível obter lock de arquivos, tente novamente mais tarde\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s : linha %d : não foi possível criar UID\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/ro.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -56,6 +56,9 @@
 msgid "  Choose a new password."
 msgstr "  Alegeţi o parolă nouă."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Parola dvs va expira în %ld zile.\n"
@@ -67,7 +70,12 @@
 msgstr "Parola dvs va expira azi."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Nu pot schimba tty %s"
 
 msgid "Environment overflow\n"
@@ -91,14 +99,14 @@
 "%d eşuări de la ultima autentificare.\n"
 "Ultima oară a fost %s în %s.\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "%s: nu pot prelua GID unic\n"
+
+#, fuzzy, c-format
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "%s: nu pot prelua UID\n"
 
-#, fuzzy
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s: nu pot prelua GID unic\n"
-
 msgid "Too many logins.\n"
 msgstr "Prea multe autentificări.\n"
 
@@ -190,9 +198,18 @@
 msgstr "Nu vă pot determina numele tty."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: nu mai este memorie\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) a eşuat\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "Nu\n"
+
 msgid "Password: "
 msgstr "Parola: "
 
@@ -200,6 +217,11 @@
 msgid "%s's Password: "
 msgstr "Parola pentru %s: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: câmpuri prea lungi\n"
+
 #, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
@@ -298,42 +320,33 @@
 msgstr "%s: Permisiune refuzată.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Nu vă pot determina numele de utilizator.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 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"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: nu pot încuia fişierele, încercaţi mai târziu\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: nu pot deschide fişierul passwd\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: nu pot deschide fişierul %s\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s nu pot încuia fişierul shadow\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s : eşuare la bifurcare: %s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: nu pot deschide fişierul shadow\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s : eşuare în abandonarea privilegiilor (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: nu pot rescrie fişierul shadow\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: nu pot rescrie fişierul passwd\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: nu pot actualiza fişierul passwd\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: nu pot actualiza fişierul shadow\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: fişierul shadow nu este prezent\n"
 
@@ -341,9 +354,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: utilizatorul %s nu există\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -370,57 +383,27 @@
 msgid "Full Name"
 msgstr "Nume complet"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tNume complet: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Număr cameră"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tNumăr cameră: %s\n"
-
 msgid "Work Phone"
 msgstr "Telefon birou"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tTelefon birou: %s\n"
-
 msgid "Home Phone"
 msgstr "Telefon acasă"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tTelefon acasă: %s\n"
-
 msgid "Other"
 msgstr "Altele"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Nu pot schimba identificatorul la root.\n"
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Nu pot încuia fişierul passwd; încercaţi mai târziu.\n"
-
-msgid "Cannot open the password file.\n"
-msgstr "Nu pot deschide fişierul passwd.\n"
-
 #, c-format
-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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -453,9 +436,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' conţine caractere ilegale\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Nu vă pot determina numele de utilizator.\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: utilizatorul %s nu există\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -505,7 +488,7 @@
 msgstr "%s: argument numeric nevalid '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: semnalizatorul -a este permis DOAR împreună cu semnalizatorul -G\n"
 
 #, c-format
@@ -517,30 +500,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: nu pot încuia fişierul de grupuri\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: nu pot deschide fişierul de grupuri\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: nu pot închide fişierul gshadow\n"
-
-#, c-format
-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"
 
@@ -548,38 +507,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: linia %d: lipseşte noua parolă\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: linia %d: grup necunoscut %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: grupul %s nu există\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: utilizatorul %s nu există\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: eroare la actualizarea fişierului shadow\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: eroare la actualizarea fişierului passwd\n"
-
-#, c-format
-msgid "%s: line %d: unknown user %s\n"
-msgstr "%s: linia %d: utilizator 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
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
@@ -602,8 +547,9 @@
 msgid "Login Shell"
 msgstr "Autentificare consolă"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Nu puteţi schimba consola pentru %s.\n"
 
 #, c-format
@@ -614,24 +560,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Intrare nevalidă: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s este o consolă nevalidă.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Utilizare: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: utilizator necunoscut\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -662,11 +624,16 @@
 "                                -l) doar pentru utilizatorul LOGIN\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Autentificare       Eşuări Maximum Ultima dată                   La\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds rămase]"
 
 #, c-format
@@ -674,76 +641,67 @@
 msgstr " [%lds rămase]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Utilizator necunoscut: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Utilizare: %s [-r|-R] grup\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a utilizator] grup\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d utilizator] grup\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Utilizator necunoscut: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A utilizator,...] [-M utilizator,...] grup\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: nu pot deschide fişierul %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M utilizator,...] grup\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: sunt cerute parole criptate de grup pentru -A\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: nu pot obţine închiderea\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: nu pot obţine închiderea shadow\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Parola pentru %s nu poate fi schimbată.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: nu pot deschide fişierul\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: sunt cerute parole criptate de grup pentru -A\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: nu pot deschide fişierul\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: grupul %s nu există\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: nu pot deschide fişierul shadow\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s : eşuare la bifurcare: %s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -762,9 +720,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Mai încercaţi mai târziu\n"
 
-msgid "Who are you?\n"
-msgstr "Cine sunteţi?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Adaug utilizatorul %s la grupul %s\n"
@@ -773,9 +728,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: utilizatorul %s nu există\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -810,116 +765,89 @@
 "                                (ne-unic)\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: eroare la adăugarea unei noi intrări de grup\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s nu este un nume de grup valid\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: nu pot rescrie fişierul de grupuri\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "nume de grup nevalid '%s'\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: nu pot rescrie fişierul gshadow\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: nu pot încuia fişierul de grupuri\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: nu pot deschide fişierul de grupuri\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: nu pot încuia fişierul gshadow\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: nu pot deschide fişierul gshadow\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K cere KEY=VALUE\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 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 "%s: GID '%lu' already exists\n"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: nu pot crea %s\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "Utilizare: groupdel grup\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: eroare la ştergerea intrării de grup\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: nu pot redenumi directorul %s în %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: eroare la ştergerea intrării din gshadow\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: nu pot schimba utilizatorul '%s' pe un client NIS.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: nu pot şterge grupul primar al utilizatorului.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: grupul %s nu există\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: grupul %s este un grup NIS\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: grupul '%s' este un grup NIS.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s este stăpân NIS\n"
 
-msgid "Member already exists\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: utilizatorul %s este un utilizator NIS\n"
 
-msgid "Member to remove could not be found\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: nu mai este memorie pentru update_group\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
 
-msgid "Only root can add members to different groups\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
 msgstr ""
 
-msgid "Group access is required\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr ""
-
 #, fuzzy
-msgid "PAM authentication failed for\n"
-msgstr "%s: autentificare PAM eşuată\n"
-
-#, fuzzy
-msgid "Unable to lock group file\n"
-msgstr "%s: nu pot încuia fişierul de grupuri\n"
-
-#, fuzzy
-msgid "Unable to open group file\n"
-msgstr "%s: nu pot deschide fişierul de grupuri\n"
-
-#, fuzzy
-msgid "Cannot close group file\n"
-msgstr "%s: nu pot deschide fişierul de grupuri\n"
-
-#, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -944,41 +872,19 @@
 "                        (ne-unic)\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s nu s-a găsit în /etc/group\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u nu este un GID unic\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s nu este un nume unic\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: nu pot rescrie fişierul passwd\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "nume de grup nevalid '%s'\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: nu pot încuia fişierul passwd\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: grupul %s este un grup NIS\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: nu pot deschide fişierul passwd\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: utilizator necunoscut %s\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: nu pot schimba utilizatorul '%s' pe un client NIS.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Utilizare: %s [-r] [-s] [grup [gshadow]]\n"
 
@@ -990,18 +896,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s şi -r sunt incompatibile\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: nu pot încuia fişierul %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "intrare nevalidă în fişierul de grupuri"
 
@@ -1016,6 +910,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "nume de grup nevalid '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "nume de grup nevalid '%s'\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "grupul %s: nici un utilizator %s\n"
@@ -1028,18 +927,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "nici o potrivire între intrările din fişierul de grupuri în %s\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "adaug grupul '%s' în '%s'?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: nu pot actualiza intrarea parolei criptate pentru %s\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: nu pot actualiza intrarea pentru grupul %s\n"
-
 msgid "invalid shadow group file entry"
 msgstr "intrare nevalidă în fişierul gshadow"
 
@@ -1066,30 +958,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: nici o schimbare\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: nu pot încuia fişierul gshadow\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Utilizare: groupdel grup\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: nu pot deschide fişierul gshadow\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Utilizare: groupdel grup\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: nu pot şterge gshadow %s\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: nu pot actualiza fişierul %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: nu pot actualiza fişierul gshadow\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: nu pot actualiza fişierul de grupuri\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: nu pot şterge fişierul gshadow\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Utilizare: id [-a]\n"
 
@@ -1123,6 +1006,10 @@
 "                                utilizatorul cu autentificarea specificată\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Nume utilizator       Port      De la          Cel mai recent"
 
@@ -1132,15 +1019,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Utilizare: %s [-p] [nume]\n"
 
@@ -1237,6 +1124,11 @@
 "depăşirea timpului de autentificare\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Utilizare: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Utilizare: newgrp [-] [grup]\n"
 
@@ -1251,14 +1143,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s : eşuare la bifurcare: %s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "UID necunoscut: %u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: utilizatorul %s nu există\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "GID necunoscut: %lu\n"
-
 msgid "too many groups\n"
 msgstr "prea multe grupuri\n"
 
@@ -1272,60 +1160,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: grupul %s nu există\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "nume de grup nevalid '%s'\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: nume utilizator nevalid '%s'\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: utilizatorul %s nu există\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: utilizatorul %s nu există\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: nume utilizator nevalid '%s'\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: nu pot încuia /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: nu pot încuia /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: nu pot încuia /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: nu pot încuia /etc/passwd.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1341,9 +1188,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: linia %d: nu pot crea GID\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: linia %d: nu pot găsi utilizatorul %s\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: utilizatorul %s nu există\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1374,15 +1221,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1456,13 +1303,10 @@
 msgstr "Parola pentru %s nu poate fi schimbată.\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: nu mai este memorie\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1506,16 +1350,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "nume de utilizator nevalid '%s'\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "nume de utilizator nevalid '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "utilizatorul %s: fără grup %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "utilizatorul %s: directorul %s nu există\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "utilizatorul %s: programul %s nu există\n"
 
 #, c-format
@@ -1526,10 +1378,6 @@
 msgid "add user '%s' in %s? "
 msgstr "adaug utilizatorul '%s' în '%s'?"
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: nu pot actualiza intrarea passwd pentru %s\n"
-
 msgid "invalid shadow password file entry"
 msgstr "intrare nevalidă în fişierul shadow"
 
@@ -1540,34 +1388,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "utilizatorul %s: ultima schimbare de parolă s-a făcut în viitor\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: nu pot încuia fişierul passwd\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: nu pot deschide fişierul %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: nu pot deschide fişierul passwd\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Utilizare: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: nu pot şterge intrarea shadow pentru %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: nu pot actualiza fişierul shadow\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Utilizare: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: nu pot actualiza fişierul passwd\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: nu pot actualiza intrarea pentru utilizatorul %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: nu pot şterge fişierul shadow\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Acces INTERZIS către su spre acest cont.\n"
 
@@ -1635,6 +1474,16 @@
 "%s: %s\n"
 "(Ignorat)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: autentificare PAM eşuată\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Nu sunteţi autorizat pentru su %s\n"
+
 msgid "No shell\n"
 msgstr "Fără consolă\n"
 
@@ -1660,14 +1509,6 @@
 msgstr "Intrare în modul de întreţinere sistem"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: GID necunoscut %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: grup necunoscut %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: nu pot crea noile fişiere implicite\n"
 
@@ -1708,10 +1549,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1760,14 +1603,6 @@
 "                                  cont utilizator\n"
 "\n"
 
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: nu mai este memorie pentru update_group\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: nu mai este memorie pentru update_gshadow\n"
-
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: director de bază nevalid '%s'\n"
@@ -1805,50 +1640,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: nume utilizator nevalid '%s'\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: nu pot rescrie fişierul passwd\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: nu pot rescrie fişierul shadow\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: nu pot încuia fişierul shadow\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: nu pot deschide fişierul shadow\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: eroare la închiderea fişierului de grupuri\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: eroare la deschiderea fişierului de grupuri\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: eroare la închiderea fişierului gshadow\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: eroare la deschiderea fişierului gshadow\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: eroare la adăugarea unei noi intrări în passwd\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: eroare la adăugarea unei noi intrări în shadow\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: nu pot crea directorul %s\n"
 
@@ -1864,8 +1663,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Se atribuie permisiunile fişierului căsuţă de mesaje"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: utilizatorul %s există\n"
 
 #, c-format
@@ -1879,10 +1679,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s: nu pot crea %s\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u nu este unic\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: nu pot crea %s\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1891,10 +1696,6 @@
 "%s: avertisment: directorul personal există deja.\n"
 "Nu se copiază nici un fişier în el din directorul schelet.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr "%s: avertisment: CREATE_HOME nu este suportat, vă rog folosiţi -m.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1915,52 +1716,27 @@
 "mesaje\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: eroare la actualizarea intrărilor de grupuri\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Nu pot şterge grupul %s care este un grup primar pentru alt utilizator.\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: eroare la actualizarea intrărilor de grupuri\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: nu pot deschide fişierul de grupuri\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: nu pot deschide fişierul gshadow\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: eroare la ştergerea intrării din passwd\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: eroare la ştergerea intrării din shadow\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: utilizatorul %s este autentificat în acest moment\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: avertisment: nu pot şterge "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s nu aparţine de %s, nu se şterge\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: avertisment: nu pot şterge "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: utilizatorul %s nu există\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: utilizatorul %s este un utilizator NIS\n"
 
@@ -2029,9 +1805,16 @@
 "  -U, --unlock                    deblochează contul utilizator\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: eroare la adăugarea unei noi intrări de grup\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: utilizatorul %s există\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -2046,22 +1829,10 @@
 msgstr ""
 
 #, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: uid %lu nu este unic\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr ""
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: eroare la schimbarea intrării în passwd\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: eroare la ştergerea intrării passwd\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: eroare la ştergerea intrării din shadow\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: directorul %s există\n"
 
@@ -2083,6 +1854,14 @@
 msgstr "%s: nu pot redenumi directorul %s în %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: avertisment: %s nu este deţinut de către %s\n"
 
@@ -2096,7 +1875,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -2120,10 +1899,16 @@
 "  -s, --shadow                  editează baza de date shadow sau gshadow\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s : eşuare în abandonarea privilegiilor (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s este neschimbat\n"
@@ -2138,6 +1923,407 @@
 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: can't lock password file\n"
+#~ msgstr "%s: nu pot închide fişierul passwd\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: nu pot deschide fişierul passwd\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s nu pot încuia fişierul shadow\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: nu pot deschide fişierul shadow\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: nu pot rescrie fişierul shadow\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: nu pot rescrie fişierul passwd\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: nu pot actualiza fişierul passwd\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: nu pot actualiza fişierul shadow\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tNume complet: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tNumăr cameră: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tTelefon birou: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tTelefon acasă: %s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr "Nu pot încuia fişierul passwd; încercaţi mai târziu.\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Nu pot deschide fişierul passwd.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: nu pot încuia fişierul de grupuri\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: nu pot deschide fişierul de grupuri\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: nu pot închide fişierul gshadow\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: nu pot deschide fişierul shadow\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: eroare la actualizarea fişierului shadow\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: eroare la actualizarea intrărilor de grupuri\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: linia %d: grup necunoscut %s\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: linia %d: nu pot actualiza intrarea\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: nu pot închide fişierul shadow\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: eroare la actualizarea fişierului shadow\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: eroare la actualizarea fişierului passwd\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: linia %d: utilizator necunoscut %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: linia %d: nu pot actualiza intrarea în passwd\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: utilizator necunoscut\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Utilizator necunoscut: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Utilizare: %s [-r|-R] grup\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a utilizator] grup\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d utilizator] grup\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A utilizator,...] [-M utilizator,...] grup\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M utilizator,...] grup\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: nu pot obţine închiderea\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: nu pot obţine închiderea shadow\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: nu pot deschide fişierul\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: nu pot rescrie fişierul\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: nu pot rescrie fişierul shadow\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: nu pot descuia fişierul\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: nu pot actualiza intrarea\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: nu pot actualiza intrarea shadow\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "grup necunoscut: %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: nu pot deschide fişierul\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: nu pot deschide fişierul shadow\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Cine sunteţi?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: membru necunoscut %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: eroare la adăugarea unei noi intrări de grup\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: nu pot rescrie fişierul de grupuri\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: nu pot rescrie fişierul gshadow\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: nu pot încuia fişierul de grupuri\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: nu pot deschide fişierul de grupuri\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: nu pot încuia fişierul gshadow\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: nu pot deschide fişierul gshadow\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u nu este unic\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: eroare la ştergerea intrării de grup\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: eroare la ştergerea intrării din gshadow\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: nu pot şterge grupul primar al utilizatorului.\n"
+
+#, fuzzy
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "%s: autentificare PAM eşuată\n"
+
+#, fuzzy
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "%s: nu pot încuia fişierul de grupuri\n"
+
+#, fuzzy
+#~ msgid "Unable to open group file\n"
+#~ msgstr "%s: nu pot deschide fişierul de grupuri\n"
+
+#, fuzzy
+#~ msgid "Cannot close group file\n"
+#~ msgstr "%s: nu pot deschide fişierul de grupuri\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s nu s-a găsit în /etc/group\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u nu este un GID unic\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s nu este un nume unic\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: nu pot rescrie fişierul passwd\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: nu pot încuia fişierul passwd\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: nu pot deschide fişierul passwd\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: nu pot încuia fişierul %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: nu pot actualiza intrarea parolei criptate pentru %s\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: nu pot actualiza intrarea pentru grupul %s\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: nu pot încuia fişierul gshadow\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: nu pot deschide fişierul gshadow\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: nu pot şterge gshadow %s\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: nu pot actualiza fişierul gshadow\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: nu pot actualiza fişierul de grupuri\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: nu pot şterge fişierul gshadow\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "UID necunoscut: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "GID necunoscut: %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: grupul %s nu există\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: utilizatorul %s nu există\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: nume utilizator nevalid '%s'\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: nu pot încuia /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: nu pot încuia /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: nu pot încuia /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: nu pot încuia /etc/passwd.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: nu pot deschide fişierele\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: eroare la actualizarea fişierelor\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: linia %d: nu pot găsi utilizatorul %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: nu pot actualiza intrarea passwd pentru %s\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: nu pot încuia fişierul passwd\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: nu pot deschide fişierul passwd\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: nu pot şterge intrarea shadow pentru %s\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: nu pot actualiza fişierul shadow\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: nu pot actualiza fişierul passwd\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: nu pot actualiza intrarea pentru utilizatorul %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: nu pot şterge fişierul shadow\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: GID necunoscut %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: grup necunoscut %s\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: nu mai este memorie pentru update_gshadow\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: nu pot rescrie fişierul passwd\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: nu pot rescrie fişierul shadow\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: nu pot încuia fişierul shadow\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: nu pot deschide fişierul shadow\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: eroare la închiderea fişierului de grupuri\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: eroare la deschiderea fişierului de grupuri\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: eroare la închiderea fişierului gshadow\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: eroare la deschiderea fişierului gshadow\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: eroare la adăugarea unei noi intrări în passwd\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: eroare la adăugarea unei noi intrări în shadow\n"
+
+#~ 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"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: eroare la actualizarea intrărilor de grupuri\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: eroare la actualizarea intrărilor de grupuri\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: nu pot deschide fişierul de grupuri\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: nu pot deschide fişierul gshadow\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: eroare la ştergerea intrării din passwd\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: eroare la ştergerea intrării din shadow\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: utilizatorul %s nu există\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: eroare la adăugarea unei noi intrări de grup\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: uid %lu nu este unic\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: eroare la schimbarea intrării în passwd\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: eroare la ştergerea intrării passwd\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: eroare la ştergerea intrării din shadow\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: nu pot prelua GID unic\n"
 
@@ -2147,18 +2333,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " pe '%.100s'"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: nu pot încuia fişierele, încercaţi mai târziu\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: linia %d: nu pot crea UID\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/ru.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.1.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\n"
 "PO-Revision-Date: 2008-03-24 20:43+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -61,6 +61,9 @@
 msgid "  Choose a new password."
 msgstr "  Выберите и введите новый пароль."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Срок действия вашего пароля истекает через %ld дней.\n"
@@ -72,7 +75,12 @@
 msgstr "Срок действия вашего пароля истекает сегодня."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Не удалось сменить терминал %s"
 
 msgid "Environment overflow\n"
@@ -97,12 +105,16 @@
 "Последняя была %s на %s.\n"
 msgstr[2] "%d неудачных попыток входа в систему. Последняя была %s на %s.\n"
 
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+#| msgid "Can't get unique GID (no more available GIDs)\n"
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "Не удалось получить уникальный GID (кончились свободные GID-ы)\n"
+
+#, fuzzy, c-format
+#| msgid "Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "Не удалось получить уникальный UID (кончились свободные UID-ы)\n"
 
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "Не удалось получить уникальный GID (кончились свободные GID-ы)\n"
-
 msgid "Too many logins.\n"
 msgstr "Слишком много попыток входа в систему.\n"
 
@@ -196,9 +208,16 @@
 msgstr "Не удалось определить название вашего терминала."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: нехватка памяти\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "не удалось выделить %d байт памяти\n"
 
+msgid "No"
+msgstr ""
+
 msgid "Password: "
 msgstr "Пароль: "
 
@@ -206,6 +225,11 @@
 msgid "%s's Password: "
 msgstr "Пароль пользователя %s: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: поля слишком длинные\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -304,42 +328,34 @@
 msgstr "%s: Доступ запрещён.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Не удалось определить имя пользователя.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: проверка подлинности PAM завершилась неудачно\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: не удалось заблокировать файл паролей\n"
+#, fuzzy, c-format
+#| msgid "Cannot lock the password file; try again later.\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "Не удалось заблокировать файл паролей, попробуйте позже.\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: не удалось открыть файл паролей\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: не удалось открыть файл %s\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: не удалось заблокировать теневой файл паролей\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: ошибка при вызове fork: %s\n"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: не удалось открыть теневой файл паролей\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: не удалось снизить уровень привилегий (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: не удалось перезаписать теневой файл паролей\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: не удалось перезаписать файл паролей\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: не удалось обновить файл паролей\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: не удалось обновить теневой файл паролей\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: отсутствует теневой файл паролей\n"
 
@@ -347,9 +363,10 @@
 msgid "%s: failed to drop privileges (%s)\n"
 msgstr "%s: не удалось снизить уровень привилегий (%s)\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: неизвестный пользователь %s\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: пользователь '%s' не существует\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -376,57 +393,27 @@
 msgid "Full Name"
 msgstr "Полное имя"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tПолное имя: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Номер комнаты"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tНомер комнаты: %s\n"
-
 msgid "Work Phone"
 msgstr "Рабочий телефон"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tРабочий телефон: %s\n"
-
 msgid "Home Phone"
 msgstr "Домашний телефон"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tДомашний телефон: %s\n"
-
 msgid "Other"
 msgstr "Другое"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Не удалось получить права суперпользователя.\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 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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -459,9 +446,10 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' содержит недопустимые символы\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Не удалось определить имя пользователя.\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: пользователь '%s' не существует\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -512,8 +500,9 @@
 msgid "%s: invalid numeric argument '%s'\n"
 msgstr "%s: неверный числовой параметр '%s'\n"
 
-#, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+#, fuzzy, c-format
+#| msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: флаг %s разрешено использовать ТОЛЬКО вместе с флагом %s\n"
 
 #, c-format
@@ -525,30 +514,6 @@
 msgstr "%s: неподдерживаемый метод шифрования: %s\n"
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: не удалось заблокировать файл group\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: не удалось открыть файл group\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: не удалось выполнить блокировку файла gshadow\n"
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-msgstr "%s: не удалось открыть файл shadow\n"
-
-#, c-format
-msgid "%s: error updating gshadow file\n"
-msgstr "%s: ошибка обновления файла gshadow\n"
-
-#, c-format
-msgid "%s: error updating group file\n"
-msgstr "%s: ошибка обновления файла group\n"
-
-#, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: строка %d: слишком длинная строка\n"
 
@@ -556,38 +521,25 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: строка %d: отсутствует новый пароль\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: строка %d: неизвестная группа %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: группа %s не существует\n"
 
-#, c-format
-msgid "%s: line %d: cannot update group entry\n"
-msgstr "%s: строка %d: не удалось обновить запись группы\n"
+#, fuzzy, c-format
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: пользователь '%s' не существует\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: ошибка обновления файла shadow\n"
-
-#, c-format
-msgid "%s: error updating password 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"
@@ -606,8 +558,9 @@
 msgid "Login Shell"
 msgstr "Командная оболочка"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Вы не можете изменять командную оболочку для %s.\n"
 
 #, c-format
@@ -618,24 +571,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Неверное значение: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s не является командной оболочкой.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Использование: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: неизвестный пользователь\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -663,11 +632,16 @@
 "                        или -l) только для учётной записи с заданным ИМЕНЕМ\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Уч.запись      Неуд. попыток  Максимум  Последний раз\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds осталось]"
 
 #, c-format
@@ -675,80 +649,71 @@
 msgstr " [%lds блокировок]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Неизвестный пользователь: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Использование: %s [-r|-R] группа\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "                   %s [-a имя пользователя] группа\n"
-
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "                   %s [-d имя пользователя] группа\n"
-
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
 msgstr ""
-"                   %s [-A имя пользователя,...] [-M имя пользователя,...] "
-"группа\n"
 
-#, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "                   %s [-M имя пользователя,...] группа\n"
+#, fuzzy, c-format
+#| msgid "Unknown user or range: %s\n"
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Неизвестный пользователь или диапазон: %s\n"
 
-#, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: для -A требуется поддержка теневого файла паролей групп\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: не удалось открыть файл %s\n"
 
 #, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: не удалось осуществить блокировку\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: не удалось осуществить блокировку файла shadow\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: не удалось открыть файл\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: не удалось перезаписать файл\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Пароль пользователя %s не может быть изменён.\n"
 
 #, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: не удалось перезаписать файл shadow\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: для -A требуется поддержка теневого файла паролей групп\n"
 
-#, c-format
-msgid "%s: can't unlock file\n"
-msgstr "%s: не удалось разблокировать файл\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: группа %s не существует\n"
 
-#, c-format
-msgid "%s: can't update entry\n"
-msgstr "%s: не удалось обновить запись\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: ошибка при вызове fork: %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"
-
-#, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: не удалось закрыть файл\n"
-
-#, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: не удалось закрыть файл shadow\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Изменение пароля для группы %s\n"
 
@@ -765,9 +730,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Попробуйте позже\n"
 
-msgid "Who are you?\n"
-msgstr "Вы кто?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Добавление пользователя %s в группу %s\n"
@@ -776,9 +738,10 @@
 msgid "Removing user %s from group %s\n"
 msgstr "Удаление пользователя %s из группы %s\n"
 
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: неизвестный член группы %s\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: пользователь '%s' не существует\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -813,113 +776,93 @@
 "  -r, --system          создать системную учётную запись\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: не удалось добавить новую группу\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s не может быть именем группы\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: не удалось переписать файл group\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group ID '%s'\n"
+msgstr "%s: неверное имя группы '%s'\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: не удалось переписать теневой файл групп\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: не удалось заблокировать файл group\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: не удалось открыть файл group\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: не удалось заблокировать теневой файл групп\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: не удалось открыть теневой файл групп\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: для -К необходимо ИМЯ=ЗНАЧЕНИЕ\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 msgstr "%s: группа %s существует\n"
 
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u уже существует\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "Член уже существует\n"
 
-#, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: не удалось создать группу\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "Использование: groupdel группа\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: ошибка удаления записи о группе\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: не удалось переименовать каталог %s в %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: ошибка удаления записи из теневого файла групп\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr ""
+"%s: невозможно изменить первичную группу пользователя '%s' с %u на %u.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: невозможно удалить первичную группу пользователя.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: группа %s не существует\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: группа %s является группой NIS\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: группа '%s' является группой NIS.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s является мастер сервером NIS\n"
 
-msgid "Member already exists\n"
-msgstr "Член уже существует\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: пользователь %s является пользователем NIS\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Не найден член для удаления\n"
+#, fuzzy, c-format
+#| msgid "%s: Out of memory. Cannot update the group database.\n"
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: Недостаточно памяти. Невозможно обновить базу данных групп.\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
-"Использование: groupmems -a ИМЯ_ПОЛЬЗОВАТЕЛЯ | -d ИМЯ_ПОЛЬЗОВАТЕЛЯ | -D | -l "
-"[-g ИМЯ_ГРУППЫ]\n"
 
-msgid "Only root can add members to different groups\n"
-msgstr "Только суперпользователь может добавлять членов в различные группы\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "Требуется доступ к группе\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Не первичный владелец текущей группы\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "Проверка подлинности PAM завершилась неудачно для\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Не удалось заблокировать файл group\n"
-
-msgid "Unable to open group file\n"
-msgstr "Не удалось открыть файл group\n"
-
-msgid "Cannot close group file\n"
-msgstr "Не удалось закрыть файл group\n"
-
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -943,44 +886,20 @@
 "  -p, --password PASS   использовать шифрованный пароль для нового пароля\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s не найдена в /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "%s: неверное имя группы '%s'\n"
 
 #, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u GID уже существует\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: группа %s является группой NIS\n"
 
 #, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s имя уже существует\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: неизвестный пользователь %s\n"
 
 #, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: не удалось перезаписать файл passwd\n"
-
-#, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: не удалось заблокировать файл паролей\n"
-
-#, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: не удалось открыть файл паролей\n"
-
-#, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-"%s: невозможно изменить первичную группу пользователя '%s' с %u на %u, так "
-"как её нет в файле passwd.\n"
-
-#, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr ""
-"%s: невозможно изменить первичную группу пользователя '%s' с %u на %u.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Использование: %s [-r] [-s] [group [gshadow]]\n"
 
@@ -992,18 +911,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s и -r не могут использоваться одновременно\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: не удалось заблокировать файл %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-msgstr "%s: не удалось открыть файл %s\n"
-
-#, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: не удалось обновить файл %s\n"
-
 msgid "invalid group file entry"
 msgstr "неверная запись в файле групп"
 
@@ -1018,6 +925,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "неверное имя группы '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "неверное имя группы '%s'\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "группа %s: пользователь %s не существует\n"
@@ -1030,18 +942,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "отсутствует соответствующая группа в файле %s\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "добавить группу '%s' в %s ?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: не удалось обновить запись в теневом файле паролей для %s\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: не удалось обновить запись для группы %s\n"
-
 msgid "invalid shadow group file entry"
 msgstr "неверная запись в теневом файле групп"
 
@@ -1068,30 +973,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: изменений не внесено\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: не удалось заблокировать теневой файл групп\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Использование: groupdel группа\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: не удалось открыть теневой файл групп\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Использование: groupdel группа\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: не удалось удалить теневую группу %s\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: не удалось обновить файл %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: не удалось обновить теневой файл групп\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: не удалось обновить файл групп\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: не удалось удалить теневой файл групп\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Использование: id [-a]\n"
 
@@ -1121,6 +1017,10 @@
 "  -u, --user ИМЯ        показать запись lastlog для учётной записи ИМЯ\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Пользователь     Порт     С                Последний раз"
 
@@ -1131,14 +1031,14 @@
 msgstr "**Никогда не входил в систему**"
 
 #, c-format
-msgid "Unknown user or range: %s\n"
-msgstr "Неизвестный пользователь или диапазон: %s\n"
-
-#, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: неожиданный параметр: %s\n"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Использование: %s [-p] [имя пользователя]\n"
 
@@ -1235,6 +1135,11 @@
 "время входа в систему истекло\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Использование: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Использование: newgrp [-] [группа]\n"
 
@@ -1248,14 +1153,11 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: ошибка при вызове fork: %s\n"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "неизвестный GID: %u\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: пользователь '%s' не существует\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "неизвестный GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "слишком много групп\n"
 
@@ -1273,64 +1175,22 @@
 "  -r, --system          создать системную учётную запись\n"
 "%s\n"
 
-#, c-format
-msgid "%s: group ID `%s' is not valid\n"
-msgstr "%s: группа c ID '%s' недопустима\n"
-
-#, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "%s: неверное имя группы '%s'\n"
-
-#, c-format
-msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr ""
 "%s: группа %s является теневой группой, но не существует в /etc/group\n"
 
-#, c-format
-msgid ""
-"%s: group %s created, failure during the creation of the corresponding "
-"gshadow group\n"
-msgstr ""
-"%s: группа %s создана, но произошла ошибка при создании соответствующей "
-"группы в gshadow\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: неверное имя пользователя '%s'\n"
 
 #, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: ID пользователя '%s' недопустимо\n"
-
-#, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: пользователь '%s' не существует\n"
-
-#, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: неверное имя пользователя '%s'\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: не удалось заблокировать /etc/passwd.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: не удалось заблокировать /etc/shadow.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: не удалось заблокировать /etc/group.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: не удалось заблокировать /etc/gshadow.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1348,9 +1208,10 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: строка %d: не удалось создать группу\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: строка %d: не удалось найти пользователя %s\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: пользователь '%s' не существует\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1368,6 +1229,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: строка %d: не удалось обновить запись\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1380,15 +1269,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1463,14 +1352,14 @@
 msgid "The password for %s cannot be changed yet.\n"
 msgstr "Пароль для %s пока не может быть изменён.\n"
 
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: нехватка памяти\n"
-
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 "%s: разблокировка пользователя приведёт к появлению беспарольной учётной "
 "записи.\n"
@@ -1518,16 +1407,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "неверное имя пользователя '%s'\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "неверное имя пользователя '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "пользователь %s: группа %u не существует\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "пользователь %s: каталог %s не существует\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "пользователь %s: командная оболочка %s не существует\n"
 
 #, c-format
@@ -1538,10 +1435,6 @@
 msgid "add user '%s' in %s? "
 msgstr "добавить пользователя '%s' в %s ? "
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: не удалось обновить запись в файле паролей для %s\n"
-
 msgid "invalid shadow password file entry"
 msgstr "неверная запись в теневом файле паролей"
 
@@ -1552,34 +1445,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "пользователь %s: время последнего изменения пароля в будущем\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: не удалось заблокировать файл паролей\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: не удалось открыть файл %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: не удалось открыть файл паролей\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Использование: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: не удалось удалить запись в теневом файле паролей для %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: не удалось обновить теневой файл паролей\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Использование: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: не удалось обновить файл паролей\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: не удалось обновить запись для пользователя %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: не удалось удалить теневой файл паролей\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Переключение на эту учётную запись ЗАПРЕЩЕНО.\n"
 
@@ -1648,6 +1532,16 @@
 "%s: %s\n"
 "(Игнорировано)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: проверка подлинности PAM завершилась неудачно\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "У вас нет права переключать учётную запись %s\n"
+
 msgid "No shell\n"
 msgstr "Отсутствует командная оболочка\n"
 
@@ -1674,14 +1568,6 @@
 msgstr "Вход в режим системного обслуживания"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: неизвестный GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: неизвестная группа %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: не удалось создать новый файл значений по умолчанию\n"
 
@@ -1701,6 +1587,46 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: указано слишком много групп (максимум %d).\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: useradd [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
+#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#| "                                home directory\n"
+#| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#| "account\n"
+#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#| "  -D, --defaults                print or save modified default useradd\n"
+#| "                                configuration\n"
+#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#| "EXPIRE_DATE\n"
+#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#| "                                user account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#| "  -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"
+#| "  -N, --no-user-group           do not create a group with the same name "
+#| "as\n"
+#| "                                the user\n"
+#| "  -o, --non-unique              allow create user with duplicate\n"
+#| "                                (non-unique) UID\n"
+#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#| "                                account\n"
+#| "  -r, --system                  create a system account\n"
+#| "  -s, --shell SHELL             the login shell for the new user account\n"
+#| "  -u, --uid UID                 force use the UID for the new user "
+#| "account\n"
+#| "  -U, --user-group              create a group with the same name as the "
+#| "user\n"
+#| "\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1721,10 +1647,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1780,15 +1708,6 @@
 "\n"
 
 #, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: Недостаточно памяти. Невозможно обновить базу данных групп.\n"
-
-#, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr ""
-"%s: Недостаточно памяти. Невозможно обновить базу данных теневых групп.\n"
-
-#, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: неверный базовый каталог '%s'\n"
 
@@ -1825,50 +1744,14 @@
 msgstr "%s: конфликт параметров %s и %s\n"
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: неверное имя пользователя '%s'\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: не удалось перезаписать файл паролей\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: не удалось перезаписать теневой файл паролей\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: не удалось заблокировать теневой файл паролей\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: не удалось открыть теневой файл паролей\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: не удалось заблокировать файл group\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: не удалось открыть файл group\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: не удалось заблокировать теневой файл групп\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: не удалось открыть теневой файл групп\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: не удалось добавить запись пароля\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: не удалось добавить запись в теневой файл паролей\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: не удалось создать каталог %s\n"
 
@@ -1884,8 +1767,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Установка прав на файл почтового ящика"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: пользователь %s существует\n"
 
 #, c-format
@@ -1899,11 +1783,16 @@
 msgid "%s: can't create user\n"
 msgstr "%s: не удалось создать пользователя\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u уже существует\n"
 
 #, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: не удалось создать группу\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1911,10 +1800,6 @@
 "%s: внимание: домашний каталог уже существует.\n"
 "Никакие файлы из каталога skel копироваться не будут.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr "%s: внимание: CREATE_HOME не поддерживается, используйте -m.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1935,53 +1820,28 @@
 "  -r, --remove                  удалить домашний каталог и почтовый ящик\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: не удалось обновить запись в файле групп\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: невозможно удалить группу %s, так как она является первичной для другого "
 "пользователя.\n"
 
 #, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: ошибка обновления записи теневой группы\n"
-
-#, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: не удалось открыть файл group\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: не удалось открыть теневой файл групп\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: ошибка удаления записи о пароле\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: ошибка удаления записи из теневого файла паролей\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: пользователь %s находится в системе\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: внимание: не удалось удалить "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s не принадлежит %s, удаление не выполнено\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: внимание: не удалось удалить "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: пользователь %s не существует\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: пользователь %s является пользователем NIS\n"
 
@@ -2051,10 +1911,24 @@
 "  -U, --unlock                  разблокировать учётную запись\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: ошибка добавления новой записи о теневой группе\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+"%s: разблокировка пользователя приведёт к появлению беспарольной учётной "
+"записи.\n"
+"Вы должны задать пароль с помощью usermod -p для разблокировки учётной "
+"записи пользователя.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: пользователь %s существует\n"
+
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: не заданы параметры\n"
@@ -2068,23 +1942,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr "%s: параметры -L, -p и -U взаимоисключающие\n"
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: uid %lu уже существует\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "Член уже существует\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: ошибка изменения записи пароля\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: ошибка удаления записи пароля\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: ошибка удаления записи из теневого файла паролей\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: каталог %s существует\n"
 
@@ -2105,6 +1968,14 @@
 msgstr "%s: не удалось переименовать каталог %s в %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: внимание: %s не принадлежит %s\n"
 
@@ -2114,11 +1985,15 @@
 msgid "failed to rename mailbox"
 msgstr "не удалось переименовать почтовый ящик"
 
-#, c-format
+#, fuzzy, 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"
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 "Вы изменили %s.\n"
 "Для обеспечения согласованности вам может потребоваться изменить %s.\n"
@@ -2147,10 +2022,16 @@
 "                                паролей пользователей или групп\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: не удалось снизить уровень привилегий (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s не был изменён\n"
@@ -2164,3 +2045,417 @@
 #, c-format
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: не удалось восстановить %s: %s (ваши изменения в %s)\n"
+
+#~ msgid "%s: can't lock password file\n"
+#~ msgstr "%s: не удалось заблокировать файл паролей\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: не удалось открыть файл паролей\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: не удалось заблокировать теневой файл паролей\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: не удалось открыть теневой файл паролей\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: не удалось перезаписать теневой файл паролей\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: не удалось перезаписать файл паролей\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: не удалось обновить файл паролей\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: не удалось обновить теневой файл паролей\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tПолное имя: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tНомер комнаты: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tРабочий телефон: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tДомашний телефон: %s\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Не удалось открыть файл паролей.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: не удалось заблокировать файл group\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: не удалось открыть файл group\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: не удалось выполнить блокировку файла gshadow\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: не удалось открыть файл shadow\n"
+
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: ошибка обновления файла gshadow\n"
+
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: ошибка обновления файла group\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: строка %d: неизвестная группа %s\n"
+
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: строка %d: не удалось обновить запись группы\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: не удалось заблокировать файл shadow\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: ошибка обновления файла shadow\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: ошибка обновления файла паролей\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: строка %d: неизвестный пользователь %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: строка %d: не удалось обновить поле пароля\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: неизвестный пользователь\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Неизвестный пользователь: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Использование: %s [-r|-R] группа\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "                   %s [-a имя пользователя] группа\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "                   %s [-d имя пользователя] группа\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr ""
+#~ "                   %s [-A имя пользователя,...] [-M имя пользователя,...] "
+#~ "группа\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "                   %s [-M имя пользователя,...] группа\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: не удалось осуществить блокировку\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: не удалось осуществить блокировку файла shadow\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: не удалось открыть файл\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: не удалось перезаписать файл\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: не удалось перезаписать файл shadow\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: не удалось разблокировать файл\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: не удалось обновить запись\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: не удалось обновить запись в shadow\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "неизвестная группа: %s\n"
+
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: не удалось закрыть файл\n"
+
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: не удалось закрыть файл shadow\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Вы кто?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: неизвестный член группы %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: не удалось добавить новую группу\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: не удалось переписать файл group\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: не удалось переписать теневой файл групп\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: не удалось заблокировать файл group\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: не удалось открыть файл group\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: не удалось заблокировать теневой файл групп\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: не удалось открыть теневой файл групп\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u уже существует\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: ошибка удаления записи о группе\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: ошибка удаления записи из теневого файла групп\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: невозможно удалить первичную группу пользователя.\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Не найден член для удаления\n"
+
+#~ msgid ""
+#~ "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+#~ msgstr ""
+#~ "Использование: groupmems -a ИМЯ_ПОЛЬЗОВАТЕЛЯ | -d ИМЯ_ПОЛЬЗОВАТЕЛЯ | -D | "
+#~ "-l [-g ИМЯ_ГРУППЫ]\n"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr ""
+#~ "Только суперпользователь может добавлять членов в различные группы\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "Требуется доступ к группе\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Не первичный владелец текущей группы\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "Проверка подлинности PAM завершилась неудачно для\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Не удалось заблокировать файл group\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Не удалось открыть файл group\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Не удалось закрыть файл group\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s не найдена в /etc/group\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u GID уже существует\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s имя уже существует\n"
+
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: не удалось перезаписать файл passwd\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: не удалось заблокировать файл паролей\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: не удалось открыть файл паролей\n"
+
+#~ msgid ""
+#~ "%s: cannot change the primary group of user '%s' from %u to %u, since it "
+#~ "is not in the passwd file.\n"
+#~ msgstr ""
+#~ "%s: невозможно изменить первичную группу пользователя '%s' с %u на %u, "
+#~ "так как её нет в файле passwd.\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: не удалось заблокировать файл %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: не удалось обновить запись в теневом файле паролей для %s\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: не удалось обновить запись для группы %s\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: не удалось заблокировать теневой файл групп\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: не удалось открыть теневой файл групп\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: не удалось удалить теневую группу %s\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: не удалось обновить теневой файл групп\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: не удалось обновить файл групп\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: не удалось удалить теневой файл групп\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "неизвестный GID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "неизвестный GID: %lu\n"
+
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: группа c ID '%s' недопустима\n"
+
+#~ msgid ""
+#~ "%s: group %s created, failure during the creation of the corresponding "
+#~ "gshadow group\n"
+#~ msgstr ""
+#~ "%s: группа %s создана, но произошла ошибка при создании соответствующей "
+#~ "группы в gshadow\n"
+
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: ID пользователя '%s' недопустимо\n"
+
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: неверное имя пользователя '%s'\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: не удалось заблокировать /etc/passwd.\n"
+
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: не удалось заблокировать /etc/shadow.\n"
+
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: не удалось заблокировать /etc/group.\n"
+
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: не удалось заблокировать /etc/gshadow.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: не удалось открыть файлы\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: ошибка обновления файлов\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: строка %d: не удалось найти пользователя %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: не удалось обновить запись в файле паролей для %s\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: не удалось заблокировать файл паролей\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: не удалось открыть файл паролей\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: не удалось удалить запись в теневом файле паролей для %s\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: не удалось обновить теневой файл паролей\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: не удалось обновить файл паролей\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: не удалось обновить запись для пользователя %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: не удалось удалить теневой файл паролей\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: неизвестный GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: неизвестная группа %s\n"
+
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr ""
+#~ "%s: Недостаточно памяти. Невозможно обновить базу данных теневых групп.\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: не удалось перезаписать файл паролей\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: не удалось перезаписать теневой файл паролей\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: не удалось заблокировать теневой файл паролей\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: не удалось открыть теневой файл паролей\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: не удалось заблокировать файл group\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: не удалось открыть файл group\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: не удалось заблокировать теневой файл групп\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: не удалось открыть теневой файл групп\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: не удалось добавить запись пароля\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: не удалось добавить запись в теневой файл паролей\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr "%s: внимание: CREATE_HOME не поддерживается, используйте -m.\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: не удалось обновить запись в файле групп\n"
+
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: ошибка обновления записи теневой группы\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: не удалось открыть файл group\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: не удалось открыть теневой файл групп\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: ошибка удаления записи о пароле\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: ошибка удаления записи из теневого файла паролей\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: пользователь %s не существует\n"
+
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: ошибка добавления новой записи о теневой группе\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: uid %lu уже существует\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: ошибка изменения записи пароля\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: ошибка удаления записи пароля\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: ошибка удаления записи из теневого файла паролей\n"

Modified: upstream/trunk/po/sk.po
===================================================================
--- upstream/trunk/po/sk.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/sk.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\n"
 "PO-Revision-Date: 2008-03-20 10:40+0100\n"
 "Last-Translator: Ivan Masár <helix84 at centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -54,6 +54,9 @@
 msgid "  Choose a new password."
 msgstr "  Zvoľte nové heslo."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "O %ld dní uplynie platnosť vášho hesla.\n"
@@ -65,7 +68,12 @@
 msgstr "Dnes uplynie platnosť vášho hesla."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Nedá sa zmeniť TTY %s"
 
 msgid "Environment overflow\n"
@@ -92,13 +100,17 @@
 "%d chybných pokusov o prihlásenie od posledného prihlásenia.\n"
 "Posledné bolo %s na %s.\n"
 
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+#| msgid "Can't get unique GID (no more available GIDs)\n"
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr ""
-"nedá sa získať vytvoriť jedinečný UID (už nie sú dostupné žiadne UID)\n"
+"nedá sa získať vytvoriť jedinečný GID (už nie sú dostupné žiadne GID)\n"
 
-msgid "Can't get unique GID (no more available GIDs)\n"
+#, fuzzy, c-format
+#| msgid "Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr ""
-"nedá sa získať vytvoriť jedinečný GID (už nie sú dostupné žiadne GID)\n"
+"nedá sa získať vytvoriť jedinečný UID (už nie sú dostupné žiadne UID)\n"
 
 msgid "Too many logins.\n"
 msgstr "Príliš mnoho prihlásení.\n"
@@ -191,9 +203,18 @@
 msgstr "Nedá sa zistiť názov vášho tty."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: nedostatok pamäti\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "volanie malloc(%d) zlyhalo\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "Nie\n"
+
 msgid "Password: "
 msgstr "Heslo: "
 
@@ -201,6 +222,11 @@
 msgid "%s's Password: "
 msgstr "Heslo používateľa %s:"
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: položka je príliš dlhá\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -297,44 +323,36 @@
 msgid "%s: Permission denied.\n"
 msgstr "%s: Odmietnutý prístup.\n"
 
+#, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: vaše používateľské meno sa nedá zistiť.\n"
+
 #  c-format
 #, c-format
 msgid "%s: PAM authentication failed\n"
 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"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: súbory sa nedajú zamknúť, skúste to neskôr znova\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: súbor s heslami sa nedá otvoriť\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: súbor %s sa nedá otvoriť\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"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: chybné vetvenie: %s\n"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: súbor s tieňovými heslami sa nedá otvoriť\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: zlyhalo odstránenie právomocí (%s)\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"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: súbor s heslami sa nedá prepísať\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: súbor s heslami sa nedá aktualizovaťt\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: súbor s tieňovými heslami sa nedá aktualizovať\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"
 
@@ -342,9 +360,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: používateľ „%s“ neexistuje\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -373,57 +392,27 @@
 msgid "Full Name"
 msgstr "Celé meno"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tCelé meno: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Číslo miestnosti"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tČíslo miestnosti: %s\n"
-
 msgid "Work Phone"
 msgstr "Telefón do zamestnania"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tTelefón do zamestnania: %s\n"
-
 msgid "Home Phone"
 msgstr "Telefón domov"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tTelefón domov: %s\n"
-
 msgid "Other"
 msgstr "Ostatné"
 
 msgid "Cannot change ID to root.\n"
 msgstr "ID sa nedá zmeniť na root.\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"
-
-msgid "Cannot open the password file.\n"
-msgstr "Súbor s heslami sa nedá otvoriť.\n"
-
 #, c-format
-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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -456,9 +445,10 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: „%s“ obsahuje chybné znaky\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: vaše používateľské meno sa nedá zistiť.\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: používateľ „%s“ neexistuje\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -509,8 +499,9 @@
 msgid "%s: invalid numeric argument '%s'\n"
 msgstr "%s: chybný číselný parameter „%s“\n"
 
-#, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+#, fuzzy, c-format
+#| msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: prepínač %s je dovolený IBA s prepínačom %s\n"
 
 #, c-format
@@ -522,30 +513,6 @@
 msgstr "%s: nepodporovaná metóda šifrovania: %s\n"
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: súbor so skupinami sa nedá zamknúť\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: súbor so skupinami sa nedá otvoriť\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: súbor s tieňovými heslami skupín sa nedá zamknúť\n"
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-msgstr "%s: súbor s tieňovými heslami sa nedá otvoriť\n"
-
-#, c-format
-msgid "%s: error updating gshadow file\n"
-msgstr "%s: chyba pri aktualizácii súboru gshadow\n"
-
-#, c-format
-msgid "%s: error updating group file\n"
-msgstr "%s: chyba pri aktualizácii súboru so skupinami\n"
-
-#, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: riadok %d je príliš dlhý\n"
 
@@ -553,38 +520,25 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: riadok %d: chýba nové heslo\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: riadok %d: skupina %s je neznáma\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: skupina %s neexistuje\n"
 
-#, c-format
-msgid "%s: line %d: cannot update group entry\n"
-msgstr "%s: riadok %d: sa nedá aktualizovať položka súboru so skupinami\n"
+#, fuzzy, c-format
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: používateľ „%s“ neexistuje\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: chyba pri aktualizácii súboru s tieňovými heslami\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: chyba pri aktualizácii súboru s heslami\n"
-
-#, c-format
-msgid "%s: line %d: unknown user %s\n"
-msgstr "%s: riadok %d: používateľ %s je neznámy\n"
-
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr "%s: riadok %d: záznam hesla sa nedá aktualizovať\n"
-
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -604,8 +558,9 @@
 msgid "Login Shell"
 msgstr "Predvolený shell"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Nemôžete zmeniť shell pre %s.\n"
 
 #, c-format
@@ -616,24 +571,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Chybná položka: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "Shell %s je neplatný.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Použitie: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: neznámy používateľ\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -660,11 +631,16 @@
 "                        -r, -m or -l) pre používateľa s loginom LOGIN\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Chybné   Najviac Posledné                 Na\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds ostalo]"
 
 #, c-format
@@ -672,78 +648,71 @@
 msgstr " [%lds zámok]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Používateľ %s je neznámy.\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Použitie: %s [-r|-R] skupina\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a používateľ] skupina\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d používateľ] skupina\n"
+#, fuzzy, c-format
+#| msgid "Unknown user or range: %s\n"
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Neznámy používateľ alebo rozsah: %s.\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A používateľ,...] [-M používateľ,...] skupina\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: súbor %s sa nedá otvoriť\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M používateľ,...] skupina\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: prepínač -A funguje iba s tieňovými heslami skupín\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: nedá sa získať zámok\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, 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"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Heslo pre %s sa nedá zmeniť.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: nedá sa otvoriť súbor\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: prepínač -A funguje iba s tieňovými heslami skupín\n"
 
-#, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: súbor sa nedá prepísať\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: skupina %s neexistuje\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"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: chybné vetvenie: %s\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"
-
-#, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: nedá sa zatvoriť súbor\n"
-
-#, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: súbor s tieňovými heslami sa nedá zatvoriť\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Mením heslo skupiny %s\n"
 
@@ -760,9 +729,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Skúste to neskôr\n"
 
-msgid "Who are you?\n"
-msgstr "Kto ste?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Pridávam používateľa %s do skupiny %s.\n"
@@ -771,9 +737,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: používateľ „%s“ neexistuje\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -809,113 +776,93 @@
 "  -r, --system                  vytvorí systémový účet\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: chyba pri pridávaní položky do súboru so skupinami\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s nie je platným názvom skupiny\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: súbor so skupinami sa nedá prepísať\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group ID '%s'\n"
+msgstr "%s: chybné pomenovanie skupiny „%s“\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: súbor s tieňovými skupinami sa nedá prepísať\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: súbor so skupinami sa nedá zamknúť\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: súbor so skupinami sa nedá otvoriť\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: súbor s tieňovými skupinami sa nedá zamknúť\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: súbor s tieňovými skupinami sa nedá otvoriť\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: prepínač -K vyžaduje argument typu MENO=HODNOTA\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 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"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "Člen už existuje\n"
 
-#, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: sa nedá vytvoriť skupina\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "Použitie: groupdel skupina\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: chyba pri odstraňovaní položky zo súboru so skupinami\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: adresár %s sa nedá premenovať na %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: chyba pri odstraňovaní položky zo súboru s tieňovými skupinami\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr ""
+"%s: nie je možné zmeniť primárnu skupinu používateľa „%s“ z %u na %u.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: primárna skupina používateľa sa nedá odstrániť\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: skupina %s neexistuje\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: skupina %s je NIS skupinou\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: skupina „%s“ je skupinou NIS.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s je hlavným NIS serverom\n"
 
-msgid "Member already exists\n"
-msgstr "Člen už existuje\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: používateľ %s je NIS používateľom\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Nebolo možné nájsť člena, ktorého chcete odstrániť\n"
+#, fuzzy, c-format
+#| msgid "%s: Out of memory. Cannot update the group database.\n"
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: Nedostatok pamäti. Nie je možné aktualizovať databázu skupín.\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
-"Použitie: groupmems -a používateľ | -d používateľ | -D | -l [-g skupina]\n"
 
-msgid "Only root can add members to different groups\n"
-msgstr "Iba root môže pridávať používateľov do rôznych skupín\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "Vyžaduje sa prístup pre skupinu\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Nie ste primárnym vlastníkom aktuálnej skupiny\n"
-
-#  c-format
-msgid "PAM authentication failed for\n"
-msgstr "zlyhalo overenie PAM\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Súbor so skupinami sa nedá zamknúť\n"
-
-msgid "Unable to open group file\n"
-msgstr "Súbor so skupinami sa nedá otvoriť\n"
-
-msgid "Cannot close group file\n"
-msgstr "Súbor so skupinami sa nedá zatvoriť\n"
-
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -939,44 +886,20 @@
 "  -p, --password PASSWORD       nové heslo bude šifrované\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s sa nenachádza v /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "%s: chybné pomenovanie skupiny „%s“\n"
 
 #, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: GID %u nie je jedinečný\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: skupina %s je NIS skupinou\n"
 
 #, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: meno %s nie je jedinečné\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: používateľ %s je neznámy\n"
 
 #, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: súbor passwd sa nedá prepísať\n"
-
-#, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: súbor s heslami sa nedá zamknúť\n"
-
-#, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: súbor s heslami sa nedá otvoriť\n"
-
-#, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-"%s: nie je možné zmeniť primárnu skupinu používateľa „%s“ z %u na %u, "
-"pretože nie je v súbore passwd.\n"
-
-#, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr ""
-"%s: nie je možné zmeniť primárnu skupinu používateľa „%s“ z %u na %u.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr ""
 "Použitie: %s [-r] [-s] [súbor_so_skupinami [súbor_s_tieňovými_skupinami]]\n"
@@ -989,18 +912,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s a -r nie sú zlučiteľné\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: súbor %s sa nedá zamknúť\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "chybná položka v súbore so skupinami"
 
@@ -1015,6 +926,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "chybné pomenovanie skupiny „%s“\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "chybné pomenovanie skupiny „%s“\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "skupina %s: používateľ %s neexistuje\n"
@@ -1027,18 +943,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "neexistuje zodpovedajúca položka skupiny v súbore %s\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "pridať skupinu „%s“ do %s ?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: položka %s súboru s tieňovými heslami sa nedá aktualizovať\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: položka skupiny %s sa nedá odstrániť\n"
-
 msgid "invalid shadow group file entry"
 msgstr "chybná položka v súbore s tieňovými skupinami"
 
@@ -1065,30 +974,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: bezo zmien\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: súbor s tieňovými skupinami sa nedá zamknúť\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Použitie: groupdel skupina\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: súbor s tieňovými skupinami sa nedá otvoriť\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Použitie: groupdel skupina\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: položka tieňovej skupiny %s sa nedá odstrániť\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: súbor %s sa nedá aktualizovať\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: súbor s tieňovými heslami sa nedá aktualizovať\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: súbor s heslami sa nedá aktualizovať\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: súbor s tieňovými heslami skupín sa nedá zmazať\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Použitie: id [-a]\n"
 
@@ -1119,6 +1019,10 @@
 "  -u, --user LOGIN      vypíše posledné prihlásenia používateľa uvedeného\n"
 "                        ako LOGIN\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Používateľ       Port     Z                Naposledy"
 
@@ -1129,14 +1033,14 @@
 msgstr "**Nebol nikdy prihlásený**"
 
 #, c-format
-msgid "Unknown user or range: %s\n"
-msgstr "Neznámy používateľ alebo rozsah: %s.\n"
-
-#, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: neočakávaný argument: %s\n"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Použitie: %s [-p] [meno]\n"
 
@@ -1233,6 +1137,11 @@
 "čas na prihlásenie uplynul\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Použitie: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Použitie: newgrp [-] [skupina]\n"
 
@@ -1246,14 +1155,11 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: chybné vetvenie: %s\n"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "neznámy UID: %u\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: používateľ „%s“ neexistuje\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "neznámy GID %lu\n"
-
 msgid "too many groups\n"
 msgstr "príliš mnoho skupín\n"
 
@@ -1271,63 +1177,21 @@
 "  -r, --system                  vytorí systémové účty\n"
 "%s\n"
 
-#, c-format
-msgid "%s: group ID `%s' is not valid\n"
-msgstr "%s: ID skupiny „%s“ nie je platn7\n"
-
-#, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "%s: chybné pomenovanie skupiny „%s“\n"
-
-#, c-format
-msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: skupina %s je tieňová skupina, ale neexistuje v /etc/group\n"
 
-#, c-format
-msgid ""
-"%s: group %s created, failure during the creation of the corresponding "
-"gshadow group\n"
-msgstr ""
-"%s: skupina %s bola vytvorená, zlyhalo vytvorenie zodpovedajúcej skupiny "
-"gshadow\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: chybné používateľské meno „%s“\n"
 
 #, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: ID používateľa „%s“ nie je platný\n"
-
-#, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: používateľ „%s“ neexistuje\n"
-
-#, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: chybné používateľské meno „%s“\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: súbor /etc/passwd sa nedá zamknúť\n"
-
-#, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: súbor /etc/passwd sa nedá zamknúť\n"
-
-#, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: súbor /etc/group sa nedá zamknúť\n"
-
-#, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: súbor /etc/gshadow sa nedá zamknúť\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1344,9 +1208,10 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: riadok %d: nedá sa vytvoriť skupina\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: riadok %d: nedá sa nájsť používateľ %s\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: používateľ „%s“ neexistuje\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1364,6 +1229,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: riadok %d: položka sa nedá aktualizovať\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1376,15 +1269,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1455,14 +1348,14 @@
 msgid "The password for %s cannot be changed yet.\n"
 msgstr "Heslo pre %s sa zatiaľ nedá zmeniť.\n"
 
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: nedostatok pamäti\n"
-
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 "%s: odomknutie používateľa by malo za následok účet bez hesla.\n"
 "Tento účet by ste mali odomknúť nastavením hesla pomocou usermod -p.\n"
@@ -1508,16 +1401,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "chybné používateľské meno „%s“\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "chybné používateľské meno „%s“\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "používateľ %s: skupina %u neexistuje\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "používateľ %s: adresár %s neexistuje\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "používateľ %s: program %s neexistuje\n"
 
 #, c-format
@@ -1528,10 +1429,6 @@
 msgid "add user '%s' in %s? "
 msgstr "pridať používateľa „%s“ do %s? "
 
-#, c-format
-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"
-
 msgid "invalid shadow password file entry"
 msgstr "chybná položka v súbore s tieňovými heslami"
 
@@ -1542,34 +1439,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "používateľ %s: posledná zmena hesla v budúcnosti\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: súbor s heslami sa nedá zamknúť\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: súbor %s sa nedá otvoriť\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: súbor s heslami sa nedá otvoriť\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Použitie: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: položka súboru s heslami pre používateľe %s sa nedá odstrániť\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: súbor s tieňovými heslami sa nedá aktualizovať\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Použitie: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: súbor s heslami sa nedá aktualizovať\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: položka pre používateľa %s sa nedá aktualizovať\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: nemôžete zmazať súbor s tieňovými heslami\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Z tohto účtu je prístup k su ZAKÁZANÝ.\n"
 
@@ -1636,6 +1524,17 @@
 "%s: %s\n"
 "(Ignorujem)\n"
 
+#  c-format
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: PAM autentifikácia zlyhala\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Nie ste oprávnení používať su %s\n"
+
 msgid "No shell\n"
 msgstr "Žiadny shell\n"
 
@@ -1661,14 +1560,6 @@
 msgstr "Vstupujem do režimu údržby systému"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: neznámy GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: neznáma skupina %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: nedá sa vytvoriť nový súbor s predvolenými hodnotami\n"
 
@@ -1688,6 +1579,46 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: bolo zadaných príliš veľa skupín (max %d).\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: useradd [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
+#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#| "                                home directory\n"
+#| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#| "account\n"
+#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#| "  -D, --defaults                print or save modified default useradd\n"
+#| "                                configuration\n"
+#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#| "EXPIRE_DATE\n"
+#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#| "                                user account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#| "  -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"
+#| "  -N, --no-user-group           do not create a group with the same name "
+#| "as\n"
+#| "                                the user\n"
+#| "  -o, --non-unique              allow create user with duplicate\n"
+#| "                                (non-unique) UID\n"
+#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#| "                                account\n"
+#| "  -r, --system                  create a system account\n"
+#| "  -s, --shell SHELL             the login shell for the new user account\n"
+#| "  -u, --uid UID                 force use the UID for the new user "
+#| "account\n"
+#| "  -U, --user-group              create a group with the same name as the "
+#| "user\n"
+#| "\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1708,10 +1639,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1761,15 +1694,6 @@
 "\n"
 
 #, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: Nedostatok pamäti. Nie je možné aktualizovať databázu skupín.\n"
-
-#, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr ""
-"%s: Nedostatok pamäti. Nie je možné aktualizovať databázu tieňových skupín.\n"
-
-#, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: chybný základný adresár „%s“\n"
 
@@ -1806,50 +1730,14 @@
 msgstr "%s: voľby %s a %s sú v konflikte\n"
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: chybné používateľské meno „%s“\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: súbor s heslami sa nedá prepísať\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: súbor s tieňovými heslami sa nedá prepísať\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: súbor s tieňovými heslami sa nedá zamknúť\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: súbor s tieňovými heslami sa nedá otvoriť\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: chyba pri zamykaní súboru so skupinami\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: chyba pri otváraní súboru so skupinami\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: chyba pri zamykaní súboru s tieňovými heslami\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: chyba pri otváraní súboru s tieňovými heslami\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: chyba pri vytváraní novej položky v súbore s heslami\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: chyba pri vytváraní novej položky v súbore s tieňovými heslami\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: nedá sa vytvoriť adresár %s\n"
 
@@ -1865,8 +1753,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Nastavujú sa prístupové práva mailbox súboru"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: používateľ %s už existuje\n"
 
 #, c-format
@@ -1880,11 +1769,16 @@
 msgid "%s: can't create user\n"
 msgstr "%s: nie je možné vytvoriť používateľa\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u nie je jedinečný\n"
 
 #, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: sa nedá vytvoriť skupina\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1892,10 +1786,6 @@
 "%s: upozornenie: domovský adresár už existuje.\n"
 "Zo skel adresára sa tam neskopíruje žiaden súbor.\n"
 
-#, c-format
-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"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1915,53 +1805,28 @@
 "  -r, --remove                  odstráni domovský adresár a súbory s poštou\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: položka súboru so skupinami sa nedá aktualizovať\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: skupina %s sa nedá odstrániť, pretože je primárnou skupinou iného "
 "používateľa.\n"
 
 #, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: chyba pri aktualizácii záznamu súboru so skupinami\n"
-
-#, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: súbor so skupinami sa nedá otvoriť\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: súbor s tieňovými skupinami sa nedá otvoriť\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: chyba pri odstraňovaní položky zo súboru s heslami\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: chyba pri odstraňovaní položky zo súboru s tieňovými heslami\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: používateľ %s je práve prihlásený\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: varovanie: nemôžem zmazať "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: vlastníkom %s nie je %s, nemažem ho\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: varovanie: nemôžem zmazať "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: používateľ %s neexistuje\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: používateľ %s je NIS používateľom\n"
 
@@ -2030,10 +1895,22 @@
 "  -U, --unlock                  odblokuje používateľský účet\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: chyba pri pridávaní položky do súboru so skupinami\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+"%s: odomknutie používateľa by malo za následok účet bez hesla.\n"
+"Tento účet by ste mali odomknúť nastavením hesla pomocou usermod -p.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: používateľ %s už existuje\n"
+
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: žiadne prepínače\n"
@@ -2046,23 +1923,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr "%s: prepínače -L, -p a -U sa navzájom vylučujú\n"
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s uid %lu nie je jedinečný\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "Člen už existuje\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: chyba pri zmene položky v súbore s heslami\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: chyba pri odstraňovaní položky zo súboru s heslami\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: chyba pri odstraňovaní položky zo súboru s tieňovými heslami\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: adresár %s už existuje\n"
 
@@ -2084,6 +1950,14 @@
 msgstr "%s: adresár %s sa nedá premenovať na %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: varovanie: vlastníkom %s nie je %s\n"
 
@@ -2093,11 +1967,15 @@
 msgid "failed to rename mailbox"
 msgstr "chyba pri premenovaní schránky"
 
-#, c-format
+#, fuzzy, 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"
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 "Zmenili ste %s.\n"
 "Kvôli zachovaniu konzistentnosti budete možno musieť zmeniť %s.\n"
@@ -2124,10 +2002,16 @@
 "  -s, --shadow                  upraví databázu shadow alebo gshadow\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: zlyhalo odstránenie právomocí (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s je bez zmien\n"
@@ -2142,6 +2026,425 @@
 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: can't lock password file\n"
+#~ msgstr "%s: súbor s heslami sa nedá zamknúť\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: súbor s heslami sa nedá otvoriť\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: súbor s tieňovými heslami sa nedá zamknúť\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: súbor s tieňovými heslami sa nedá otvoriť\n"
+
+#~ 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: can't rewrite password file\n"
+#~ msgstr "%s: súbor s heslami sa nedá prepísať\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: súbor s heslami sa nedá aktualizovaťt\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: súbor s tieňovými heslami sa nedá aktualizovať\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tCelé meno: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tČíslo miestnosti: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tTelefón do zamestnania: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tTelefón domov: %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"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Súbor s heslami sa nedá otvoriť.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: súbor so skupinami sa nedá zamknúť\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: súbor so skupinami sa nedá otvoriť\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: súbor s tieňovými heslami skupín sa nedá zamknúť\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: súbor s tieňovými heslami sa nedá otvoriť\n"
+
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: chyba pri aktualizácii súboru gshadow\n"
+
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: chyba pri aktualizácii súboru so skupinami\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: riadok %d: skupina %s je neznáma\n"
+
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: riadok %d: sa nedá aktualizovať položka súboru so skupinami\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: súbor s tieňovými heslami sa nedá zamknúť\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: chyba pri aktualizácii súboru s tieňovými heslami\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: chyba pri aktualizácii súboru s heslami\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: riadok %d: používateľ %s je neznámy\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: riadok %d: záznam hesla sa nedá aktualizovať\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: neznámy používateľ\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Používateľ %s je neznámy.\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Použitie: %s [-r|-R] skupina\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a používateľ] skupina\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d používateľ] skupina\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A používateľ,...] [-M používateľ,...] skupina\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M používateľ,...] skupina\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: nedá sa získať zámok\n"
+
+#~ 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 "%s: can't open file\n"
+#~ msgstr "%s: nedá sa otvoriť súbor\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: súbor sa nedá prepísať\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: súbor s tieňovými heslami sa nedá prepísať\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: súbor sa nedá odomknúť\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: položka sa nedá aktualizovať\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: položka súboru s tieňovými heslami sa nedá aktualizovať\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "skupina %s je neznáma\n"
+
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: nedá sa zatvoriť súbor\n"
+
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: súbor s tieňovými heslami sa nedá zatvoriť\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Kto ste?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: člen %s je neznámy\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: chyba pri pridávaní položky do súboru so skupinami\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: súbor so skupinami sa nedá prepísať\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: súbor s tieňovými skupinami sa nedá prepísať\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: súbor so skupinami sa nedá zamknúť\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: súbor so skupinami sa nedá otvoriť\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: súbor s tieňovými skupinami sa nedá zamknúť\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: súbor s tieňovými skupinami sa nedá otvoriť\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u nie je jedinečný\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: chyba pri odstraňovaní položky zo súboru so skupinami\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr ""
+#~ "%s: chyba pri odstraňovaní položky zo súboru s tieňovými skupinami\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: primárna skupina používateľa sa nedá odstrániť\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Nebolo možné nájsť člena, ktorého chcete odstrániť\n"
+
+#~ msgid ""
+#~ "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+#~ msgstr ""
+#~ "Použitie: groupmems -a používateľ | -d používateľ | -D | -l [-g skupina]\n"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "Iba root môže pridávať používateľov do rôznych skupín\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "Vyžaduje sa prístup pre skupinu\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Nie ste primárnym vlastníkom aktuálnej skupiny\n"
+
+#  c-format
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "zlyhalo overenie PAM\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Súbor so skupinami sa nedá zamknúť\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Súbor so skupinami sa nedá otvoriť\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Súbor so skupinami sa nedá zatvoriť\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s sa nenachádza v /etc/group\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: GID %u nie je jedinečný\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: meno %s nie je jedinečné\n"
+
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: súbor passwd sa nedá prepísať\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: súbor s heslami sa nedá zamknúť\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: súbor s heslami sa nedá otvoriť\n"
+
+#~ msgid ""
+#~ "%s: cannot change the primary group of user '%s' from %u to %u, since it "
+#~ "is not in the passwd file.\n"
+#~ msgstr ""
+#~ "%s: nie je možné zmeniť primárnu skupinu používateľa „%s“ z %u na %u, "
+#~ "pretože nie je v súbore passwd.\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: súbor %s sa nedá zamknúť\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: položka %s súboru s tieňovými heslami sa nedá aktualizovať\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: položka skupiny %s sa nedá odstrániť\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: súbor s tieňovými skupinami sa nedá zamknúť\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: súbor s tieňovými skupinami sa nedá otvoriť\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: položka tieňovej skupiny %s sa nedá odstrániť\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: súbor s tieňovými heslami sa nedá aktualizovať\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: súbor s heslami sa nedá aktualizovať\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: súbor s tieňovými heslami skupín sa nedá zmazať\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "neznámy UID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "neznámy GID %lu\n"
+
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: ID skupiny „%s“ nie je platn7\n"
+
+#~ msgid ""
+#~ "%s: group %s created, failure during the creation of the corresponding "
+#~ "gshadow group\n"
+#~ msgstr ""
+#~ "%s: skupina %s bola vytvorená, zlyhalo vytvorenie zodpovedajúcej skupiny "
+#~ "gshadow\n"
+
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: ID používateľa „%s“ nie je platný\n"
+
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: chybné používateľské meno „%s“\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: súbor /etc/passwd sa nedá zamknúť\n"
+
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: súbor /etc/passwd sa nedá zamknúť\n"
+
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: súbor /etc/group sa nedá zamknúť\n"
+
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: súbor /etc/gshadow sa nedá zamknúť\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: súbory sa nedajú otvoriť\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: chyba pri aktualizácii súborov\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: riadok %d: nedá sa nájsť používateľ %s\n"
+
+#~ 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"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: súbor s heslami sa nedá zamknúť\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: súbor s heslami sa nedá otvoriť\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: položka súboru s heslami pre používateľe %s sa nedá odstrániť\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: súbor s tieňovými heslami sa nedá aktualizovať\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: súbor s heslami sa nedá aktualizovať\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: položka pre používateľa %s sa nedá aktualizovať\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: nemôžete zmazať súbor s tieňovými heslami\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: neznámy GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: neznáma skupina %s\n"
+
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr ""
+#~ "%s: Nedostatok pamäti. Nie je možné aktualizovať databázu tieňových "
+#~ "skupín.\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: súbor s heslami sa nedá prepísať\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: súbor s tieňovými heslami sa nedá prepísať\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: súbor s tieňovými heslami sa nedá zamknúť\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: súbor s tieňovými heslami sa nedá otvoriť\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: chyba pri zamykaní súboru so skupinami\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: chyba pri otváraní súboru so skupinami\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: chyba pri zamykaní súboru s tieňovými heslami\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: chyba pri otváraní súboru s tieňovými heslami\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: chyba pri vytváraní novej položky v súbore s heslami\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr ""
+#~ "%s: chyba pri vytváraní novej položky v súbore s tieňovými heslami\n"
+
+#~ 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"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: položka súboru so skupinami sa nedá aktualizovať\n"
+
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: chyba pri aktualizácii záznamu súboru so skupinami\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: súbor so skupinami sa nedá otvoriť\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: súbor s tieňovými skupinami sa nedá otvoriť\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: chyba pri odstraňovaní položky zo súboru s heslami\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: chyba pri odstraňovaní položky zo súboru s tieňovými heslami\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: používateľ %s neexistuje\n"
+
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: chyba pri pridávaní položky do súboru so skupinami\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s uid %lu nie je jedinečný\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: chyba pri zmene položky v súbore s heslami\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: chyba pri odstraňovaní položky zo súboru s heslami\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: chyba pri odstraňovaní položky zo súboru s tieňovými heslami\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: nedá sa vytvoriť jedinečný GID\n"
 
@@ -2151,18 +2454,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " na '%.100s'"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: súbory sa nedajú zamknúť, skúste to neskôr znova\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: riadok %d: nedá sa vytvoriť UID\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/sq.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.3\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -54,6 +54,9 @@
 msgid "  Choose a new password."
 msgstr "   Zgjidh një fjalëkalim të ri."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr ""
@@ -67,9 +70,13 @@
 msgstr "Fjalëkalimi yt ka skaduar."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
 msgstr ""
 
+#, c-format
+msgid "Unable to change owner or mode of tty stdin: %s"
+msgstr ""
+
 msgid "Environment overflow\n"
 msgstr ""
 
@@ -87,10 +94,12 @@
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, c-format
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr ""
 
-msgid "Can't get unique GID (no more available GIDs)\n"
+#, c-format
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr ""
 
 msgid "Too many logins.\n"
@@ -181,9 +190,16 @@
 msgstr ""
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr ""
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr ""
 
+msgid "No"
+msgstr ""
+
 msgid "Password: "
 msgstr ""
 
@@ -191,6 +207,10 @@
 msgid "%s's Password: "
 msgstr ""
 
+#, c-format
+msgid "%s: failed to unlock %s\n"
+msgstr ""
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -270,42 +290,30 @@
 msgstr ""
 
 #, c-format
-msgid "%s: PAM authentication failed\n"
+msgid "%s: Cannot determine your user name.\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock password file\n"
+msgid "%s: PAM authentication failed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't open password file\n"
+msgid "%s: cannot lock %s; try again later.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: cannot open %s\n"
+msgstr "Kujdes: grup i panjohur %s\n"
 
 #, c-format
-msgid "%s: can't open shadow password file\n"
+msgid "%s: failure while writing changes to %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr ""
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr ""
 
@@ -314,7 +322,7 @@
 msgstr ""
 
 #, c-format
-msgid "%s: unknown user %s\n"
+msgid "%s: user '%s' does not exist in %s\n"
 msgstr ""
 
 #, c-format
@@ -339,56 +347,25 @@
 msgstr ""
 
 #, c-format
-msgid "\tFull Name: %s\n"
+msgid "\t%s: %s\n"
 msgstr ""
 
 msgid "Room Number"
 msgstr ""
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr ""
-
 msgid "Work Phone"
 msgstr ""
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr ""
-
 msgid "Home Phone"
 msgstr ""
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr ""
-
 msgid "Other"
 msgstr ""
 
 msgid "Cannot change ID to root.\n"
 msgstr ""
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr ""
-
-msgid "Cannot open the password file.\n"
-msgstr ""
-
 #, c-format
-msgid "%s: %s not found in /etc/passwd\n"
-msgstr ""
-
-msgid "Error updating the password entry.\n"
-msgstr ""
-
-msgid "Cannot commit password file changes.\n"
-msgstr ""
-
-msgid "Cannot unlock the password file.\n"
-msgstr ""
-
-#, c-format
 msgid "%s: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -421,7 +398,7 @@
 msgstr ""
 
 #, c-format
-msgid "%s: Cannot determine your user name.\n"
+msgid "%s: user '%s' does not exist\n"
 msgstr ""
 
 #, c-format
@@ -463,7 +440,7 @@
 msgstr ""
 
 #, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr ""
 
 #, c-format
@@ -475,30 +452,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-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 ""
 
@@ -507,11 +460,11 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: line %d: unknown group %s\n"
+msgid "%s: line %d: group '%s' does not exist\n"
 msgstr "Kujdes: grup i panjohur %s\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
 msgstr "Kujdes: grup i panjohur %s\n"
 
 #, c-format
@@ -519,25 +472,9 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock shadow file\n"
+msgid "%s: line %d: user '%s' does not exist\n"
 msgstr ""
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: line %d: unknown user %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: line %d: cannot update password entry\n"
-msgstr ""
-
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
@@ -551,7 +488,7 @@
 msgstr ""
 
 #, c-format
-msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr ""
 
 #, c-format
@@ -563,23 +500,19 @@
 msgstr ""
 
 #, c-format
-msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr ""
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr ""
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr ""
-
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -592,90 +525,81 @@
 "\n"
 msgstr ""
 
-msgid "Login       Failures Maximum Latest                   On\n"
-msgstr ""
-
 #, c-format
-msgid " [%lds left]"
+msgid "faillog: Failed to get the entry for UID %d\n"
 msgstr ""
 
-#, c-format
-msgid " [%lds lock]"
+msgid "Login       Failures Maximum Latest                   On\n"
 msgstr ""
 
 #, c-format
-msgid "Unknown User: %s\n"
+msgid " [%lus left]"
 msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
+msgid " [%lds lock]"
 msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
 msgstr ""
 
 #, c-format
-msgid "       %s [-d user] group\n"
+msgid "faillog: Failed to set max for UID %d\n"
 msgstr ""
 
 #, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
 msgstr ""
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
+msgid "lastlog: Unknown user or range: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
+msgid "faillog: Cannot open %s: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't get lock\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't get shadow lock\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't open file\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't re-write file\n"
+msgid "The options cannot be combined.\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't re-write shadow file\n"
+msgid "%s: shadow group passwords required for -A\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't unlock file\n"
+msgid "%s: group '%s' does not exist in %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't update entry\n"
+msgid "%s: failure while closing read-only %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't update shadow entry\n"
-msgstr ""
-
-#, c-format
-msgid "unknown group: %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't close file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't close shadow file\n"
-msgstr ""
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr ""
 
@@ -692,9 +616,6 @@
 msgid "%s: Try again later\n"
 msgstr ""
 
-msgid "Who are you?\n"
-msgstr ""
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr ""
@@ -704,7 +625,7 @@
 msgstr ""
 
 #, c-format
-msgid "%s: unknown member %s\n"
+msgid "%s: user '%s' is not a member of '%s'\n"
 msgstr ""
 
 #, c-format
@@ -728,110 +649,81 @@
 msgstr ""
 
 #, c-format
-msgid "%s: error adding new group entry\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr ""
 
-#, c-format
-msgid "%s: %s is not a valid group name\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "Kujdes: grup i panjohur %s\n"
 
 #, c-format
-msgid "%s: cannot rewrite group file\n"
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
+msgid "%s: group '%s' already exists\n"
 msgstr ""
 
 #, c-format
-msgid "%s: unable to lock group file\n"
+msgid "%s: GID '%lu' already exists\n"
 msgstr ""
 
-#, c-format
-msgid "%s: unable to open group file\n"
+msgid "Usage: groupdel group\n"
 msgstr ""
 
 #, c-format
-msgid "%s: unable to lock shadow group file\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: unable to open shadow group file\n"
+msgid "%s: cannot remove the primary group of user '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "%s: -K requires KEY=VALUE\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr ""
 
 #, c-format
-msgid "%s: group %s exists\n"
+msgid "%s: group '%s' is a NIS group\n"
 msgstr ""
 
 #, c-format
-msgid "%s: GID %u is not unique\n"
+msgid "%s: %s is the NIS master\n"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "Kujdes: grup i panjohur %s\n"
-
-msgid "Usage: groupdel group\n"
-msgstr ""
-
 #, c-format
-msgid "%s: error removing group entry\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "%s: error removing shadow group entry\n"
+msgid "%s: Out of memory. Cannot update %s.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
 
 #, c-format
-msgid "%s: group %s does not exist\n"
+msgid "%s: your groupname does not match your username\n"
 msgstr ""
 
 #, c-format
-msgid "%s: group %s is a NIS group\n"
+msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-#, c-format
-msgid "%s: %s is the NIS master\n"
-msgstr ""
-
-msgid "Member already exists\n"
-msgstr ""
-
-msgid "Member to remove could not be found\n"
-msgstr ""
-
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
-msgstr ""
-
-msgid "Only root can add members to different groups\n"
-msgstr ""
-
-msgid "Group access is required\n"
-msgstr ""
-
-msgid "Not primary owner of current group\n"
-msgstr ""
-
-msgid "PAM authentication failed for\n"
-msgstr ""
-
-msgid "Unable to lock group file\n"
-msgstr ""
-
-msgid "Unable to open group file\n"
-msgstr ""
-
-msgid "Cannot close group file\n"
-msgstr ""
-
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -846,40 +738,18 @@
 msgstr ""
 
 #, c-format
-msgid "%s: %s not found in /etc/group\n"
+msgid "%s: invalid group name '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "%s: %u is not a unique GID\n"
+msgid "%s: group %s is a NIS group\n"
 msgstr ""
 
 #, c-format
-msgid "%s: %s is not a unique name\n"
+msgid "%s: unknown user %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: unable to lock password file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: unable to open password file\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr ""
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr ""
 
@@ -891,18 +761,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr ""
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: cannot update file %s\n"
-msgstr ""
-
 msgid "invalid group file entry"
 msgstr ""
 
@@ -919,6 +777,10 @@
 msgstr ""
 
 #, c-format
+msgid "invalid group ID '%lu'\n"
+msgstr ""
+
+#, c-format
 msgid "group %s: no user %s\n"
 msgstr ""
 
@@ -931,17 +793,9 @@
 msgstr ""
 
 #, c-format
-msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr ""
-
 msgid "invalid shadow group file entry"
 msgstr ""
 
@@ -968,30 +822,16 @@
 msgid "%s: no changes\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
+msgid "Usage: grpconv\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
+msgid "Usage: grpunconv\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: cannot delete %s\n"
+msgstr "Kujdes: grup i panjohur %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr ""
-
 msgid "Usage: id [-a]\n"
 msgstr ""
 
@@ -1013,6 +853,10 @@
 "\n"
 msgstr ""
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr ""
 
@@ -1023,11 +867,11 @@
 msgstr ""
 
 #, c-format
-msgid "Unknown user or range: %s\n"
+msgid "lastlog: unexpected argument: %s\n"
 msgstr ""
 
 #, c-format
-msgid "lastlog: unexpected argument: %s\n"
+msgid "lastlog: Cannot get the size of %s: %s\n"
 msgstr ""
 
 #, c-format
@@ -1117,6 +961,9 @@
 "\n"
 msgstr ""
 
+msgid "Usage: logoutd\n"
+msgstr ""
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr ""
 
@@ -1131,12 +978,8 @@
 msgid "%s: failure forking: %s\n"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "unknown UID: %u\n"
-msgstr "Kujdes: grup i panjohur %s\n"
-
 #, c-format
-msgid "unknown GID: %lu\n"
+msgid "%s: GID '%lu' does not exist\n"
 msgstr ""
 
 msgid "too many groups\n"
@@ -1152,60 +995,18 @@
 msgstr ""
 
 #, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr ""
 
 #, c-format
-msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid user ID '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr ""
 
 #, c-format
-msgid ""
-"%s: group %s created, failure during the creation of the corresponding "
-"gshadow group\n"
-msgstr ""
-
-#, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr ""
-
-#, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr ""
-
-#, c-format
-msgid "%s: invalid user name `%s'\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't open files\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error updating files\n"
-msgstr ""
-
-#, c-format
 msgid "%s: line %d: invalid line\n"
 msgstr ""
 
@@ -1222,7 +1023,7 @@
 msgstr "Kujdes: grup i panjohur %s\n"
 
 #, c-format
-msgid "%s: line %d: cannot find user %s\n"
+msgid "%s: line %d: user '%s' does not exist in %s\n"
 msgstr ""
 
 #, c-format
@@ -1253,15 +1054,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1304,13 +1105,10 @@
 msgstr ""
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr ""
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1357,15 +1155,19 @@
 msgstr ""
 
 #, c-format
-msgid "user %s: no group %u\n"
+msgid "invalid user ID '%lu'\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "user '%s': no group %lu\n"
+msgstr "Kujdes: grup i panjohur %s\n"
+
 #, c-format
-msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr ""
 
 #, c-format
-msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr ""
 
 #, c-format
@@ -1376,10 +1178,6 @@
 msgid "add user '%s' in %s? "
 msgstr ""
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr ""
-
 msgid "invalid shadow password file entry"
 msgstr ""
 
@@ -1391,33 +1189,19 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock passwd file\n"
+msgid "%s: cannot sort entries in %s\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't open passwd file\n"
+msgid "Usage: pwconv\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
+msgid "Usage: pwunconv\n"
 msgstr ""
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr ""
-
 msgid "Access to su to that account DENIED.\n"
 msgstr ""
 
@@ -1470,6 +1254,14 @@
 "(Ignored)\n"
 msgstr ""
 
+#, c-format
+msgid "%s: Authentication failure\n"
+msgstr ""
+
+#, c-format
+msgid "%s: You are not authorized to su at that time\n"
+msgstr ""
+
 msgid "No shell\n"
 msgstr ""
 
@@ -1492,15 +1284,7 @@
 msgid "Entering System Maintenance Mode"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "Kujdes: grup i panjohur %s\n"
-
 #, c-format
-msgid "%s: unknown group %s\n"
-msgstr ""
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr ""
 
@@ -1540,10 +1324,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1559,14 +1345,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr ""
-
-#, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr ""
-
-#, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr ""
 
@@ -1603,50 +1381,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr ""
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr ""
 
@@ -1661,7 +1403,7 @@
 msgstr ""
 
 #, c-format
-msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr ""
 
 #, c-format
@@ -1674,19 +1416,19 @@
 msgstr ""
 
 #, c-format
-msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "Kujdes: grup i panjohur %s\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr ""
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1699,50 +1441,22 @@
 msgstr ""
 
 #, c-format
-msgid "%s: error updating group entry\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 
 #, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: user %s is currently logged in\n"
 msgstr ""
 
-#, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: warning: can't remove %s: %s"
+msgstr "Kujdes: grup i panjohur %s\n"
 
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr ""
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr ""
-
-#, c-format
-msgid "%s: user %s is currently logged in\n"
-msgstr ""
-
-#, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr ""
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr ""
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr ""
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr ""
 
@@ -1782,10 +1496,16 @@
 msgstr ""
 
 #, c-format
-msgid "%s: error adding new shadow group entry\n"
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
 msgstr ""
 
 #, c-format
+msgid "%s: user '%s' already exists in %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: no flags given\n"
 msgstr ""
 
@@ -1798,42 +1518,38 @@
 msgstr ""
 
 #, c-format
-msgid "%s: uid %lu is not unique\n"
+msgid "%s: UID '%lu' already exists\n"
 msgstr ""
 
 #, c-format
-msgid "%s: error changing password entry\n"
+msgid "%s: directory %s exists\n"
 msgstr ""
 
 #, c-format
-msgid "%s: error removing password entry\n"
+msgid "%s: can't create %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: error removing shadow password entry\n"
+msgid "%s: can't chown %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: directory %s exists\n"
+msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
 #, c-format
-msgid "%s: can't create %s\n"
+msgid "%s: cannot rename directory %s to %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: can't chown %s\n"
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: warning: failed to completely remove old home directory %s"
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
 msgstr ""
 
 #, c-format
-msgid "%s: cannot rename directory %s to %s\n"
-msgstr ""
-
-#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr ""
 
@@ -1847,7 +1563,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -1863,11 +1579,13 @@
 msgstr ""
 
 #, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+msgid "%s: failed to remove %s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: %s is unchanged\n"
+msgstr "Fjalëkalimi yt ka skaduar."
+
 msgid "Couldn't lock file"
 msgstr ""
 
@@ -1877,3 +1595,11 @@
 #, c-format
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr ""
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "Kujdes: grup i panjohur %s\n"
+
+#, fuzzy
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "Kujdes: grup i panjohur %s\n"

Modified: upstream/trunk/po/sv.po
===================================================================
--- upstream/trunk/po/sv.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/sv.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.1.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\n"
 "PO-Revision-Date: 2008-03-26 12:23+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -56,6 +56,9 @@
 msgid "  Choose a new password."
 msgstr "  Välj ett nytt lösenord."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Ditt lösenord upphör att gälla om %ld dagar.\n"
@@ -67,7 +70,12 @@
 msgstr "Ditt lösenord upphör att gälla idag."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Kunde inte ändra tty %s"
 
 msgid "Environment overflow\n"
@@ -91,12 +99,16 @@
 "%d misslyckanden sedan förra inloggningen\n"
 "Senast var %s den %s.\n"
 
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+#| msgid "Can't get unique GID (no more available GIDs)\n"
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "Kan inte få tag i unikt GID (inga fler tillgängliga GID)\n"
+
+#, fuzzy, c-format
+#| msgid "Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "Kan inte få tag i unikt UID (inga fler tillgängliga UID)\n"
 
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "Kan inte få tag i unikt GID (inga fler tillgängliga GID)\n"
-
 msgid "Too many logins.\n"
 msgstr "För många inloggningsförsök.\n"
 
@@ -188,9 +200,18 @@
 msgstr "Kunde inte fastställa ditt tty-namn."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: slut på minne\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) misslyckades\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "Nej\n"
+
 msgid "Password: "
 msgstr "Lösenord: "
 
@@ -198,6 +219,11 @@
 msgid "%s's Password: "
 msgstr "%s lösenord: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: fälten för långa\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -295,42 +321,34 @@
 msgstr "%s: Åtkomst nekad.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Kan inte fastställa ditt användarnamn.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 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"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: kan inte låsa filer, försök igen senare\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: kan inte öppna lösenordsfilen\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: kan inte öppna filen %s\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: kan inte låsa skugglösenordsfilen\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: fel vid processgrening: %s\n"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: kan inte öppna skugglösenordsfilen\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: misslyckades med att kasta rättigheterna (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: kan inte skriva om skugglösenordsfilen\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: kan inte skriva om lösenordsfilen\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: kan inte uppdatera lösenordsfilen\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: kan inte uppdatera skugglösenordsfilen\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: skugglösenordsfilen finns inte\n"
 
@@ -338,9 +356,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: användaren \"%s\" finns inte\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -366,57 +385,27 @@
 msgid "Full Name"
 msgstr "Helt namn"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tHelt namn: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Rumsnummer"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tRumsnummer: %s\n"
-
 msgid "Work Phone"
 msgstr "Telefonnummer (arbete)"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tTelefonnummer (arbete): %s\n"
-
 msgid "Home Phone"
 msgstr "Telefonnummer (hem)"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tTelefonnummer (hem): %s\n"
-
 msgid "Other"
 msgstr "Övrigt"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Kan inte ändra ID till root.\n"
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Kan inte låsa lösenordsfilen, försök igen senare.\n"
-
-msgid "Cannot open the password file.\n"
-msgstr "Kan inte öppna lösenordsfilen.\n"
-
 #, c-format
-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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -449,9 +438,10 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: \"%s\" innehåller ogiltiga tecken\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Kan inte fastställa ditt användarnamn.\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: användaren \"%s\" finns inte\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -502,8 +492,9 @@
 msgid "%s: invalid numeric argument '%s'\n"
 msgstr "%s: ogiltigt numeriskt argument \"%s\"\n"
 
-#, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+#, fuzzy, c-format
+#| msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: flaggan %s tillåts ENDAST med flaggan %s\n"
 
 #, c-format
@@ -515,30 +506,6 @@
 msgstr "%s: krypteringsmetoden stöds inte: %s\n"
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: kan inte låsa gruppfilen\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: kan inte öppna gruppfilen\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: kan inte låsa gshadow-filen\n"
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-msgstr "%s: kan inte öppna skuggfilen\n"
-
-#, c-format
-msgid "%s: error updating gshadow file\n"
-msgstr "%s: fel vid uppdatering av gshadow-filenl\n"
-
-#, c-format
-msgid "%s: error updating group file\n"
-msgstr "%s: fel vid uppdatering av group-filen\n"
-
-#, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: rad %d: raden för lång\n"
 
@@ -546,38 +513,25 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: rad %d: saknar nytt lösenord\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: rad %d: okänd grupp %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: gruppen %s finns inte\n"
 
-#, c-format
-msgid "%s: line %d: cannot update group entry\n"
-msgstr "%s: rad %d: kan inte uppdatera group-post\n"
+#, fuzzy, c-format
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: användaren \"%s\" finns inte\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: fel vid uppdatering av skuggfil\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: fel vid uppdatering av lösenordsfil\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"
@@ -596,8 +550,9 @@
 msgid "Login Shell"
 msgstr "Inloggningsskal"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Du får inte ändra skalet för %s.\n"
 
 #, c-format
@@ -608,24 +563,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Ogiltig post: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s är ett ogiltigt skal.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Användning: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: okänd användare\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -654,11 +625,16 @@
 "                        för användaren KONTO\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Användare       Fel      Max Senaste                  På\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds kvar]"
 
 #, c-format
@@ -666,78 +642,71 @@
 msgstr " [%lds låsta]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Okänd användare: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Användning: %s [-r|-R] grupp\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a användare] grupp\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d användare] grupp\n"
+#, fuzzy, c-format
+#| msgid "Unknown user or range: %s\n"
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Okänd användare eller intervall: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A användare,...] [-M användare,...] grupp\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: kan inte öppna filen %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M användare,...] grupp\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: lösenord för skuggrupper krävs för -A\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: kan inte hämta lås\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: kan inte få skugglås\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Lösenordet för %s kan inte ändras.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: kan inte öppna fil\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: lösenord för skuggrupper krävs för -A\n"
 
-#, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: kan inte skriva om fil\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: gruppen %s finns inte\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: kan inte skriva om skuggfil\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: fel vid processgrening: %s\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"
-
-#, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: kan inte stänga fil\n"
-
-#, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: kan inte stänga skuggfilen\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Ändrar lösenordet för gruppen %s\n"
 
@@ -754,9 +723,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Försök igen senare\n"
 
-msgid "Who are you?\n"
-msgstr "Vem är du?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Lägger till användaren %s till gruppen %s\n"
@@ -765,9 +731,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: användaren \"%s\" finns inte\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -803,113 +770,93 @@
 "  -r, --system                  skapa ett systemkonto\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: fel vid tilläggning av ny grupp-post\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s är inte ett giltigt gruppnamn\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: kan inte skriva om gruppfilen\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group ID '%s'\n"
+msgstr "%s: ogiltigt gruppnamn \"%s\"\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: kan inte skriva om skuggruppfilen\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: kunde inte låsa gruppfilen\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: kunde inte öppna gruppfilen\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: kunde inte låsa skuggruppfilen\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: kunde inte öppna skuggruppfilen\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K kräver KEY=VÄRDE\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 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"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "Medlemmen finns redan\n"
 
-#, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: kan inte skapa grupp\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "Användning: groupdel grupp\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: fel vid borttagning av grupp-post\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: kunde inte byta namn på katalogen %s till %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: kunde inte ta bort post från skuggrupp\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr ""
+"%s: kan inte ändra primära gruppen för användaren \"%s\" från %u till %u.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: kan inte ta bort användarens primära grupp.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: gruppen %s finns inte\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: gruppen %s är en NIS-grupp\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: gruppen \"%s\" är en NIS-grupp.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s är NIS master\n"
 
-msgid "Member already exists\n"
-msgstr "Medlemmen finns redan\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: användaren %s är en NIS-användare\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Medlemmen som skulle tas bort kunde inte hittas\n"
+#, fuzzy, c-format
+#| msgid "%s: Out of memory. Cannot update the group database.\n"
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: Slut på minne. Kan inte uppdatera gruppdatabasen.\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
-"Användning: groupmems -a användarnamn | -d användarnamn | -D | -l [-g "
-"gruppnamn]\n"
 
-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 "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "Grupptillgång krävs\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Inte primär ägare av aktuell grupp\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "PAM-autentisering misslyckades för\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Kunde inte låsa gruppfilen\n"
-
-msgid "Unable to open group file\n"
-msgstr "Kunde inte öppna gruppfilen\n"
-
-msgid "Cannot close group file\n"
-msgstr "Kan inte stänga gruppfilen\n"
-
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -934,44 +881,20 @@
 "lösenordet\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s hittades inte i /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "%s: ogiltigt gruppnamn \"%s\"\n"
 
 #, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u är inte ett unikt GID\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: gruppen %s är en NIS-grupp\n"
 
 #, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s är inte ett unikt namn\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: okänd användare %s\n"
 
 #, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: kan inte skriva om passwd-filen\n"
-
-#, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: kunde inte låsa lösenordsfilen\n"
-
-#, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: kan inte öppna lösenordsfilen\n"
-
-#, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-"%s: kan inte ändra den primära gruppen för användaren \"%s\" från %u till %"
-"u, eftersom den inte finns i passwd-filen.\n"
-
-#, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr ""
-"%s: kan inte ändra primära gruppen för användaren \"%s\" från %u till %u.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Användning: %s [-r] [-s] [grupp [gshadow]]\n"
 
@@ -983,18 +906,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s och -r är inkompatibla\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: kan inte låsa filen %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "ogiltig post i gruppfil"
 
@@ -1009,6 +920,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "ogiltigt gruppnamn \"%s\"\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "ogiltigt gruppnamn \"%s\"\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "grupp %s: ingen användare %s\n"
@@ -1021,18 +937,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "ingen matchande gruppfilspost i %s\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "lägg till grupp \"%s\" i %s ?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: kan inte uppdatera skuggpost för %s\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: kan inte uppdatera post för gruppen %s\n"
-
 msgid "invalid shadow group file entry"
 msgstr "ogiltig post i fil för skuggrupper"
 
@@ -1059,30 +968,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: inga ändringar\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: kan inte låsa filen för skuggrupper\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Användning: groupdel grupp\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: kan inte öppna filen för skuggrupper\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Användning: groupdel grupp\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: kan inte ta bort skuggruppen %s\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: kan inte uppdatera filen %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: kan inte uppdatera filen för skuggrupper\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: kan inte uppdatera gruppfilen\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: kan inte radera shadowgruppfilen\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Usage: id [-a]\n"
 
@@ -1113,6 +1013,10 @@
 "                        angiven med LOGIN\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Användarnamn      Port     Från             Senast"
 
@@ -1123,14 +1027,14 @@
 msgstr "**Aldrig varit inloggad**"
 
 #, c-format
-msgid "Unknown user or range: %s\n"
-msgstr "Okänd användare eller intervall: %s\n"
-
-#, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: oväntat argument: %s\n"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Användning: %s [-p] [namn]\n"
 
@@ -1227,6 +1131,11 @@
 "inloggningstid överskriden\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Användning: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Användning: newgrp [-] [grupp]\n"
 
@@ -1240,14 +1149,11 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: fel vid processgrening: %s\n"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "okänt UID: %u\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: användaren \"%s\" finns inte\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "okänt GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "för många grupper\n"
 
@@ -1265,62 +1171,21 @@
 "  -r, --system                  skapa systemkonton\n"
 "%s\n"
 
-#, c-format
-msgid "%s: group ID `%s' is not valid\n"
-msgstr "%s: grupp-id \"%s\" är inte giltigt\n"
-
-#, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "%s: ogiltigt gruppnamn \"%s\"\n"
-
-#, c-format
-msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: gruppen %s är en skugg-grupp, men den finns inte i /etc/group\n"
 
-#, c-format
-msgid ""
-"%s: group %s created, failure during the creation of the corresponding "
-"gshadow group\n"
-msgstr ""
-"%s: gruppen %s skapades, fel under skapandet av motsvarande gshadow-grupp\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: ogiltigt användarnamn \"%s\"\n"
 
 #, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: användar-id \"%s\" är inte giltigt\n"
-
-#, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: användaren \"%s\" finns inte\n"
-
-#, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: ogiltigt användarnamn \"%s\"\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: kan inte låsa /etc/passwd.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: kan inte låsa /etc/shadow.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: kan inte låsa /etc/group.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: kan inte låsa /etc/gshadow.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1338,9 +1203,10 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: rad %d: kan inte skapa grupp\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: rad %d: kan inte hitta användaren %s\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: användaren \"%s\" finns inte\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1358,6 +1224,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: rad %d: kan inte uppdatera post\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1370,15 +1264,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1452,14 +1346,14 @@
 msgid "The password for %s cannot be changed yet.\n"
 msgstr "Lösenordet för %s kan inte ändras ännu.\n"
 
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: slut på minne\n"
-
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 "%s: upplåsning av användaren skulle resultera i ett konto utan lösenord.\n"
 "Du bör ange ett lösenord med usermod -p för att låsa upp detta "
@@ -1505,16 +1399,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "ogiltigt användarnamn \"%s\"\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "ogiltigt användarnamn \"%s\"\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "användare %s: ingen grupp %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "användare %s: katalogen %s finns inte\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "användare %s: programmet %s finns inte\n"
 
 #, c-format
@@ -1525,10 +1427,6 @@
 msgid "add user '%s' in %s? "
 msgstr "lägg till grupp \"%s\" i %s? "
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: kan inte uppdatera lösenordspost för %s\n"
-
 msgid "invalid shadow password file entry"
 msgstr "ogiltig post i skugglösenordsfil"
 
@@ -1539,34 +1437,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "användare %s: senaste lösenordsändringen i framtiden\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: kan inte låsa lösenordsfilen\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: kan inte öppna filen %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: kan inte öppna lösenordsfilen\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Användning: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: kan inte ta bort skuggposten för %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: kan inte uppdatera skuggfilen\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Användning: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: kan inte uppdatera lösenordsfilen\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: kan inte uppdatera post för användaren %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: kan inte ta bort skugglösenordsfilen\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Tillgång med su till det kontot NEKAS.\n"
 
@@ -1633,6 +1522,16 @@
 "%s: %s\n"
 "(Ignorerad)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: PAM autentisering misslyckades\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Du är inte bemyndigad att su %s\n"
+
 msgid "No shell\n"
 msgstr "Inget skal\n"
 
@@ -1658,14 +1557,6 @@
 msgstr "Går över till läge för systemunderhåll"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: okänt GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: okänd grupp %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: kan inte skapa ny standardfil\n"
 
@@ -1685,6 +1576,46 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: för många grupper angivna (max %d).\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: useradd [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
+#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#| "                                home directory\n"
+#| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#| "account\n"
+#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#| "  -D, --defaults                print or save modified default useradd\n"
+#| "                                configuration\n"
+#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#| "EXPIRE_DATE\n"
+#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#| "                                user account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#| "  -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"
+#| "  -N, --no-user-group           do not create a group with the same name "
+#| "as\n"
+#| "                                the user\n"
+#| "  -o, --non-unique              allow create user with duplicate\n"
+#| "                                (non-unique) UID\n"
+#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#| "                                account\n"
+#| "  -r, --system                  create a system account\n"
+#| "  -s, --shell SHELL             the login shell for the new user account\n"
+#| "  -u, --uid UID                 force use the UID for the new user "
+#| "account\n"
+#| "  -U, --user-group              create a group with the same name as the "
+#| "user\n"
+#| "\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1705,10 +1636,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1766,14 +1699,6 @@
 "\n"
 
 #, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: Slut på minne. Kan inte uppdatera gruppdatabasen.\n"
-
-#, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: Slut på minne. Kan inte uppdatera databasen för skugg-grupper.\n"
-
-#, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: ogiltig baskatalog \"%s\"\n"
 
@@ -1810,50 +1735,14 @@
 msgstr "%s: flaggorna %s och %s står i konflikt\n"
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: ogiltigt användarnamn \"%s\"\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: kan inte skriva om lösenordsfilen\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: kan inte skriva om skuggruppfilen\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: kan inte låsa skugglösenordsfilen\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: kan inte öppna skugglösenordsfilen\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: fel vid låsning av gruppfil\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: fel vid öppning av gruppfil\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: fel vid låsning av skuggruppfil\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: fel vid öppning av skuggruppfil\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: fel vid tilläggning av ny lösenordspost\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: fel vid tilläggning av ny skugglösenordspost\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: kan inte skapa katalog %s\n"
 
@@ -1869,8 +1758,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Ställer in rättigheter för postlådefil"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: användaren %s finns redan\n"
 
 #, c-format
@@ -1884,11 +1774,16 @@
 msgid "%s: can't create user\n"
 msgstr "%s: kan inte skapa användare\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u är inte unikt\n"
 
 #, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: kan inte skapa grupp\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1896,10 +1791,6 @@
 "%s: varning: hem-katalogen finns redan.\n"
 "Kopierar ingen fil från skel-katalogen till den.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr "%s: varning: CREATE_HOME stöds inte, vänligen använd -m istället.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1919,53 +1810,28 @@
 "  -r, --remove                  ta bort hemkatalog och postkö\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: fel vid uppdatering av grupp-post\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Kan inte ta bort gruppen %s som är en primär grupp för en annan "
 "användare.\n"
 
 #, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: fel vid uppdatering av post för skugg-grupp\n"
-
-#, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: kan inte öppna gruppfilen\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: kunde inte öppna fil för skuggrupp\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: fel vid borttagning av lösenordspost\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: fel vid borttagning av skugglösenordspost\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: användaren %s är för närvarande inloggad\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: varning: kan inte ta bort "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s ägs inte av %s, tar inte bort\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: varning: kan inte ta bort "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: användaren %s finns inte\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: användaren %s är en NIS-användare\n"
 
@@ -2031,10 +1897,23 @@
 "  -U, --unlock                  lås upp användarkontot\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: fel när ny post för skugg-grupp lades till\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+"%s: upplåsning av användaren skulle resultera i ett konto utan lösenord.\n"
+"Du bör ange ett lösenord med usermod -p för att låsa upp detta "
+"användarkonto.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: användaren %s finns redan\n"
+
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: inga flaggor angivna\n"
@@ -2047,23 +1926,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr "%s: flaggorna -L, -p och -U är uteslutande\n"
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: uid %lu är inte unikt\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "Medlemmen finns redan\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: fel vid ändring av lösenordspost\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: fel vid borttagning av lösenordspost\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: fel vid borttagning av skugglösenordspost\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: katalogen %s finns redan\n"
 
@@ -2085,6 +1953,14 @@
 msgstr "%s: kunde inte byta namn på katalogen %s till %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: varning: %s ägs inte av %s\n"
 
@@ -2094,11 +1970,15 @@
 msgid "failed to rename mailbox"
 msgstr "misslyckades med att byta namn på postlåda"
 
-#, c-format
+#, fuzzy, 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"
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 "Du har ändrat %s.\n"
 "Du kan behöva att ändra %s för att stämma överens.\n"
@@ -2125,10 +2005,16 @@
 "  -s, --shadow                  redigera databaserna shadow eller gshadow\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: misslyckades med att kasta rättigheterna (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s är oförändrad\n"
@@ -2143,6 +2029,420 @@
 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: can't lock password file\n"
+#~ msgstr "%s: kan inte låsa lösenordsfilen\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: kan inte öppna lösenordsfilen\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: kan inte låsa skugglösenordsfilen\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: kan inte öppna skugglösenordsfilen\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: kan inte skriva om skugglösenordsfilen\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: kan inte skriva om lösenordsfilen\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: kan inte uppdatera lösenordsfilen\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: kan inte uppdatera skugglösenordsfilen\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tHelt namn: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tRumsnummer: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tTelefonnummer (arbete): %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tTelefonnummer (hem): %s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr "Kan inte låsa lösenordsfilen, försök igen senare.\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Kan inte öppna lösenordsfilen.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: kan inte låsa gruppfilen\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: kan inte öppna gruppfilen\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: kan inte låsa gshadow-filen\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: kan inte öppna skuggfilen\n"
+
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: fel vid uppdatering av gshadow-filenl\n"
+
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: fel vid uppdatering av group-filen\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: rad %d: okänd grupp %s\n"
+
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: rad %d: kan inte uppdatera group-post\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: kan inte låsa skuggfilen\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: fel vid uppdatering av skuggfil\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: fel vid uppdatering av lösenordsfil\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: rad %d: okänd användare %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: rad %d: kan inte uppdatera lösenordsposten\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: okänd användare\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Okänd användare: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Användning: %s [-r|-R] grupp\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a användare] grupp\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d användare] grupp\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A användare,...] [-M användare,...] grupp\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M användare,...] grupp\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: kan inte hämta lås\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: kan inte få skugglås\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: kan inte öppna fil\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: kan inte skriva om fil\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: kan inte skriva om skuggfil\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: kan inte låsa upp fil\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: kan inte uppdatera post\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: kan inte uppdatera skuggpost\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "okänd grupp: %s\n"
+
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: kan inte stänga fil\n"
+
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: kan inte stänga skuggfilen\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Vem är du?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: okänd medlem %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: fel vid tilläggning av ny grupp-post\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: kan inte skriva om gruppfilen\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: kan inte skriva om skuggruppfilen\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: kunde inte låsa gruppfilen\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: kunde inte öppna gruppfilen\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: kunde inte låsa skuggruppfilen\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: kunde inte öppna skuggruppfilen\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u är inte unik\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: fel vid borttagning av grupp-post\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: kunde inte ta bort post från skuggrupp\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: kan inte ta bort användarens primära grupp.\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Medlemmen som skulle tas bort kunde inte hittas\n"
+
+#~ 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"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "Endast root kan lägga till medlemmar till olika grupper\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "Grupptillgång krävs\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Inte primär ägare av aktuell grupp\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "PAM-autentisering misslyckades för\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Kunde inte låsa gruppfilen\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Kunde inte öppna gruppfilen\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Kan inte stänga gruppfilen\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s hittades inte i /etc/group\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u är inte ett unikt GID\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s är inte ett unikt namn\n"
+
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: kan inte skriva om passwd-filen\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: kunde inte låsa lösenordsfilen\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: kan inte öppna lösenordsfilen\n"
+
+#~ msgid ""
+#~ "%s: cannot change the primary group of user '%s' from %u to %u, since it "
+#~ "is not in the passwd file.\n"
+#~ msgstr ""
+#~ "%s: kan inte ändra den primära gruppen för användaren \"%s\" från %u till "
+#~ "%u, eftersom den inte finns i passwd-filen.\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: kan inte låsa filen %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: kan inte uppdatera skuggpost för %s\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: kan inte uppdatera post för gruppen %s\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: kan inte låsa filen för skuggrupper\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: kan inte öppna filen för skuggrupper\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: kan inte ta bort skuggruppen %s\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: kan inte uppdatera filen för skuggrupper\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: kan inte uppdatera gruppfilen\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: kan inte radera shadowgruppfilen\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "okänt UID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "okänt GID: %lu\n"
+
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: grupp-id \"%s\" är inte giltigt\n"
+
+#~ msgid ""
+#~ "%s: group %s created, failure during the creation of the corresponding "
+#~ "gshadow group\n"
+#~ msgstr ""
+#~ "%s: gruppen %s skapades, fel under skapandet av motsvarande gshadow-"
+#~ "grupp\n"
+
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: användar-id \"%s\" är inte giltigt\n"
+
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: ogiltigt användarnamn \"%s\"\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: kan inte låsa /etc/passwd.\n"
+
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: kan inte låsa /etc/shadow.\n"
+
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: kan inte låsa /etc/group.\n"
+
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: kan inte låsa /etc/gshadow.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: kan inte öppna filer\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: fel vid uppdatering av filer\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: rad %d: kan inte hitta användaren %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: kan inte uppdatera lösenordspost för %s\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: kan inte låsa lösenordsfilen\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: kan inte öppna lösenordsfilen\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: kan inte ta bort skuggposten för %s\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: kan inte uppdatera skuggfilen\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: kan inte uppdatera lösenordsfilen\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: kan inte uppdatera post för användaren %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: kan inte ta bort skugglösenordsfilen\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: okänt GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: okänd grupp %s\n"
+
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr ""
+#~ "%s: Slut på minne. Kan inte uppdatera databasen för skugg-grupper.\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: kan inte skriva om lösenordsfilen\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: kan inte skriva om skuggruppfilen\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: kan inte låsa skugglösenordsfilen\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: kan inte öppna skugglösenordsfilen\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: fel vid låsning av gruppfil\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: fel vid öppning av gruppfil\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: fel vid låsning av skuggruppfil\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: fel vid öppning av skuggruppfil\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: fel vid tilläggning av ny lösenordspost\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: fel vid tilläggning av ny skugglösenordspost\n"
+
+#~ 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"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: fel vid uppdatering av grupp-post\n"
+
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: fel vid uppdatering av post för skugg-grupp\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: kan inte öppna gruppfilen\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: kunde inte öppna fil för skuggrupp\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: fel vid borttagning av lösenordspost\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: fel vid borttagning av skugglösenordspost\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: användaren %s finns inte\n"
+
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: fel när ny post för skugg-grupp lades till\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: uid %lu är inte unikt\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: fel vid ändring av lösenordspost\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: fel vid borttagning av lösenordspost\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: fel vid borttagning av skugglösenordspost\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: kan inte hämta unikt GID\n"
 
@@ -2152,18 +2452,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " den \"%.100s\""
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: kan inte låsa filer, försök igen senare\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: rad %d: kan inte skapa UID\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/tl.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -59,6 +59,9 @@
 msgid "  Choose a new password."
 msgstr "  Pumili ng bagong kontrasenyas."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Ang inyong kontrasenyas ay may taning na %ld na araw.\n"
@@ -70,7 +73,12 @@
 msgstr "Mapapaso ang inyong kontrasenyas ngayong araw na ito."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Hindi mabago ang tty %s"
 
 msgid "Environment overflow\n"
@@ -98,14 +106,14 @@
 "May %d na kabiguan magmula ng huling pagpasok.\n"
 "Ang huli ay %s noong %s.\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "%s: hindi makakuha ng kakaibang GID\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
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s: hindi makakuha ng kakaibang GID\n"
-
 msgid "Too many logins.\n"
 msgstr "Labis ang mga login.\n"
 
@@ -197,9 +205,18 @@
 msgstr "Hindi malaman ang pangalan ng tty ninyo."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: nagkulang ng memory\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "bigo ang malloc(%d)\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "Hindi\n"
+
 msgid "Password: "
 msgstr "Kontrasenyas: "
 
@@ -207,6 +224,11 @@
 msgid "%s's Password: "
 msgstr "Kontrasenyas ni %s: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: mahaba masyado ang mga field\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -303,42 +325,33 @@
 msgstr "%s: Walang pahintulot.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Hindi makilala ang inyong pangalan.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 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"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: hindi makapag-aldaba ng mga talaksan, subukan muli mamaya.\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: hindi mabuksan ang talaksang password\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: hindi mabuksan ang talaksang %s\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: hindi maaldaba ang talaksang shadow password\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: bigo sa pag-fork: %s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: hindi mabuksan ang talaksang shadow password\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: bigo sa pagtanggal ng mga pribilehiyo (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: hindi maisulat-muli ang talaksang shadow password\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: hindi maisulat-muli ang talaksang password\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: hindi maapdeyt ang talaksang password\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: hindi maapdeyt ang talaksang shadow password\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: wala ang talaksan ng shadow password\n"
 
@@ -346,9 +359,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: walang gumagamit na nagngangalang %s\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -376,57 +389,27 @@
 msgid "Full Name"
 msgstr "Buong Pangalan"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tBuong Pangalan: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Bilang ng Silid"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tBilang ng Silid: %s\n"
-
 msgid "Work Phone"
 msgstr "Telepono sa Trabaho"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tTelepono sa Trabaho: %s\n"
-
 msgid "Home Phone"
 msgstr "Telepono sa Bahay"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tTelepono sa Bahay: %s\n"
-
 msgid "Other"
 msgstr "Iba pa"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Hindi mabago ang ID sa root.\n"
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Hindi maaldaba ang talaksang password; subukan muli mamaya.\n"
-
-msgid "Cannot open the password file.\n"
-msgstr "Hindi mabuksan ang talaksang password\n"
-
 #, c-format
-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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -459,9 +442,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' ay may hindi legal na mga karakter\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Hindi makilala ang inyong pangalan.\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: walang gumagamit na nagngangalang %s\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -510,7 +493,7 @@
 msgstr "%s: hindi tanggap na argumentong numero '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: ang flag na -a ay pinapayagan LAMANG kung kasama ang flag na -G\n"
 
 #, c-format
@@ -522,30 +505,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: hindi maaldaba ang talaksang grupo\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: hindi mabuksan ang talaksang grupo\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: hindi maaldaba ang talaksang gshadow\n"
-
-#, c-format
-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"
 
@@ -553,38 +512,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: linya %d: walang bagong password\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: linya %d: di kilalang grupo %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: walang grupong %s\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: walang gumagamit na nagngangalang %s\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: error sa pag-apdeyt ng talaksang shadow\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: error sa pag-apdeyt ng talaksang password\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"
@@ -603,8 +548,9 @@
 msgid "Login Shell"
 msgstr "Login Shell"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Hindi niyo mapapalitan ang shell para kay %s.\n"
 
 #, c-format
@@ -615,24 +561,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Hindi tanggap na entry: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "Ang %s ay hindi tanggap na shell.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Pag-gamit: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: hindi kilalang gumagamit\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -664,11 +626,16 @@
 "                        -l na opsiyon) para sa gumagamit ng LOGIN lamang\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Login       Kabiguan Maximum Pinakahuli               On\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds naiwan]"
 
 #, c-format
@@ -676,76 +643,67 @@
 msgstr " [%lds lock]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Di kilalang Gumagamit: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Pag-gamit: %s [-r|-R] grupo\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a gumagamit] grupo\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d gumagamit] grupo\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Di kilalang Gumagamit: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A gumagamit,...] [-M gumagamit,...] grupo\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: hindi mabuksan ang talaksang %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M gumagamit,...] grupo\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: kailangan ng password ng grupong shadow para sa -A\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: hindi makakuha ng aldaba\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: hindi makuha ang aldaba ng shadow\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Ang password ni %s ay hindi mapapalitan.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: hindi mabuksan ang talaksan\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: kailangan ng password ng grupong shadow para sa -A\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: hindi mabuksan ang talaksan\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: walang grupong %s\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: hindi mabuksan ang talaksang shadow\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: bigo sa pag-fork: %s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -764,9 +722,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Subukan muli mamaya\n"
 
-msgid "Who are you?\n"
-msgstr "Sino ka?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Dinadagdag ang gumagamit na si %s sa grupong %s\n"
@@ -775,9 +730,9 @@
 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"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: walang gumagamit na nagngangalang %s\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -810,113 +765,89 @@
 "  -o, --non-unique      payagang gumawa ng grupo na may GID na kapareho\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: error sa pagdagdag ng entry ng bagong grupo\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: hindi tanggap na pangalan ng grupo ang %s\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: hindi maisulat muli ang talaksang grupo\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "hindi tanggap na pangalan ng grupo '%s'\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: hindi maisulat muli ang talaksang grupo ng shadow\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: hindi maaldaba ang talaksang grupo\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: hindi mabuksan ang talaksang grupo\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: hindi maaldaba ang talaksang grupo ng shadow\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: hindi mabuksan ang talaksang grupo ng shadow\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: kinakailangan ng -O ang PANGALAN=HALAGA\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 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"
-
 #, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: hindi malikha ang %s\n"
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "Mayroon nang kasapi na ganito\n"
 
 msgid "Usage: groupdel group\n"
 msgstr "Pag-gamit: groupdel grupo\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: error sa pagtanggal ng entry ng grupo\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: hindi mapalitan ng pangalan ang directory %s sa %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: error sa pagtanggal ng entry ng grupong shadow\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: hindi mapalitan ang gumagamit '%s' sa NIS client.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: hindi matanggal ang pangunahing grupo ng gumagamit.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: walang grupong %s\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: ang grupong %s ay grupong NIS\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: ang grupong '%s' ay grupong NIS.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s ay ang NIS master\n"
 
-msgid "Member already exists\n"
-msgstr "Mayroon nang kasapi na ganito\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: ang gumagamit na %s ay nasa NIS\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Hindi mahanap ang kasapi na tatanggalin\n"
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: naubos ang memory sa update_group\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
-"Pag-gamit: groupmems -a pangalan | -d pangalan | -D | -l [-g pangalan-ng-"
-"grupo]\n"
 
-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 "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "Kinakailangan ng akses sa grupo\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Hindi pangunahing may-ari ng kasalukuyang grupo\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "Bigo ang pagpapakilalang PAM para kay\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Hindi maaldaba ang talaksang grupo\n"
-
-msgid "Unable to open group file\n"
-msgstr "Hindi mabuksan ang talaksang grupo\n"
-
-msgid "Cannot close group file\n"
-msgstr "Hindi maisara ang talaksang grupo\n"
-
 #, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
@@ -940,41 +871,19 @@
 "                                GID ng GRUPO\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s hindi nahanap sa /etc/group\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: hindi kakaibang GID ang %u\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s ay hindi kakaibang pangalan\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: hindi maisulat muli ang talaksang password\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "hindi tanggap na pangalan ng grupo '%s'\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: hindi maaldaba ang talaksang password\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: ang grupong %s ay grupong NIS\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: hindi mabuksan ang talaksang password\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: di kilalang gumagamit %s\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: hindi mapalitan ang gumagamit '%s' sa NIS client.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Pag-gamit: %s [-r] [-s] [grupo [gshadow]]\n"
 
@@ -986,18 +895,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s at -r ay hindi maaring magkasabay\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: hindi maaldaba ang talaksang %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "hindi tanggap na entry ng talaksang grupo"
 
@@ -1012,6 +909,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "hindi tanggap na pangalan ng grupo '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "hindi tanggap na pangalan ng grupo '%s'\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "grupong %s: walang gumagamit %s\n"
@@ -1024,18 +926,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "walang katumbas na entry sa talaksang grupo sa %s\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "idagdag ang grupong '%s' sa %s ?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: hindi ma-apdeyt ang ipinasok sa shadow para kay %s\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: hindi ma-apdeyt ang ipinasok para sa grupong %s\n"
-
 msgid "invalid shadow group file entry"
 msgstr "hindi tanggap na entry sa talaksang shadow group"
 
@@ -1062,30 +957,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: walang pagbabago\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: hindi maaldaba ang talaksang grupo na shadow\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Pag-gamit: groupdel grupo\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: hindi mabuksan ang talaksang grupo na shadow\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Pag-gamit: groupdel grupo\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: hindi matanggal ang grupong shadow %s\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: hindi ma-apdeyt ang talaksang %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: hindi ma-apdeyt ang talaksang grupo na shadow\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: hindi ma-apdeyt ang talaksang grupo\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: hindi matanggal ang talaksang grupo na shadow\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Pag-gamit: id [-a]\n"
 
@@ -1117,6 +1003,10 @@
 "  -u, --user LOGIN      ipakita lamang ang gumagamit na LOGIN\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Pangalan         Puerta   Mula            Hulihan"
 
@@ -1126,15 +1016,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Pag-gamit: %s [-p] [pangalan]\n"
 
@@ -1231,6 +1121,11 @@
 "lumampas sa taning ng pagpasok\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Pag-gamit: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Pag-gamit: newgrp [-] [grupo]\n"
 
@@ -1245,14 +1140,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: bigo sa pag-fork: %s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "di kilalang GID: %u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: walang gumagamit na nagngangalang %s\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "di kilalang GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "labis ang dami ng mga grupo\n"
 
@@ -1266,60 +1157,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: walang grupong %s\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "hindi tanggap na pangalan ng grupo '%s'\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: hindi tanggap na pangalan `%s'\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: walang gumagamit na nagngangalang %s\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: walang gumagamit na nagngangalang %s\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: hindi tanggap na pangalan `%s'\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: hindi maaldaba ang /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: hindi maaldaba ang /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: hindi maaldaba ang /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: hindi maaldaba ang /etc/passwd.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1335,9 +1185,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: linya %d: hindi makalikha ng GID\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: linya %d: hindi mahanap ang gumagamit %s\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: walang gumagamit na nagngangalang %s\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1368,15 +1218,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1448,13 +1298,10 @@
 msgstr "Ang password ni %s ay hindi mapapalitan.\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: nagkulang ng memory\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1498,16 +1345,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "hindi tanggap na pangalan '%s'\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "hindi tanggap na pangalan '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "gumagamit %s: walang grupo %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "gumagamit %s: walang directory na %s\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "gumagamit %s: walang programang %s\n"
 
 #, c-format
@@ -1518,10 +1373,6 @@
 msgid "add user '%s' in %s? "
 msgstr "idagdag ang gumagamit na si '%s' sa %s? "
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: hindi maapdeyt ang ipinasok sa passwd para kay %s\n"
-
 msgid "invalid shadow password file entry"
 msgstr "hindi tanggap na ipinasok sa talaksang password na shadow"
 
@@ -1532,34 +1383,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "gumagamit %s: huling pagpalit ng password ay nasa hinaharap\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: hindi maaldaba ang talaksang passwd\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: hindi mabuksan ang talaksang %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: hindi mabuksan ang talaksang passwd\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Pag-gamit: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: hindi matanggal ang ipinasok sa shadow para kay %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: hindi maapdeyt ang talaksang shadow\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Pag-gamit: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: hindi maapdeyt ang talaksang passwd\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: hindi maapdeyt ang ipinasok para kay %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: hindi matanggal ang talaksang password ng shadow\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Ang paggamit ng su sa account na iyan ay IPINAGBAWAL.\n"
 
@@ -1627,6 +1469,16 @@
 "%s: %s\n"
 "(Di pinansin)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: bigo ang pagpapakilalang PAM\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Hindi kayo awtorisadong gumamit ng su %s\n"
+
 msgid "No shell\n"
 msgstr "Walang shell\n"
 
@@ -1652,14 +1504,6 @@
 msgstr "Pumapasok sa Modang Pagtataguyod ng Sistema"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: di kilalang GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: di kilalang grupo %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: hindi malikha ang bagong talaksan ng mga default\n"
 
@@ -1700,10 +1544,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1750,14 +1596,6 @@
 "  -u, --uid UID                 gamitin ang UID para sa bagong account\n"
 "\n"
 
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: naubos ang memory sa update_group\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: naubos ang memory sa update_gshadow\n"
-
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: hindi tanggap na batayang directory '%s'\n"
@@ -1795,50 +1633,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: hindi tanggap na pangalan `%s'\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: hindi maisulat muli ang talaksang password\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: hindi maisulat muli ang talaksang password na shadow\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: hindi maaldaba ang talaksang password ng shadow\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: hindi mabuksan ang talaksang password ng shadow\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: error sa pagaldaba ng talaksang grupo\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: error sa pagbukas ng talaksang grupo\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: error sa pagaldaba ng talaksang grupo ng shadow\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: error sa pagbukas ng talaksang grupo ng shadow\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: error sa pagdagdag ng bagong ipapasok sa password\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: error sa pagdagdag ng bagong ipinasok na password sa shadow\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: hindi malikha ang directory %s\n"
 
@@ -1854,8 +1656,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Itinatakda ang pahintulot sa talaksang mailbox"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: mayroon nang gumagamit na %s\n"
 
 #, c-format
@@ -1869,10 +1672,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s: hindi malikha ang %s\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: hindi kakaiba ang UID %u\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: hindi malikha ang %s\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1881,10 +1689,6 @@
 "%s: babala: mayroon nang tahanang directory.\n"
 "Walang kokopyahing talaksan mula sa skel directory dito.\n"
 
-#, c-format
-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"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1904,53 +1708,28 @@
 "  -r, --remove                  tanggalin ang home directory at mail spool\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: error sa pag-apdeyt ng ipinasok sa grupo\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: hindi matanggal ang grupong %s dahil ito'y pangunahing grupo ng ibang "
 "gumagamit.\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: error sa pag-apdeyt ng ipinasok sa grupo\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: hindi mabuksan ang talaksang grupo\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: hindi mabuksan ang talaksang grupo ng shadow\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: error sa pagtanggal ng ipinasok na password\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: error sa pagtanggal ng ipinasok na password sa shadow\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: gumagamit na si %s ay kasalukuyang nakapasok\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: babala: hindi matanggal "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s ay hindi pag-aari ni %s, hindi tatanggalin\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: babala: hindi matanggal "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: walang gumagamit na nagngangalang %s\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: ang gumagamit na %s ay nasa NIS\n"
 
@@ -2020,9 +1799,16 @@
 "                                gumagamit\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: error sa pagdagdag ng entry ng bagong grupo\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: mayroon nang gumagamit na %s\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -2036,23 +1822,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: uid %lu ay hindi kakaiba\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "Mayroon nang kasapi na ganito\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: error sa pagpalit ng ipinasok na password\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: error sa pagtanggal ng ipinasok na password\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: error sa pagtanggal ng ipinasok na shadow password\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: mayroon nang directory na %s\n"
 
@@ -2074,6 +1849,14 @@
 msgstr "%s: hindi mapalitan ng pangalan ang directory %s sa %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: babala: %s ay hindi pag-aari ni %s\n"
 
@@ -2087,7 +1870,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -2111,10 +1894,16 @@
 "  -s, --shadow                  baguhin ang database na shadow o gshadow\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: bigo sa pagtanggal ng mga pribilehiyo (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s ay hindi binago\n"
@@ -2129,6 +1918,422 @@
 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: can't lock password file\n"
+#~ msgstr "%s: hindi maaldaba ang talaksan ng mga kontrasenyas\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: hindi mabuksan ang talaksang password\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: hindi maaldaba ang talaksang shadow password\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: hindi mabuksan ang talaksang shadow password\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: hindi maisulat-muli ang talaksang shadow password\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: hindi maisulat-muli ang talaksang password\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: hindi maapdeyt ang talaksang password\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: hindi maapdeyt ang talaksang shadow password\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tBuong Pangalan: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tBilang ng Silid: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tTelepono sa Trabaho: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tTelepono sa Bahay: %s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr "Hindi maaldaba ang talaksang password; subukan muli mamaya.\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Hindi mabuksan ang talaksang password\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: hindi maaldaba ang talaksang grupo\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: hindi mabuksan ang talaksang grupo\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: hindi maaldaba ang talaksang gshadow\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: hindi mabuksan ang talaksang shadow\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: error sa pag-apdeyt ng talaksang shadow\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: error sa pag-apdeyt ng ipinasok sa grupo\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: linya %d: di kilalang grupo %s\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: linya %d: hindi ma-apdeyt ang ipinasok\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: hindi maaldaba ang talaksang shadow\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: error sa pag-apdeyt ng talaksang shadow\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: error sa pag-apdeyt ng talaksang password\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: linya %d: di kilalang gumagamit %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: linya %d: hindi ma-apdeyt password entry\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: hindi kilalang gumagamit\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Di kilalang Gumagamit: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Pag-gamit: %s [-r|-R] grupo\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a gumagamit] grupo\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d gumagamit] grupo\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A gumagamit,...] [-M gumagamit,...] grupo\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M gumagamit,...] grupo\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: hindi makakuha ng aldaba\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: hindi makuha ang aldaba ng shadow\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: hindi mabuksan ang talaksan\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: hindi maisulat muli ang talaksan\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: hindi maisulat muli ang talaksang shadow\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: hindi matanggal ang aldaba ng talaksan\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: hindi ma-apdeyt ang entry\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: hindi ma-apdeyt ang entry na shadow\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "di kilalang grupo: %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: hindi mabuksan ang talaksan\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: hindi mabuksan ang talaksang shadow\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Sino ka?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: di kilalang miyembro %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: error sa pagdagdag ng entry ng bagong grupo\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: hindi maisulat muli ang talaksang grupo\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: hindi maisulat muli ang talaksang grupo ng shadow\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: hindi maaldaba ang talaksang grupo\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: hindi mabuksan ang talaksang grupo\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: hindi maaldaba ang talaksang grupo ng shadow\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: hindi mabuksan ang talaksang grupo ng shadow\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: hindi kakaiba ang gid na %u\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: error sa pagtanggal ng entry ng grupo\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: error sa pagtanggal ng entry ng grupong shadow\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: hindi matanggal ang pangunahing grupo ng gumagamit.\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Hindi mahanap ang kasapi na tatanggalin\n"
+
+#~ 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"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr ""
+#~ "Ang root lamang ang maaaring magdagdag ng kasapi sa ibang mga grupo\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "Kinakailangan ng akses sa grupo\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Hindi pangunahing may-ari ng kasalukuyang grupo\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "Bigo ang pagpapakilalang PAM para kay\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Hindi maaldaba ang talaksang grupo\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Hindi mabuksan ang talaksang grupo\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Hindi maisara ang talaksang grupo\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s hindi nahanap sa /etc/group\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: hindi kakaibang GID ang %u\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s ay hindi kakaibang pangalan\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: hindi maisulat muli ang talaksang password\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: hindi maaldaba ang talaksang password\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: hindi mabuksan ang talaksang password\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: hindi maaldaba ang talaksang %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: hindi ma-apdeyt ang ipinasok sa shadow para kay %s\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: hindi ma-apdeyt ang ipinasok para sa grupong %s\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: hindi maaldaba ang talaksang grupo na shadow\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: hindi mabuksan ang talaksang grupo na shadow\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: hindi matanggal ang grupong shadow %s\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: hindi ma-apdeyt ang talaksang grupo na shadow\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: hindi ma-apdeyt ang talaksang grupo\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: hindi matanggal ang talaksang grupo na shadow\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "di kilalang GID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "di kilalang GID: %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: walang grupong %s\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: walang gumagamit na nagngangalang %s\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: hindi tanggap na pangalan `%s'\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: hindi maaldaba ang /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: hindi maaldaba ang /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: hindi maaldaba ang /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: hindi maaldaba ang /etc/passwd.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: hindi mabuksan ang mga talaksan\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: error sa pag-apdeyt ng mga talaksan\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: linya %d: hindi mahanap ang gumagamit %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: hindi maapdeyt ang ipinasok sa passwd para kay %s\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: hindi maaldaba ang talaksang passwd\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: hindi mabuksan ang talaksang passwd\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: hindi matanggal ang ipinasok sa shadow para kay %s\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: hindi maapdeyt ang talaksang shadow\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: hindi maapdeyt ang talaksang passwd\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: hindi maapdeyt ang ipinasok para kay %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: hindi matanggal ang talaksang password ng shadow\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: di kilalang GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: di kilalang grupo %s\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: naubos ang memory sa update_gshadow\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: hindi maisulat muli ang talaksang password\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: hindi maisulat muli ang talaksang password na shadow\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: hindi maaldaba ang talaksang password ng shadow\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: hindi mabuksan ang talaksang password ng shadow\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: error sa pagaldaba ng talaksang grupo\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: error sa pagbukas ng talaksang grupo\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: error sa pagaldaba ng talaksang grupo ng shadow\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: error sa pagbukas ng talaksang grupo ng shadow\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: error sa pagdagdag ng bagong ipapasok sa password\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: error sa pagdagdag ng bagong ipinasok na password sa shadow\n"
+
+#~ 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"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: error sa pag-apdeyt ng ipinasok sa grupo\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: error sa pag-apdeyt ng ipinasok sa grupo\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: hindi mabuksan ang talaksang grupo\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: hindi mabuksan ang talaksang grupo ng shadow\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: error sa pagtanggal ng ipinasok na password\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: error sa pagtanggal ng ipinasok na password sa shadow\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: walang gumagamit na nagngangalang %s\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: error sa pagdagdag ng entry ng bagong grupo\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: uid %lu ay hindi kakaiba\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: error sa pagpalit ng ipinasok na password\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: error sa pagtanggal ng ipinasok na password\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: error sa pagtanggal ng ipinasok na shadow password\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: hindi makakuha ng kakaibang GID\n"
 
@@ -2138,18 +2343,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " noong `%.100s'"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: hindi makapag-aldaba ng mga talaksan, subukan muli mamaya.\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: linya %d: hindi makalikha ng UID\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/tr.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\n"
 "PO-Revision-Date: 2008-03-29 20:31+0200\n"
 "Last-Translator: Mehmet Türker <mturker at innova.com.tr>\n"
 "Language-Team: Türkçe <tr at li.org>\n"
@@ -59,6 +59,9 @@
 msgid "  Choose a new password."
 msgstr "Yeni bir parola seçin."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Parolanızın kullanım süresi %ld gün sonra dolacaktır.\n"
@@ -70,7 +73,12 @@
 msgstr "Parolanızın kullanım süresi bugün dolacaktır."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Geçilemeyen tty: %s"
 
 msgid "Environment overflow\n"
@@ -90,12 +98,16 @@
 msgstr[0] ""
 "Son girişten beri %d başarısız girişim.  En sonuncusu %s üzerinde %s idi.\n"
 
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+#| msgid "Can't get unique GID (no more available GIDs)\n"
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "Tek (benzersiz) bir GID alınamadı (kullanılabilecek mevcut GID yok)\n"
+
+#, fuzzy, c-format
+#| msgid "Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "Benzersiz bir UID alınamıyor (mevcut UID yok)\n"
 
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "Tek (benzersiz) bir GID alınamadı (kullanılabilecek mevcut GID yok)\n"
-
 msgid "Too many logins.\n"
 msgstr "Çok fazla oturum.\n"
 
@@ -189,9 +201,18 @@
 msgstr "Kullanıcı isminiz belirlenemedi."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: yetersiz bellek\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) başarısız oldu\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "Hayır\n"
+
 msgid "Password: "
 msgstr "Parola: "
 
@@ -199,6 +220,11 @@
 msgid "%s's Password: "
 msgstr "%s kullanıcı parolası: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: alanlar çok uzun\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -302,42 +328,34 @@
 msgstr "%s: İzin verilmedi\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Kullanıcı isminiz belirlenemedi.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 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"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: dosyalar kilitlenemiyor, daha sonra tekrar deneyin\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: parola dosyası açılamadı\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: %s dosyası açılamıyor\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: gölge parola dosyası kilitlenemedi\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: çatallama (fork) hatası: %s\n"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: gölge parola dosyası açılamadı\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: ayrıcalıklar iptal edilemedi (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: gölge parola dosyasının üzerine yazılamadı\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: parola dosyasına yazılamadı\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: parola dosyası güncellenemedi\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: gölge parola dosyası güncellenemedi\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: shadow parola dosyası açılamadı\n"
 
@@ -345,9 +363,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: kullanıcı `%s' mevcut değil\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -372,57 +391,27 @@
 msgid "Full Name"
 msgstr "Tam İsim"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tTam İsim: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Oda Numarası"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tOda Numarası: %s\n"
-
 msgid "Work Phone"
 msgstr "İş Telefonu"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tİş Telefonu: %s\n"
-
 msgid "Home Phone"
 msgstr "Ev Telefonu"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tEv Telefonu: %s\n"
-
 msgid "Other"
 msgstr "Diğer"
 
 msgid "Cannot change ID to root.\n"
 msgstr "ID root kullanıcısı olarak değiştirilemiyor.\n"
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Parola dosyası kilitlenemiyor, daha sonra tekrar deneyin.\n"
-
-msgid "Cannot open the password file.\n"
-msgstr "Parola dosyası açılamıyor.\n"
-
 #, c-format
-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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -455,9 +444,10 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' geçersiz karakterler içeriyor\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Kullanıcı isminiz belirlenemedi.\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: kullanıcı `%s' mevcut değil\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -508,8 +498,9 @@
 msgid "%s: invalid numeric argument '%s'\n"
 msgstr "%s: geçersiz sayısal argüman '%s'\n"
 
-#, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+#, fuzzy, c-format
+#| msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: %s bayrağına SADECE %s bayrağı ile kullanıldığında izin verilir\n"
 
 #, c-format
@@ -521,30 +512,6 @@
 msgstr "%s: desteklenmeyen kripto metodu: %s\n"
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: grup dosyası kilitlenemiyor\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: grup dosyası açılamıyor\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: gölge dosyası kilitlenemiyor\n"
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-msgstr "%s: gölge dosyası açılamıyor\n"
-
-#, c-format
-msgid "%s: error updating gshadow file\n"
-msgstr "%s: gshadow dosyası güncellenmesinde hata\n"
-
-#, c-format
-msgid "%s: error updating group file\n"
-msgstr "%s: grup dosyası 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"
 
@@ -552,38 +519,25 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: satır %d: yeni parola eksik\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: satır %d: bilinmeyen kullanıcı %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: grup %s mevcut değil\n"
 
-#, c-format
-msgid "%s: line %d: cannot update group entry\n"
-msgstr "%s: satır %d: grup kaydı güncellenemiyor\n"
+#, fuzzy, c-format
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: kullanıcı `%s' mevcut değil\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: gölge (shadow9 dosyası güncellenmesinde hata\n"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: parola dosyası güncellenmesinde hata\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"
@@ -602,8 +556,9 @@
 msgid "Login Shell"
 msgstr "Oturum Kabuğu"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "%s için kabuğu değiştiremezsiniz.\n"
 
 #, c-format
@@ -614,24 +569,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Geçersiz kayıt: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s geçersiz bir kabuk.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Kullanım: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: bilinmeyen kullanıcı\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -663,11 +634,16 @@
 "                                veya -l seçenekleri ile kullanıldıysa)\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Oturum Aç       Failures Maximum Latest                   Açık\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds kaldı]"
 
 #, c-format
@@ -675,78 +651,71 @@
 msgstr " [%lds kilitli]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Bilinmeyen Kullanıcı: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Kullanım: %s [-r|-R] grup\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a kullanıcı] grup\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d kullanıcı] grup\n"
+#, fuzzy, c-format
+#| msgid "Unknown user or range: %s\n"
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Bilinmeyen kullanıcı veya aralık: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "        %s [-A kullanıcı,...] [-M kullanıcı,...] grup\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: %s dosyası açılamıyor\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M kullanıcı,...] grup\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: -A için gölge grup parolaları gerekli\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: kilitlenemiyor\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: gölge kilidi koyulamıyor\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "%s için parola değiştirilemedi.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: dosya açılamıyor\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: -A için gölge grup parolaları gerekli\n"
 
-#, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: dosya tekrar yazılamıyor\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: grup %s mevcut değil\n"
 
-#, c-format
-msgid "%s: can't re-write shadow file\n"
-msgstr "%s: gölge dosyası tekrar yazılamıyor\n"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: çatallama (fork) hatası: %s\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"
-
-#, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: dosya kapatılamıyor\n"
-
-#, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: shadow dosyası kapatılamıyor\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "%s grubu için parola değiştiriliyor\n"
 
@@ -763,9 +732,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Daha sonra tekrar deneyin\n"
 
-msgid "Who are you?\n"
-msgstr "Siz kimsiniz?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "%s kullanıcısı %s grubuna ekleniyor\n"
@@ -774,9 +740,10 @@
 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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: kullanıcı `%s' mevcut değil\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -811,112 +778,94 @@
 "  -r, --system                  bir sistem hesabı yarat\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: yeni grup kaydı eklenirken hata oluştu\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s geçerli bir grup adı değil\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: grup dosyasına yazılamıyor\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group ID '%s'\n"
+msgstr "%s: geçersiz grup adı `%s'\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: gölge grup dosyasına yazılamıyor\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: grup dosyası kilitlenemiyor\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: grup dosyası açılamıyor\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: gölge grup dosyası kilitlenemiyor\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: gölge grup dosyası açılamıyor\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K seçeneği ANAHTAR=DEĞER gerektirir\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 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"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "Üye zaten mevcut\n"
 
-#, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: grup yaratılamıyor\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "Kullanım: groupdel grup_adı\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: grup kaydını silerken hata oluştu\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: %s dizini %s olarak yeniden adlandırılamıyor\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: gölge grup kaydını silerken hata oluştu\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr ""
+"%s: '%s' kullanıcısı için birincil grup %u grubundan %u grubuna "
+"değiştirilemiyor.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: kullanıcının birincil grubu silinemez\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: grup %s mevcut değil\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: grup %s bir NIS grubudur\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: grup '%s' bir NIS grubu.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s NIS efendisidir\n"
 
-msgid "Member already exists\n"
-msgstr "Üye zaten mevcut\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: kullanıcı %s bir NIS kullanıcısı\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Silinecek üye bulunamadı\n"
+#, fuzzy, c-format
+#| msgid "%s: Out of memory. Cannot update the group database.\n"
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: Bellek yetersiz. Grup veritabanı güncellenemiyor.\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
-"Kullanım: groupmems -a kullanıcıadı | -d kullanıcıadı | -D | -l[-g grupadı]\n"
 
-msgid "Only root can add members to different groups\n"
-msgstr "Sadece root kullacısı üyeleri başka gruplara ekleyebilir\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "Grup hakkı gerekli\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Şu anki grubun birincil sahibi değil\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "PAM yetkilendirmesi başarısız oldu\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Grup dosyası kilitlenemiyor\n"
-
-msgid "Unable to open group file\n"
-msgstr "Grup dosyası açılamıyor\n"
-
-msgid "Cannot close group file\n"
-msgstr "Grup dosyası kapatılamıyor\n"
-
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -940,45 +889,20 @@
 "kullan\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s /etc/group dosyasında bulunamadı\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "%s: geçersiz grup adı `%s'\n"
 
 #, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u benzersiz bir GID değil\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: grup %s bir NIS grubudur\n"
 
 #, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s benzersiz bir isim değil\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: bilinmeyen kullanıcı %s\n"
 
 #, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: passwd dosyasına yazılamıyor\n"
-
-#, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: parola dosyası kilitlenemiyor\n"
-
-#, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: parola dosyası açılamıyor\n"
-
-#, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-"%s: '%s' kullanıcısının birincil grubu %u grubundan %u grubuna\n"
-"değiştirilemiyor, çünkü bu kullanıcı passwd dosyasında yok.\n"
-
-#, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr ""
-"%s: '%s' kullanıcısı için birincil grup %u grubundan %u grubuna "
-"değiştirilemiyor.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Kullanım: %s [-r] [-s] [grup [gshadow]]\n"
 
@@ -990,18 +914,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s ve -r uyumsuz\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: %s dosyası kilitlenemiyor\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "geçersiz grup dosyası kaydı"
 
@@ -1016,6 +928,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "geçersiz grup adı '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "geçersiz grup adı '%s'\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "grup %s: %s kullanıcısı yok\n"
@@ -1028,18 +945,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "%s girişi içinde grup dosyası kaydı eşleşmedi\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "Grup %s, %s'in içine eklensin mi?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: %s için gölge kaydı güncellenemiyor\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: %s grubu için kayıt güncellenemiyor\n"
-
 msgid "invalid shadow group file entry"
 msgstr "geçersiz gölge grup dosyası kaydı"
 
@@ -1066,30 +976,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: değişiklik yok\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: gölge grup dosyası kilitlenemiyor\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Kullanım: groupdel grup_adı\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: gölge grup dosyası açılamıyor\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Kullanım: groupdel grup_adı\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s gölge grubu %s silinemiyor\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: %s dosyası güncellenemiyor\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: gölge grup dosyası güncellenemiyor\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: grup dosyası güncellenemiyor\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: gölge grup dosyası silinemiyor\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Kullanım: id [-a]\n"
 
@@ -1122,6 +1023,10 @@
 "                                kastlog yıtlarını gösterir\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Kullanıcı adı         Port     Kimden             Sonuncu"
 
@@ -1132,14 +1037,14 @@
 msgstr "**Hiç giriş yapmadı**"
 
 #, c-format
-msgid "Unknown user or range: %s\n"
-msgstr "Bilinmeyen kullanıcı veya aralık: %s\n"
-
-#, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: bilinmeyen argüman: %s\n"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Kullanım: %s [-p] [isim]\n"
 
@@ -1236,6 +1141,11 @@
 "oturum açma süresi aşıldı\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Kullanım: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Kullanım: newgrp [-] [grup]\n"
 
@@ -1249,14 +1159,11 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: çatallama (fork) hatası: %s\n"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "bilinmeyen UID: %u\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: kullanıcı `%s' mevcut değil\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "bilinmeyen GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "çok fazla grup\n"
 
@@ -1274,62 +1181,21 @@
 "  -r, --system                  sistem hesaplarını yarat\n"
 "%s\n"
 
-#, c-format
-msgid "%s: group ID `%s' is not valid\n"
-msgstr "%s: grup `%s' geçerli değil\n"
-
-#, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "%s: geçersiz grup adı `%s'\n"
-
-#, c-format
-msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: %s grubu bir shadow grubu, fakat /etc/group içinde mevcut değil\n"
 
-#, c-format
-msgid ""
-"%s: group %s created, failure during the creation of the corresponding "
-"gshadow group\n"
-msgstr ""
-"%s: %s grubu yaratıldı, uygun olan gshadow grubu yaratılırken hata oluştu\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: geçersiz kullanıcı adı '%s'\n"
 
 #, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: kullanıcı `%s' mevcut değil\n"
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: geçersiz kullanıcı adı '%s'\n"
 
 #, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: kullanıcı `%s' mevcut değil\n"
-
-#, c-format
-msgid "%s: invalid user name `%s'\n"
-msgstr "%s: geçersiz kullanıcı adı `%s'\n"
-
-#, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: /etc/passwd kilitlenemiyor.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: /etc/shadow kilitlenemiyor.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: /etc/group kilitlenemiyor.\n"
-
-#, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: /etc/gshadow kilitlenemiyor.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1347,9 +1213,10 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: satır %d: grup yaratılamıyor\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: satır %d: kullanıcı %s bulunamadı\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: kullanıcı `%s' mevcut değil\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1367,6 +1234,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: satır %d: kayıt güncellenemiyor\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1379,15 +1274,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1463,14 +1358,14 @@
 msgid "The password for %s cannot be changed yet.\n"
 msgstr "%s için parola henüz değiştirilemiyor.\n"
 
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: yetersiz bellek\n"
-
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 "%s: kullanıcının kilidini kaldırmak şifresiz bir hesabın oluşmasına yol "
 "açacaktı.\n"
@@ -1517,16 +1412,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "geçersiz kullanıcı adı '%s'\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "geçersiz kullanıcı adı '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "kullanıcı %s: %u grubu mevcut değil\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "kullanıcı %s: %s dizini mevcut değil\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "kullanıcı %s: uygulama %s mevcut değil\n"
 
 #, c-format
@@ -1537,10 +1440,6 @@
 msgid "add user '%s' in %s? "
 msgstr "'%s' adlı kullanıyı %s'e ekle?"
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: %s için passwd kaydı güncellenemedi\n"
-
 msgid "invalid shadow password file entry"
 msgstr "geçersiz gölge parola dosyası kaydı"
 
@@ -1551,34 +1450,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "kullanıcı %s: gelecekteki son parola değişimi\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: passwd dosyası kilitlenemedi\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: %s dosyası açılamıyor\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: passwd dosyası açılamadı\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Kullanım: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: %s için gölge kaydı silinemedi\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: gölge dosyası güncellenemedi\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Kullanım: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: passwd dosyası güncellenemedi\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: kullanıcı %s için kayıt güncellenemiyor\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: gölge parola dosyası silinemiyor\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Bu hesap için 'su'ya erişim ENGELLENDİ.\n"
 
@@ -1645,6 +1535,16 @@
 "%s: %s\n"
 "(Dikkate alınmadı)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: PAM yetkilendirmesi başarısız oldu\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "su %s için yetkili değilsiniz\n"
+
 msgid "No shell\n"
 msgstr "Kabuk yok\n"
 
@@ -1670,14 +1570,6 @@
 msgstr "Sistem Bakımı Kipine Giriliyor"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: bilinmeyen GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: bilinmeyen grup %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: yeni varsayılanlar dosyası oluşturulamadı\n"
 
@@ -1697,6 +1589,46 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: çok fazla grup verildi (azami %d).\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: useradd [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
+#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#| "                                home directory\n"
+#| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#| "account\n"
+#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#| "  -D, --defaults                print or save modified default useradd\n"
+#| "                                configuration\n"
+#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#| "EXPIRE_DATE\n"
+#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#| "                                user account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#| "  -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"
+#| "  -N, --no-user-group           do not create a group with the same name "
+#| "as\n"
+#| "                                the user\n"
+#| "  -o, --non-unique              allow create user with duplicate\n"
+#| "                                (non-unique) UID\n"
+#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#| "                                account\n"
+#| "  -r, --system                  create a system account\n"
+#| "  -s, --shell SHELL             the login shell for the new user account\n"
+#| "  -u, --uid UID                 force use the UID for the new user "
+#| "account\n"
+#| "  -U, --user-group              create a group with the same name as the "
+#| "user\n"
+#| "\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1717,10 +1649,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1778,14 +1712,6 @@
 "\n"
 
 #, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: Bellek yetersiz. Grup veritabanı güncellenemiyor.\n"
-
-#, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: Bellek yetersiz. Shadow grup veritabanı güncellenemiyor.\n"
-
-#, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: geçersiz ana dizin '%s'\n"
 
@@ -1822,50 +1748,14 @@
 msgstr "%s: %s ve %s seçenekleri çakışıyor\n"
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: geçersiz kullanıcı adı '%s'\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: parola dosyası yazılamıyor\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: gölge parola dosyası yazılamıyor\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: gölge parola dosyası kilitlenemiyor\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: gölge parola dosyası açılamıyor\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: grup dosyası kilitlenmesinde hata\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: grup dosyası açılırken hata\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: gölge grup dosyası kilitlenirken hata\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: gölge grup dosyası açılırken hata\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: yeni parola kaydı eklenirken hata\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: yeni gölge parola kaydı eklenirken hata\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: %s dizini yaratılamıyor\n"
 
@@ -1881,8 +1771,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Mail kutusu dosyası için yetkiler ayarlanıyor"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: kullanıcı %s mevcut\n"
 
 #, c-format
@@ -1896,11 +1787,16 @@
 msgid "%s: can't create user\n"
 msgstr "%s: kullanıcı yaratılamıyor\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: GID %u tek değil\n"
 
 #, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: grup yaratılamıyor\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1908,11 +1804,6 @@
 "%s: uyarı: Ev dizini zaten mevcut.\n"
 "Temel dizinden hiçbir dosya kopyalanmıyor.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr ""
-"%s: uyarı: CREATE_HOME desteklenmiyor, lütfen bunun yerine -m kullanın.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1931,52 +1822,27 @@
 "  -r, --remove                  ev dizinini ve mesaj arşivini sil\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: grup kaydı güncellenirken hata oluştu\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: Başka bir kullanıcı için birincil grub olan %s grubu kaldırılamıyor.\n"
 
 #, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: shadow grup kaydı güncellenirken hata oluştu\n"
-
-#, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: grup dosyası açılamıyor\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: gölge grup dosyası açılamıyor\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: parola kaydı silinirken hata oluştu\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: gölge parola kaydı silinirken hata oluştu\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: kullanıcı %s şu an oturumda\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: uyarı: silinemiyor "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s %s kullanıcısına ait değil, silinmiyor\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: uyarı: silinemiyor "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: kullanıcı %s mevcut değil\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: kullanıcı %s bir NIS kullanıcısı\n"
 
@@ -2043,10 +1909,24 @@
 "  -U, --unlock                  kullanıcı hesabı kilidini aç\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: yeni shadow grup kaydı eklenirken hata oluştu\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+"%s: kullanıcının kilidini kaldırmak şifresiz bir hesabın oluşmasına yol "
+"açacaktı.\n"
+"Bu kullanıcı hesabının kilidini kaldırmak için usermod -p ile bir parola "
+"belirlemelisiniz.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: kullanıcı %s mevcut\n"
+
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: herhangi bir bayrak verilmedi\n"
@@ -2059,23 +1939,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr "%s: -L, -p, ve -U bayrakları özel bayraklardır\n"
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: uid %lu benzersiz değil\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "Üye zaten mevcut\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: parola kaydı değiştirilirken hata oluştu\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: parola kaydı silinirken hata oluştu\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: gölge parola kaydı silinirken hata oluştu\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: %s dizini mevcut\n"
 
@@ -2096,6 +1965,14 @@
 msgstr "%s: %s dizini %s olarak yeniden adlandırılamıyor\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: uyarı: %s %s kullanıcısına ait değil\n"
 
@@ -2105,11 +1982,15 @@
 msgid "failed to rename mailbox"
 msgstr "postakutusu isim değişikliği başarısız"
 
-#, c-format
+#, fuzzy, 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"
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 "Değişiklik yapıldı: %s.\n"
 "Uyumu sağlamak için değiştirilmesi gerekiyor: %s.\n"
@@ -2136,10 +2017,16 @@
 "  -s, --shadow                  shadow veya gshadow veri tabanını düzenler\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: ayrıcalıklar iptal edilemedi (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s değiştirilmedi\n"
@@ -2154,6 +2041,420 @@
 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: can't lock password file\n"
+#~ msgstr "%s: parola dosyası kilitlenemedi\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: parola dosyası açılamadı\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: gölge parola dosyası kilitlenemedi\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: gölge parola dosyası açılamadı\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: gölge parola dosyasının üzerine yazılamadı\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: parola dosyasına yazılamadı\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: parola dosyası güncellenemedi\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: gölge parola dosyası güncellenemedi\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tTam İsim: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tOda Numarası: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tİş Telefonu: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tEv Telefonu: %s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr "Parola dosyası kilitlenemiyor, daha sonra tekrar deneyin.\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Parola dosyası açılamıyor.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: grup dosyası kilitlenemiyor\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: grup dosyası açılamıyor\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: gölge dosyası kilitlenemiyor\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: gölge dosyası açılamıyor\n"
+
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: gshadow dosyası güncellenmesinde hata\n"
+
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: grup dosyası güncellenirken hata oluştu\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: satır %d: bilinmeyen kullanıcı %s\n"
+
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: satır %d: grup kaydı güncellenemiyor\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: gölge dosyası kilitlenemiyor\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: gölge (shadow9 dosyası güncellenmesinde hata\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: parola dosyası güncellenmesinde hata\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: satır %d: bilinmeyen kullanıcı %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: satır %d: parola kaydı güncellenemiyor\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: bilinmeyen kullanıcı\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Bilinmeyen Kullanıcı: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Kullanım: %s [-r|-R] grup\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a kullanıcı] grup\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d kullanıcı] grup\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "        %s [-A kullanıcı,...] [-M kullanıcı,...] grup\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M kullanıcı,...] grup\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: kilitlenemiyor\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: gölge kilidi koyulamıyor\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: dosya açılamıyor\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: dosya tekrar yazılamıyor\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: gölge dosyası tekrar yazılamıyor\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: dosya kilidi açılamıyor\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: kayıt güncellenemiyor\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: gölge kaydı güncellenemiyor\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "bilinmeyen grup: %s\n"
+
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: dosya kapatılamıyor\n"
+
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: shadow dosyası kapatılamıyor\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Siz kimsiniz?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: bilinmeyen üye %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: yeni grup kaydı eklenirken hata oluştu\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: grup dosyasına yazılamıyor\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: gölge grup dosyasına yazılamıyor\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: grup dosyası kilitlenemiyor\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: grup dosyası açılamıyor\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: gölge grup dosyası kilitlenemiyor\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: gölge grup dosyası açılamıyor\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u tek değil\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: grup kaydını silerken hata oluştu\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: gölge grup kaydını silerken hata oluştu\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: kullanıcının birincil grubu silinemez\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Silinecek üye bulunamadı\n"
+
+#~ 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"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "Sadece root kullacısı üyeleri başka gruplara ekleyebilir\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "Grup hakkı gerekli\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Şu anki grubun birincil sahibi değil\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "PAM yetkilendirmesi başarısız oldu\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Grup dosyası kilitlenemiyor\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Grup dosyası açılamıyor\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Grup dosyası kapatılamıyor\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s /etc/group dosyasında bulunamadı\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u benzersiz bir GID değil\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s benzersiz bir isim değil\n"
+
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: passwd dosyasına yazılamıyor\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: parola dosyası kilitlenemiyor\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: parola dosyası açılamıyor\n"
+
+#~ msgid ""
+#~ "%s: cannot change the primary group of user '%s' from %u to %u, since it "
+#~ "is not in the passwd file.\n"
+#~ msgstr ""
+#~ "%s: '%s' kullanıcısının birincil grubu %u grubundan %u grubuna\n"
+#~ "değiştirilemiyor, çünkü bu kullanıcı passwd dosyasında yok.\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: %s dosyası kilitlenemiyor\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: %s için gölge kaydı güncellenemiyor\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: %s grubu için kayıt güncellenemiyor\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: gölge grup dosyası kilitlenemiyor\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: gölge grup dosyası açılamıyor\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s gölge grubu %s silinemiyor\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: gölge grup dosyası güncellenemiyor\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: grup dosyası güncellenemiyor\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: gölge grup dosyası silinemiyor\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "bilinmeyen UID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "bilinmeyen GID: %lu\n"
+
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: grup `%s' geçerli değil\n"
+
+#~ msgid ""
+#~ "%s: group %s created, failure during the creation of the corresponding "
+#~ "gshadow group\n"
+#~ msgstr ""
+#~ "%s: %s grubu yaratıldı, uygun olan gshadow grubu yaratılırken hata "
+#~ "oluştu\n"
+
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: kullanıcı `%s' mevcut değil\n"
+
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: geçersiz kullanıcı adı `%s'\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: /etc/passwd kilitlenemiyor.\n"
+
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: /etc/shadow kilitlenemiyor.\n"
+
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: /etc/group kilitlenemiyor.\n"
+
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: /etc/gshadow kilitlenemiyor.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: dosyalar açılamıyor\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: dosyaların güncellenmesinde hata oluştu\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: satır %d: kullanıcı %s bulunamadı\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: %s için passwd kaydı güncellenemedi\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: passwd dosyası kilitlenemedi\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: passwd dosyası açılamadı\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: %s için gölge kaydı silinemedi\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: gölge dosyası güncellenemedi\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: passwd dosyası güncellenemedi\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: kullanıcı %s için kayıt güncellenemiyor\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: gölge parola dosyası silinemiyor\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: bilinmeyen GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: bilinmeyen grup %s\n"
+
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: Bellek yetersiz. Shadow grup veritabanı güncellenemiyor.\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: parola dosyası yazılamıyor\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: gölge parola dosyası yazılamıyor\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: gölge parola dosyası kilitlenemiyor\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: gölge parola dosyası açılamıyor\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: grup dosyası kilitlenmesinde hata\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: grup dosyası açılırken hata\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: gölge grup dosyası kilitlenirken hata\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: gölge grup dosyası açılırken hata\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: yeni parola kaydı eklenirken hata\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: yeni gölge parola kaydı eklenirken hata\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr ""
+#~ "%s: uyarı: CREATE_HOME desteklenmiyor, lütfen bunun yerine -m kullanın.\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: grup kaydı güncellenirken hata oluştu\n"
+
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: shadow grup kaydı güncellenirken hata oluştu\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: grup dosyası açılamıyor\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: gölge grup dosyası açılamıyor\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: parola kaydı silinirken hata oluştu\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: gölge parola kaydı silinirken hata oluştu\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: kullanıcı %s mevcut değil\n"
+
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: yeni shadow grup kaydı eklenirken hata oluştu\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: uid %lu benzersiz değil\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: parola kaydı değiştirilirken hata oluştu\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: parola kaydı silinirken hata oluştu\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: gölge parola kaydı silinirken hata oluştu\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: tek (benzersiz) bir GID alınamadı\n"
 
@@ -2163,18 +2464,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " '%.100s' üzerinde"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: dosyalar kilitlenemiyor, daha sonra tekrar deneyin\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: satır %d: UID yaratılamıyor\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/uk.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -58,6 +58,9 @@
 msgid "  Choose a new password."
 msgstr "  Оберіть новий пароль."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Ваш пароль буде прострочено за %ld днів.\n"
@@ -69,7 +72,12 @@
 msgstr "Ваш пароль буде прострочено сьогодні."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Не можу змінити tty %s"
 
 msgid "Environment overflow\n"
@@ -92,14 +100,14 @@
 msgstr[1] "%d помилки з часу останнього входу. Останній вхід: %s з %s.\n"
 msgstr[2] "%d помилок з часу останнього входу. Останній вхід: %s з %s.\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\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: Can't get unique UID (no more available UIDs)\n"
 msgstr "%s: не можу отримати унікальний UID\n"
 
-#, fuzzy
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s: не можу отримати унікальний GID\n"
-
 msgid "Too many logins.\n"
 msgstr "Забагато входів.\n"
 
@@ -190,9 +198,18 @@
 msgstr "Неможливо визначити назву вашого термінала."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: брак пам'яті\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) не виконано\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "Ні\n"
+
 msgid "Password: "
 msgstr "Пароль: "
 
@@ -200,6 +217,11 @@
 msgid "%s's Password: "
 msgstr "Пароль користувача %s: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: поля занадто довгі\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -299,42 +321,33 @@
 msgstr "%s: У доступі відмовлено.\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s: Не можу визначити Ваше ім'я користувача.\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM автентифікація не пройшла\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: не можу заблокувати файл паролів\n"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s: не можу блокувати файли, спробуйте пізніше\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s: не можу відкрити файл паролів\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: не можу відкрити файл %s\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s: не можу заблокувати файл прихованих паролів\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: помилка відгалудження: %s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: не можу відкрити файл прихованих паролів\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: не вдалося скинути привілеї (%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s: не можу переписати файл прихованих паролів\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s: не можу переписати файл паролів\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s: не можу оновити файл паролів\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: не можу оновити файл прихованих паролів\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s: не можу відкрити файл прихованих паролів\n"
 
@@ -342,9 +355,9 @@
 msgid "%s: failed to drop privileges (%s)\n"
 msgstr "%s: не вдалося скинути привілеї (%s)\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: невідомий користувач %s\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: користувач %s не існує\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -371,57 +384,27 @@
 msgid "Full Name"
 msgstr "Повне ім'я"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tПовне ім'я: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Номер кімнати"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tНомер кімнати: %s\n"
-
 msgid "Work Phone"
 msgstr "Робочій телефон"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tРобочій телефон: %s\n"
-
 msgid "Home Phone"
 msgstr "Домашній телефон"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tДомашній телефон: %s\n"
-
 msgid "Other"
 msgstr "Інше"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Не можу змінити ID на root.\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 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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -454,9 +437,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: \"%s\" містить заборонені символи\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s: Не можу визначити Ваше ім'я користувача.\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: користувач %s не існує\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -505,7 +488,7 @@
 msgstr "%s: невірний числовий аргумент \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: прапорець -a можна використовувати ТІЛЬКИ з прапорцем -G\n"
 
 #, c-format
@@ -517,30 +500,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: не можу блокувати файл груп\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: не можу відкрити файл груп\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: неможливо заблокувати файл gshadow\n"
-
-#, c-format
-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"
 
@@ -548,38 +507,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: рядок %d: бракує нового пароля\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: рядок %d: невідома група %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: група %s не існує\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: користувач %s не існує\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s: помилка оновлення файлу з прихованими паролями\n"
-
-#, c-format
-msgid "%s: error updating password 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,8 +543,9 @@
 msgid "Login Shell"
 msgstr "Логін-оболонка"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Не можна змінити оболонку для %s.\n"
 
 #, c-format
@@ -610,24 +556,40 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Невірний запис: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s є невірна оболонка.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "Використання: expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: невідомий користувач\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -655,11 +617,16 @@
 "                        опціями) лише для користувача з логіном ЛОГІН\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Логін       Помилок Максимум Останнє                 На\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds залишилось]"
 
 #, c-format
@@ -667,76 +634,67 @@
 msgstr " [%lds блоковано]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Невідомий користувач: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Використання: %s [-r|-R] група\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "                %s [-a користувач] група\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "                %s [-d користувач] група\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Невідомий користувач: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "                %s [-A користувач,...] [-M користувач,...] група\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: не можу відкрити файл %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "                %s [-M користувач,...] група\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: приховані паролі груп потрібні для -A\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: не можу заблокувати\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: не можу заблокувати базу прихований паролів\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Пароль для %s не може бути змінений.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: не можу відкрити файл\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: приховані паролі груп потрібні для -A\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: не можу відкрити файл\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: група %s не існує\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: не можу відкрити файл з прихованими паролями\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: помилка відгалудження: %s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -755,9 +713,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: Спробуйте знову пізніше\n"
 
-msgid "Who are you?\n"
-msgstr "Ви хто?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "Додано нового користувача %s до групи %s\n"
@@ -766,9 +721,9 @@
 msgid "Removing user %s from group %s\n"
 msgstr "Видалено користувача %s з групи %s\n"
 
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s: невідомий член %s\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: користувач %s не існує\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -803,112 +758,89 @@
 "повторюються\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: помилка додання нового запису у файл груп\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s: то не є вірне ім'я групи\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: не можу переписати файл груп\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "невірна назва групи \"%s\"\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: не можу переписати файл прихованих груп\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: не можу заблокувати файл груп\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: не можу відкрити файл груп\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: не можу блокувати файл прихованих груп\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: не можу відкрити файл прихованих груп\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K вимагає ЗМІННА=ЗНАЧЕННЯ\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 msgstr "%s: група %s існує\n"
 
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s: GID %u не є унікальним\n"
-
 #, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: не можу створити %s\n"
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "Член вже існує\n"
 
 msgid "Usage: groupdel group\n"
 msgstr "Використання: groupdel група\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: помилка видалення запису з бази груп\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: не можу перейменувати теку з %s на %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: помилка видалення запису з бази прихованих груп\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s: неможливо змінити користувача \"%s\" у клієнті NIS.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: не можу видалити головну групу користувача.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: група %s не існує\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: група %s є групою NIS\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: група \"%s\" є групою NIS.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s є сервер NIS\n"
 
-msgid "Member already exists\n"
-msgstr "Член вже існує\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: користувач %s є користувачем NIS\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "Член, якого потрібно видалити, не знайдений\n"
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: бракує пам'яті у update_group\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
-"Використання: groupmems -a користувач | -d користувач | -D | -l [-g група]\n"
 
-msgid "Only root can add members to different groups\n"
-msgstr "Тільки root може додавати членів до інших груп\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "Необхідний доступ до групи\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Не є первинним володарем поточної групи\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "PAM автентифікація не пройшла\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Неможливо заблокувати файл груп\n"
-
-msgid "Unable to open group file\n"
-msgstr "Неможливо відкрити файл груп\n"
-
-msgid "Cannot close group file\n"
-msgstr "Неможливо закрити файл груп\n"
-
 #, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
@@ -932,41 +864,19 @@
 "повторюються\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: %s не знайдено у /etc/passwd\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u не є унікальний GID\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s не є унікальне ім'я\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: не можу переписати файл паролів\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "невірна назва групи \"%s\"\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: не можу блокувати файл паролів\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: група %s є групою NIS\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: не можу відкрити файл паролів\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: невідомий користувач %s\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s: неможливо змінити користувача \"%s\" у клієнті NIS.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Використання: %s [-r] [-s] [група [gshadow]]\n"
 
@@ -978,18 +888,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s: -s та -r несумісні\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: не можу заблокувати файл %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-msgstr "%s: не можу відкрити файл %s\n"
-
-#, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s: неможливо оновити файл %s\n"
-
 msgid "invalid group file entry"
 msgstr "невірний запис у файлі груп"
 
@@ -1004,6 +902,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "невірна назва групи \"%s\"\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "невірна назва групи \"%s\"\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "група %s: немає користувача %s\n"
@@ -1016,18 +919,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "відповідний запис файлу груп відсутній у %s\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "додати групу \"%s\" у %s?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: не можу оновити прихований запис для %s\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: не можу оновити запис для групи %s\n"
-
 msgid "invalid shadow group file entry"
 msgstr "невірний запис у файлі прихованих груп"
 
@@ -1054,30 +950,21 @@
 msgid "%s: no changes\n"
 msgstr "%s: без змін\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: не можу блокувати файл прихованих груп\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "Використання: groupdel група\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: не можу відкрити файл прихованих груп\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "Використання: groupdel група\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: не можу видалити приховану групу %s\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: неможливо оновити файл %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: не можу оновити файл прихованих груп\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: не можу оновити файл груп\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: не можу видалити файл прихованих груп\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Використання: id [-a]\n"
 
@@ -1108,6 +995,10 @@
 "                                користувача з ЛОГІНом\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Користувач       Порт  Звідки           Останній вхід"
 
@@ -1117,15 +1008,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Використання: %s [-p] [ім'я]\n"
 
@@ -1222,6 +1113,11 @@
 "вичерпано час логіну\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Використання: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Використання: newgrp [-] [група]\n"
 
@@ -1236,14 +1132,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: помилка відгалудження: %s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "невідомий UID: %u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: користувач %s не існує\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "невідомий GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "занадто багато груп\n"
 
@@ -1257,60 +1149,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s: група %s не існує\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "невірна назва групи \"%s\"\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: невірне ім'я користувача '%s'\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: користувач %s не існує\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: користувач %s не існує\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: невірне ім'я користувача '%s'\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: не можу блокувати /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: не можу блокувати /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: не можу блокувати /etc/passwd.\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: не можу блокувати /etc/passwd.\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1326,9 +1177,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: рядок %d: не можу створити GID\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: рядок %d: не можу знайти користувача %s\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: користувач %s не існує\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1346,6 +1197,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: рядок %d: не можу оновити запис\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1358,15 +1237,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1438,13 +1317,10 @@
 msgstr "Пароль для %s не може бути змінений.\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: брак пам'яті\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1487,16 +1363,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "невірне ім'я користувача '%s'\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "невірне ім'я користувача '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "користувач %s: не має групи %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "користувач %s: тека %s не існує\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "користувач %s: програма %s не існує\n"
 
 #, c-format
@@ -1507,10 +1391,6 @@
 msgid "add user '%s' in %s? "
 msgstr "додати користувача \"%s\" в %s? "
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: не можу оновити запис у файлі паролів для %s\n"
-
 msgid "invalid shadow password file entry"
 msgstr "невірний запис у файлі прихованих паролів"
 
@@ -1521,34 +1401,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "користувач %s: остання зміна пароля у майбутньому\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: не можу блокувати файл паролів\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: не можу відкрити файл %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: не можу відкрити файл паролів\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Використання: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: не можу видалити запис у файлі прихованих паролів для %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: не можу оновити файл прихованих паролів\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Використання: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: не можу оновити файл паролів\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: не можу оновити запис для користувача %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: не можу видалити файл прихованих паролів\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "Доступ цього користувача до su ЗАБОРОНЕНО.\n"
 
@@ -1614,6 +1485,16 @@
 "%s: %s\n"
 "(Ігнорую)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: PAM автентифікація не пройшла\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Ви не авторизовані для su %s\n"
+
 msgid "No shell\n"
 msgstr "Немає оболонки\n"
 
@@ -1639,14 +1520,6 @@
 msgstr "Входимо у режим відновлення системи"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: невідомий GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: невідома група %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: не можу створити новий файл із значеннями по замовчуванню\n"
 
@@ -1687,10 +1560,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1737,14 +1612,6 @@
 "                                користувача\n"
 "\n"
 
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: бракує пам'яті у update_group\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: бракує пам'яті у update_gshadow\n"
-
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: невірна базова тека \"%s\"\n"
@@ -1782,50 +1649,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: невірне ім'я користувача '%s'\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: не можу переписати файл паролів\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s: не можу переписати файл прихованих паролів\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s: не можу блокувати файл прихованих паролів\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: не можу відкрити файл прихованих паролів\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: не можу заблокувати файл груп\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: не можу відкрити файл груп\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: не можу заблокувати файл прихованих груп\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: не можу відкрити файл прихованих груп\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: помилка додання нового запису у базу паролів\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: помилка додання нового запису у базу прихованих паролів\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: не можу створити теку %s\n"
 
@@ -1841,8 +1672,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Встановлюються права доступу на файл поштової скриньки"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: користувач %s існує\n"
 
 #, c-format
@@ -1856,10 +1688,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s: не можу створити %s\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u не є унікальним\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: не можу створити %s\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1868,10 +1705,6 @@
 "%s: увага: домашня тека вже існує.\n"
 "Жоден файл з директорії кістяка не копіюється.\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr "%s: застереження: CREATE_HOME не підтримується, користуйтесь -m.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1891,52 +1724,27 @@
 "  -r, --remove                  видалити домашню теку і поштову скриньку\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: помилка оновлення запису у базі груп\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr ""
 "%s: не можу видалити групу %s яка є первинною групою іншого користувача.\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: помилка оновлення запису у базі груп\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: не можу відкрити файл груп\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: не можу відкрити файл прихованих груп\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: помилка видалення запису з бази паролів\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: помилка видалення запису з бази прихованих паролів\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: користувач %s на даний момент у системі\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: застереження: не можу видалити "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s не належить %s, не видалено\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: застереження: не можу видалити "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: користувач %s не існує\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: користувач %s є користувачем NIS\n"
 
@@ -2007,9 +1815,16 @@
 "  -U, --unlock                  розблокувати обліковий запис користувача\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: помилка додання нового запису у файл груп\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: користувач %s існує\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -2023,23 +1838,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: uid %lu не є унікальним\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "Член вже існує\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: помилка зміни запису в базі паролів\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: помилка видалення запису з бази паролів\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: помилка видалення запису з бази прихованих паролів\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: тека %s існує\n"
 
@@ -2060,6 +1864,14 @@
 msgstr "%s: не можу перейменувати теку з %s на %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: застереження: %s не належить %s\n"
 
@@ -2073,7 +1885,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -2097,10 +1909,16 @@
 "  -s, --shadow                  редагувати базу даних shadow або gshadow\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: не вдалося скинути привілеї (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s не змінено\n"
@@ -2115,6 +1933,420 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s: не можу відновити %s: %s (ваші зміни у %s)\n"
 
+#~ msgid "%s: can't lock password file\n"
+#~ msgstr "%s: не можу заблокувати файл паролів\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: не можу відкрити файл паролів\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s: не можу заблокувати файл прихованих паролів\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: не можу відкрити файл прихованих паролів\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s: не можу переписати файл прихованих паролів\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s: не можу переписати файл паролів\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s: не можу оновити файл паролів\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: не можу оновити файл прихованих паролів\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tПовне ім'я: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tНомер кімнати: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tРобочій телефон: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tДомашній телефон: %s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr "Не можу блокувати файл паролів; спробуйте пізніше.\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Не можу відкрити файл паролів.\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: не можу блокувати файл груп\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: не можу відкрити файл груп\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: неможливо заблокувати файл gshadow\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: не можу відкрити файл з прихованими паролями\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: помилка оновлення файлу з прихованими паролями\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: помилка оновлення запису у базі груп\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: рядок %d: невідома група %s\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s: рядок %d: не можу оновити запис\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: не можу заблокувати файл з прихованими паролями\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: помилка оновлення файлу з прихованими паролями\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: помилка оновлення файлу з паролями\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: рядок %d: невідомий користувач %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s: рядок %d: не можу оновити запис у базі паролів\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s: невідомий користувач\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Невідомий користувач: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Використання: %s [-r|-R] група\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "                %s [-a користувач] група\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "                %s [-d користувач] група\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "                %s [-A користувач,...] [-M користувач,...] група\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "                %s [-M користувач,...] група\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: не можу заблокувати\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: не можу заблокувати базу прихований паролів\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: не можу відкрити файл\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: не можу переписати файл\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: не можу переписати файл прихованих паролів\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: не можу розблокувати файл\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: не можу оновити запис\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s: не можу оновити запис у базі прихованих паролів\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "невідома група: %s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: не можу відкрити файл\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: не можу відкрити файл з прихованими паролями\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Ви хто?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: невідомий член %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: помилка додання нового запису у файл груп\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: не можу переписати файл груп\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: не можу переписати файл прихованих груп\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: не можу заблокувати файл груп\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: не можу відкрити файл груп\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: не можу блокувати файл прихованих груп\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: не можу відкрити файл прихованих груп\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u не є унікальним\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: помилка видалення запису з бази груп\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: помилка видалення запису з бази прихованих груп\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: не можу видалити головну групу користувача.\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "Член, якого потрібно видалити, не знайдений\n"
+
+#~ msgid ""
+#~ "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+#~ msgstr ""
+#~ "Використання: groupmems -a користувач | -d користувач | -D | -l [-g "
+#~ "група]\n"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "Тільки root може додавати членів до інших груп\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "Необхідний доступ до групи\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Не є первинним володарем поточної групи\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "PAM автентифікація не пройшла\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Неможливо заблокувати файл груп\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Неможливо відкрити файл груп\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Неможливо закрити файл груп\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: %s не знайдено у /etc/passwd\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u не є унікальний GID\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s не є унікальне ім'я\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: не можу переписати файл паролів\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: не можу блокувати файл паролів\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: не можу відкрити файл паролів\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: не можу заблокувати файл %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: не можу оновити прихований запис для %s\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: не можу оновити запис для групи %s\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: не можу блокувати файл прихованих груп\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: не можу відкрити файл прихованих груп\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: не можу видалити приховану групу %s\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: не можу оновити файл прихованих груп\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: не можу оновити файл груп\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: не можу видалити файл прихованих груп\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "невідомий UID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "невідомий GID: %lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: група %s не існує\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: користувач %s не існує\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: невірне ім'я користувача '%s'\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: не можу блокувати /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: не можу блокувати /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: не можу блокувати /etc/passwd.\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: не можу блокувати /etc/passwd.\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: не можу відкрити файл\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: помилка оновлення файлу\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: рядок %d: не можу знайти користувача %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: не можу оновити запис у файлі паролів для %s\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: не можу блокувати файл паролів\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: не можу відкрити файл паролів\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: не можу видалити запис у файлі прихованих паролів для %s\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: не можу оновити файл прихованих паролів\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: не можу оновити файл паролів\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: не можу оновити запис для користувача %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: не можу видалити файл прихованих паролів\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: невідомий GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: невідома група %s\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: бракує пам'яті у update_gshadow\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: не можу переписати файл паролів\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s: не можу переписати файл прихованих паролів\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s: не можу блокувати файл прихованих паролів\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: не можу відкрити файл прихованих паролів\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: не можу заблокувати файл груп\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: не можу відкрити файл груп\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: не можу заблокувати файл прихованих груп\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: не можу відкрити файл прихованих груп\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: помилка додання нового запису у базу паролів\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: помилка додання нового запису у базу прихованих паролів\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr "%s: застереження: CREATE_HOME не підтримується, користуйтесь -m.\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: помилка оновлення запису у базі груп\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: помилка оновлення запису у базі груп\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: не можу відкрити файл груп\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: не можу відкрити файл прихованих груп\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: помилка видалення запису з бази паролів\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: помилка видалення запису з бази прихованих паролів\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: користувач %s не існує\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: помилка додання нового запису у файл груп\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: uid %lu не є унікальним\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: помилка зміни запису в базі паролів\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: помилка видалення запису з бази паролів\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: помилка видалення запису з бази прихованих паролів\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s: не можу отримати унікальний GID\n"
 
@@ -2124,18 +2356,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr " на \"%.100s\""
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s: не можу блокувати файли, спробуйте пізніше\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s: рядок %d: не можу створити UID\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	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/vi.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.1.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\n"
 "PO-Revision-Date: 2008-03-30 19:53+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -56,6 +56,9 @@
 msgid "  Choose a new password."
 msgstr "  Hãy chọn mật khẩu mới."
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "Mật khẩu của bạn sẽ hết hạn sau %ld ngày.\n"
@@ -67,7 +70,12 @@
 msgstr "Mật khẩu của bạn sẽ hết hạn vào hôm nay."
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "Không thể thay đổi TTY %s."
 
 msgid "Environment overflow\n"
@@ -88,12 +96,16 @@
 "%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"
 
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+#| msgid "Can't get unique GID (no more available GIDs)\n"
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "Không thể lấy GID duy nhất (không còn có GID sẵn sàng lại)\n"
+
+#, fuzzy, c-format
+#| msgid "Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "Không thể lấy UID duy nhất (không còn có UID sẵn sàng lại)\n"
 
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "Không thể lấy GID duy nhất (không còn có GID sẵn sàng lại)\n"
-
 msgid "Too many logins.\n"
 msgstr "Quá nhiều việc đăng nhập.\n"
 
@@ -187,9 +199,16 @@
 msgstr "Không thể quyết định tên TTY của bạn."
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: tràn bộ nhớ\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) (cấp phát bộ nhớ) bị lỗi\n"
 
+msgid "No"
+msgstr ""
+
 msgid "Password: "
 msgstr "Mật khẩu : "
 
@@ -197,6 +216,11 @@
 msgid "%s's Password: "
 msgstr "Mật khẩu của %s: "
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s: trường quá dài\n"
+
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
@@ -292,42 +316,34 @@
 msgstr "%s: không đủ quyền.\n"
 
 #, 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"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: lỗi xác thực PAM\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s: không thể khoá tập tin mật khẩu\n"
+#, fuzzy, c-format
+#| msgid "Cannot lock the password file; try again later.\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "Không thể khoá tập tin mật khẩu ; hãy thử lại sau.\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"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s: không thể mở tập tin %s\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"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s: lỗi tạo tiến trình con: %s\n"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s: không thể mở tập tin mật khẩu bóng\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s: lỗi bỏ quyền truy cập (%s)\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"
-
-#, 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"
-
-#, 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"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s: không thể cập nhật tập tin mật khẩu bóng\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"
 
@@ -335,9 +351,10 @@
 msgid "%s: failed to drop privileges (%s)\n"
 msgstr "%s: lỗi bỏ quyền truy cập (%s)\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: không rõ người dùng %s\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s: người dùng « %s » không tồn tại\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -364,57 +381,27 @@
 msgid "Full Name"
 msgstr "Họ tên"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\tHọ tên: %s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s: %s\n"
 
 msgid "Room Number"
 msgstr "Số thứ tự phòng"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\tSố thứ tự phòng: %s\n"
-
 msgid "Work Phone"
 msgstr "Điện thoại chỗ làm"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\tĐiện thoại chỗ làm: %s\n"
-
 msgid "Home Phone"
 msgstr "Điện thoại ở nhà"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\tĐiện thoại ở nhà: %s\n"
-
 msgid "Other"
 msgstr "Khác"
 
 msgid "Cannot change ID to root.\n"
 msgstr "Không thể thay đổi mã số thành người chủ (root).\n"
 
-msgid "Cannot lock the password file; try again later.\n"
-msgstr "Không thể khoá tập tin mật khẩu ; hãy thử lại sau.\n"
-
-msgid "Cannot open the password file.\n"
-msgstr "Không thể mở tập tin mật khẩu.\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 "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ỏ khoá tập tin mật khẩu.\n"
-
-#, c-format
 msgid "%s: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -447,9 +434,10 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: « %s » chứa ký tự cấm\n"
 
-#, 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"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s: người dùng « %s » không tồn tại\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -498,8 +486,9 @@
 msgid "%s: invalid numeric argument '%s'\n"
 msgstr "%s: đối số thuộc số không hợp lệ « %s »\n"
 
-#, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+#, fuzzy, c-format
+#| msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s: cho phép cờ %s CHỈ với cờ %s\n"
 
 #, c-format
@@ -511,30 +500,6 @@
 msgstr "%s: phương pháp mã hoá không được hỗ trợ : %s\n"
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s: không thể khóa tập tin nhóm\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s: không thể mở tập tin nhóm\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s: không thể khóa tập tin gshadow\n"
-
-#, c-format
-msgid "%s: can't open shadow file\n"
-msgstr "%s: không thể mở tập tin bóng\n"
-
-#, c-format
-msgid "%s: error updating gshadow file\n"
-msgstr "%s: gặp lỗi khi cập nhật tập tin gshadow\n"
-
-#, c-format
-msgid "%s: error updating group file\n"
-msgstr "%s: gặp lỗi khi cập nhật tập tin nhóm\n"
-
-#, c-format
 msgid "%s: line %d: line too long\n"
 msgstr "%s: dòng %d: dòng quá dài\n"
 
@@ -542,38 +507,25 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: dòng %d: thiếu mật khẩu mới\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s: dòng %d: không rõ nhóm %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s: nhóm %s không tồn tại\n"
 
-#, 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 nhóm\n"
+#, fuzzy, c-format
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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 bỏ qua các thay đổi\n"
 
-#, c-format
-msgid "%s: can't lock shadow file\n"
-msgstr "%s: không thể khóa tập tin bóng\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s: người dùng « %s » không tồn tại\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"
-
-#, c-format
-msgid "%s: error updating password file\n"
-msgstr "%s: gặp lỗi khi cập nhật tập tin mật khẩu\n"
-
-#, c-format
-msgid "%s: line %d: unknown user %s\n"
-msgstr "%s: dòng %d: không rõ 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"
@@ -593,8 +545,9 @@
 msgid "Login Shell"
 msgstr "Trình bao Đăng nhập"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "Không cho phép bạn thay đổi trình bao đối với %s.\n"
 
 #, c-format
@@ -605,8 +558,9 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: mục nhập không hợp lệ: %s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s là hệ vỏ không hợp lệ.\n"
 
 msgid "Usage: expiry {-f|-c}\n"
@@ -614,17 +568,32 @@
 "Sử dụng: expiry {-f|-c}\n"
 "[expiry: mãn hạn]\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s: không rõ người dùng\n"
-
+#, fuzzy
+#| msgid ""
+#| "Usage: faillog [options]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     display faillog records for all users\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -l, --lock-time SEC           after failed login lock accout to SEC "
+#| "seconds\n"
+#| "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+#| "  -r, --reset                   reset the counters of login failures\n"
+#| "  -t, --time DAYS               display faillog records more recent than "
+#| "DAYS\n"
+#| "  -u, --user LOGIN              display faillog record or maintains "
+#| "failure\n"
+#| "                                counters and limits (if used with -r, -m "
+#| "or -l\n"
+#| "                                options) only for user with LOGIN\n"
+#| "\n"
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -656,11 +625,16 @@
 "                        dùng này\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "Đăng nhập\t\tBị lỗi\tTối đa\tMới nhất        Vào\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [%lds còn lại]"
 
 #, c-format
@@ -668,78 +642,71 @@
 msgstr " [%lds khóa]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "Không biết người dùng: %s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "Cách sử dụng: %s [-r|-R] nhóm\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a người_dùng] nhóm\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d người_dùng] nhóm\n"
+#, fuzzy, c-format
+#| msgid "Unknown user or range: %s\n"
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "Không rõ người dùng hoặc phạm vi: %s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A người_dùng,...] [-M người_dùng,...] nhóm\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s: không thể mở tập tin %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M người_dùng,...] nhóm\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s: mật khẩu nhóm bóng cần thiết cho tùy chọn « -A »\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s: không thể lấy khóa\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s: không thể lấy khóa bóng\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "Không thể thay đổi mật khẩu cho %s.\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s: không thể mở tập tin\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s: mật khẩu nhóm bóng cần thiết cho tùy chọn « -A »\n"
 
-#, c-format
-msgid "%s: can't re-write file\n"
-msgstr "%s: không thể ghi lại tập tin\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s: nhóm %s không tồn tại\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"
+#, fuzzy, c-format
+#| msgid "%s: failure forking: %s\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s: lỗi tạo tiến trình con: %s\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 rõ nhóm: %s\n"
-
-#, c-format
-msgid "%s: can't close file\n"
-msgstr "%s: không thể đóng tập tin\n"
-
-#, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s: không thể đóng tập tin bóng\n"
-
-#, c-format
 msgid "Changing the password for group %s\n"
 msgstr "Đang thay đổi mật khẩu cho nhóm %s\n"
 
@@ -756,9 +723,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s: hãy thử lại sau.\n"
 
-msgid "Who are you?\n"
-msgstr "Ai đó?\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"
@@ -767,9 +731,10 @@
 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 rõ thành viên %s\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s: người dùng « %s » không tồn tại\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -804,115 +769,95 @@
 "  -r, --system                  tạo một tài khoản hệ thống\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s: gặp lỗi khi thêm mục nhập nhóm mới\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: %s không phải là tên nhóm hợp lệ\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s: không thể ghi lại tập tin nhóm\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group ID '%s'\n"
+msgstr "%s: tên nhóm không hợp lệ « %s »\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s: không thể ghi lại tập tin nhóm bóng\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s: không thể khóa tập tin nhóm\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s: không thể mở tập tin nhóm\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s: không thể khóa tập tin nhóm bóng\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s: không thể mở tập tin nhóm bóng\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -K cần thiết cú pháp KHÓA=GIÁ_TRỊ\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 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 duy nhất\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "Thành viên đã có\n"
 
-#, c-format
-msgid "%s: can't create group\n"
-msgstr "%s: không thể tạo nhóm\n"
-
 msgid "Usage: groupdel group\n"
 msgstr ""
 "Sử dụng: groupdel nhóm\n"
 "[groupdel: xóa nhóm]\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s: gặp lỗi khi gỡ bỏ mục nhập nhóm\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s: không thể thay đổi lại tên thư mục %s thành %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s: gặp lỗi khi gỡ bỏ mục nhập nhóm bóng\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr ""
+"%s: không thể thay đổi nhóm chính của người dùng « %s » từ %u thành %u.\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s: không thể gỡ bỏ nhóm chính của người dùng.\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s: nhóm %s không tồn tại\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s: nhóm %s là nhóm kiểu NIS\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s: nhóm « %s » là nhóm kiểu NIS.\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s là NIS cái\n"
 
-msgid "Member already exists\n"
-msgstr "Thành viên đã có\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s: người dùng %s là người dùng kiểu NIS\n"
 
-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"
+#, fuzzy, c-format
+#| msgid "%s: Out of memory. Cannot update the group database.\n"
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s: tràn bộ nhớ nên không thể cập nhật cơ sở dữ liệu nhóm.\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\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"
 
-msgid "Only root can add members to different groups\n"
-msgstr "Chỉ người chủ có quyền thêm thành viên vào nhóm khác nhau\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
+msgstr ""
 
-msgid "Group access is required\n"
-msgstr "Cần thiết quyền truy cập nhóm\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
+msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr "Không phải chủ của nhóm hiện thời\n"
-
-msgid "PAM authentication failed for\n"
-msgstr "Lỗi xác thực PAM đối với\n"
-
-msgid "Unable to lock group file\n"
-msgstr "Không thể khoá tập tin nhóm\n"
-
-msgid "Unable to open group file\n"
-msgstr "Không thể mở tập tin nhóm\n"
-
-msgid "Cannot close group file\n"
-msgstr "Không thể đóng tập tin nhóm\n"
-
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -938,44 +883,20 @@
 " -p, --password MẬT_KHẨU       mật khẩu mới cũng được má hoá\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s: không tìm thấy %s trong « /etc/group »\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group name `%s'\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "%s: tên nhóm không hợp lệ « %s »\n"
 
 #, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u không phải GID duy nhất\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s: nhóm %s là nhóm kiểu NIS\n"
 
 #, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s: %s không phải tên duy nhất\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s: không rõ người dùng %s\n"
 
 #, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s: không thể ghi lại tập tin mật khẩu passwd\n"
-
-#, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s: không thể khoá tập tin mật khẩu\n"
-
-#, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s: không thể mở tập tin mật khẩu\n"
-
-#, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-"%s: không thể thay đổi nhóm chính của người dùng « %s » từ %u thành %u, vì nó "
-"không nằm trong tập tin mật khẩu passwd.\n"
-
-#, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr ""
-"%s: không thể thay đổi nhóm chính của người dùng « %s » từ %u thành %u.\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "Sử dụng: %s [-r] [-s] [nhóm [gshadow]]\n"
 
@@ -987,18 +908,6 @@
 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"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s: không thể khóa tập tin %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-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"
 msgstr "mục nhập tập tin nhóm không hợp lệ"
 
@@ -1013,6 +922,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "tên nhóm không hợp lệ « %s »\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "tên nhóm không hợp lệ « %s »\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "nhóm %s: không có người dùng %s\n"
@@ -1025,18 +939,11 @@
 msgid "no matching group file entry in %s\n"
 msgstr "không có mục nhập tập tin nhóm tương ứng trong %s\n"
 
-#, c-format
-msgid "add group '%s' in %s ?"
+#, fuzzy, c-format
+#| msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "thêm nhóm « %s » trong %s không?"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s: không thể cập nhật mục nhập bóng đối với %s.\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s: không thể cập nhật mục nhập đối với nhóm %s.\n"
-
 msgid "invalid shadow group file entry"
 msgstr "mục nhập tập tin nhóm bóng không hợp lệ"
 
@@ -1063,30 +970,25 @@
 msgid "%s: no changes\n"
 msgstr "%s: chưa thay đổi gì\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s: không thể khóa tập tin nhóm bóng\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr ""
+"Sử dụng: groupdel nhóm\n"
+"[groupdel: xóa nhóm]\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s: không thể mở tập tin nhóm bóng\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr ""
+"Sử dụng: groupdel nhóm\n"
+"[groupdel: xóa nhóm]\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s: không thể gỡ bỏ nhóm bóng %s\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s: không thể cập nhật tập tin %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s: không thể cập nhật tập tin nhóm bóng\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s: không thể cập nhật tập tin nhóm\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s: không thể xóa tập tin nhóm bóng\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "Cách sử dụng: id [-a]\n"
 
@@ -1120,6 +1022,10 @@
 "  -u, --user ĐĂNG_NHẬP   hiển thị mục ghi lastlog cho _người dùng_ tên này\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "Tên dùng\t\t Cổng    Từ\t\tGần nhất"
 
@@ -1130,14 +1036,14 @@
 msgstr "**Chưa bao giờ đăng nhập**"
 
 #, c-format
-msgid "Unknown user or range: %s\n"
-msgstr "Không rõ người dùng hoặc phạm vi: %s\n"
-
-#, c-format
 msgid "lastlog: unexpected argument: %s\n"
 msgstr "lastlog: đối số bất thường: %s\n"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "Cách sử dụng: %s [-p] [tên]\n"
 
@@ -1234,6 +1140,11 @@
 "vượt quá thời gian đăng nhập\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "Cách sử dụng: id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr ""
 "Cách sử dụng: newgrp [-] [nhóm]\n"
@@ -1251,14 +1162,11 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s: lỗi tạo tiến trình con: %s\n"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "không rõ UID: %u\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s: người dùng « %s » không tồn tại\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "không rõ GID: %lu\n"
-
 msgid "too many groups\n"
 msgstr "quá nhiều nhóm\n"
 
@@ -1276,64 +1184,22 @@
 "  -r, --system                  tạo tài khoản hệ thống\n"
 "%s\n"
 
-#, c-format
-msgid "%s: group ID `%s' is not valid\n"
-msgstr "%s: mã số nhóm (GID) « %s » không phải hợp lệ\n"
-
-#, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "%s: tên nhóm không hợp lệ « %s »\n"
-
-#, c-format
-msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s is a shadow group, but does not exist in /etc/group\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr ""
 "%s: nhóm %s là một nhóm bóng, nhưng không tồn tại trong « /etc/group »\n"
 
-#, c-format
-msgid ""
-"%s: group %s created, failure during the creation of the corresponding "
-"gshadow group\n"
-msgstr ""
-"%s: nhóm %s đã được tạo, nhưng không thành công khi tạo nhóm gshadow tương "
-"ứng\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s: tên dùng không hợp lệ « %s »\n"
 
 #, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s: mã số người dùng (UID) « %s » không phải hợp lệ\n"
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: tên dùng không hợp lệ « %s »\n"
 
 #, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s: người dùng « %s » không tồn tại\n"
-
-#, c-format
-msgid "%s: invalid user name `%s'\n"
-msgstr "%s: tên người dùng không hợp lệ « %s »\n"
-
-#, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s: không thể khoá « /etc/passwd ».\n"
-
-#, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s: không thể khoá « /etc/shadow ».\n"
-
-#, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s: không thể khoá « /etc/group ».\n"
-
-#, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s: không thể khoá « /etc/gshadow ».\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-msgstr "%s: không thể mở tập tin\n"
-
-#, c-format
-msgid "%s: error updating files\n"
-msgstr "%s: gặp lỗi khi cập nhật 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"
 
@@ -1351,9 +1217,10 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s: dòng %d: không thể tạo nhóm\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s: dòng %d: không tìm thấy người dùng %s\n"
+#, fuzzy, c-format
+#| msgid "%s: user `%s' does not exist\n"
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s: người dùng « %s » không tồn tại\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1371,6 +1238,34 @@
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: dòng %d: không thể cập nhật mục nhập\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: passwd [options] [LOGIN]\n"
+#| "\n"
+#| "Options:\n"
+#| "  -a, --all                     report password status on all accounts\n"
+#| "  -d, --delete                  delete the password for the named "
+#| "account\n"
+#| "  -e, --expire                  force expire the password for the named "
+#| "account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --keep-tokens             change password only if expired\n"
+#| "  -i, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -l, --lock                    lock the named account\n"
+#| "  -n, --mindays MIN_DAYS        set minimum number of days before "
+#| "password\n"
+#| "                                change to MIN_DAYS\n"
+#| "  -q, --quiet                   quiet mode\n"
+#| "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+#| "  -S, --status                  report password status on the named "
+#| "account\n"
+#| "  -u, --unlock                  unlock the named account\n"
+#| "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+#| "  -x, --maxdays MAX_DAYS        set maximim number of days before "
+#| "password\n"
+#| "                                change to MAX_DAYS\n"
+#| "\n"
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
@@ -1383,15 +1278,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1461,14 +1356,14 @@
 msgid "The password for %s cannot be changed yet.\n"
 msgstr "Chưa có thể thay đổi mật khẩu cho %s.\n"
 
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: tràn bộ nhớ\n"
-
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 "%s: bỏ khoá người dùng thì gây ra một tài khoản không có mật khẩu.\n"
 "Khuyên bạn đặt một mật khẩu, dùng « usermod -p », để bỏ khoá tài khoản người "
@@ -1518,16 +1413,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "tên người dùng không hợp lệ « %s »\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "tên người dùng không hợp lệ « %s »\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "người dùng %s: không có nhóm %u\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "người dùng %s: thư mục %s không tồn tại\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "người dùng %s: chương trình %s không tồn tại\n"
 
 #, c-format
@@ -1538,10 +1441,6 @@
 msgid "add user '%s' in %s? "
 msgstr "thêm người dùng « %s » trong %s không?"
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s: không thể cập nhật mục nhập mật khẩu passwd đối với %s.\n"
-
 msgid "invalid shadow password file entry"
 msgstr "mục nhập tập tin mật khẩu bóng không hợp lệ"
 
@@ -1552,34 +1451,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "người dùng %s: lần thay đổi mật khẩu cuối cùng nằm trong tương lai\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s: không thể khoá tập tin mật khẩu passwd\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s: không thể mở tập tin %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s: không thể mở tập tin mật khẩu passwd\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "Cách sử dụng: id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s: không thể gỡ bỏ mục nhập bóng đối với %s\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s: không thể cập nhật tập tin bóng\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "Cách sử dụng: id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s: không thể cập nhật tập tin mật khẩu passwd\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s: không thể cập nhật mục nhập đối với người dùng %s\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s: không thể xóa tập tin mật khẩu bóng\n"
-
 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"
 
@@ -1648,6 +1538,16 @@
 "%s: %s\n"
 "(Bị bo qua)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s: lỗi xác thực PAM\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "Bạn không có quyền sử dụng lệnh « su » (siêu người dùng) với %s.\n"
+
 msgid "No shell\n"
 msgstr "Không có hệ vỏ\n"
 
@@ -1673,14 +1573,6 @@
 msgstr "Đang vào Chế độ Bảo dưỡng Hệ thống"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s: không rõ GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s: không rõ nhóm %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: không thể tạo tập tin mặc định mới\n"
 
@@ -1700,6 +1592,46 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: ghi rõ quá nhiều nhóm (tối đa %d).\n"
 
+#, fuzzy
+#| msgid ""
+#| "Usage: useradd [options] LOGIN\n"
+#| "\n"
+#| "Options:\n"
+#| "  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+#| "                                home directory\n"
+#| "  -c, --comment COMMENT         set the GECOS field for the new user "
+#| "account\n"
+#| "  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+#| "  -D, --defaults                print or save modified default useradd\n"
+#| "                                configuration\n"
+#| "  -e, --expiredate EXPIRE_DATE  set account expiration date to "
+#| "EXPIRE_DATE\n"
+#| "  -f, --inactive INACTIVE       set password inactive after expiration\n"
+#| "                                to INACTIVE\n"
+#| "  -g, --gid GROUP               force use GROUP for the new user account\n"
+#| "  -G, --groups GROUPS           list of supplementary groups for the new\n"
+#| "                                user account\n"
+#| "  -h, --help                    display this help message and exit\n"
+#| "  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+#| "  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+#| "  -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"
+#| "  -N, --no-user-group           do not create a group with the same name "
+#| "as\n"
+#| "                                the user\n"
+#| "  -o, --non-unique              allow create user with duplicate\n"
+#| "                                (non-unique) UID\n"
+#| "  -p, --password PASSWORD       use encrypted password for the new user\n"
+#| "                                account\n"
+#| "  -r, --system                  create a system account\n"
+#| "  -s, --shell SHELL             the login shell for the new user account\n"
+#| "  -u, --uid UID                 force use the UID for the new user "
+#| "account\n"
+#| "  -U, --user-group              create a group with the same name as the "
+#| "user\n"
+#| "\n"
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
@@ -1720,10 +1652,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1774,14 +1708,6 @@
 "\n"
 
 #, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s: tràn bộ nhớ nên không thể cập nhật cơ sở dữ liệu nhóm.\n"
-
-#, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s: tràn bộ nhớ nên không thể cập nhật cơ sở dữ liệu nhóm bóng.\n"
-
-#, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s: thư mục cơ ban không hợp lệ « %s »\n"
 
@@ -1818,50 +1744,14 @@
 msgstr "%s: hai tùy chọn %s và %s xung đột với nhau\n"
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s: tên dùng không hợp lệ « %s »\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s: không thể ghi lại tập tin mật khẩu\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot 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 "%s: cannot lock shadow password file\n"
-msgstr "%s: không thể khóa tin mật khẩu bóng\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s: không thể mở tập tin mật khẩu bóng\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s: gặp lỗi khi khóa tập tin nhóm\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s: gặp lỗi khi mở tập tin nhóm\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s: gặp lỗi khi khóa tập tin nhóm bóng\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s: gặp lỗi khi mở tập tin nhóm bóng\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s: gặp lỗi khi thêm mục nhập mật khẩu mới\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s: gặp lỗi khi thêm mục nhập mật khẩu bóng mới\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: không thể tạo thư mục %s\n"
 
@@ -1877,8 +1767,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "Đang đặt quyền truy cập tập tin hộp thư"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s: người dùng %s đã có\n"
 
 #, c-format
@@ -1891,11 +1782,16 @@
 msgid "%s: can't create user\n"
 msgstr "%s: không thể tạo người dùng\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s: UID %u không phải duy nhất\n"
 
 #, c-format
+msgid "%s: can't create group\n"
+msgstr "%s: không thể tạo nhóm\n"
+
+#, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
@@ -1903,12 +1799,6 @@
 "%s: cảnh báo : thư mục chính đã có.\n"
 "Vì vậy không sao chép vào nó tập tin nào từ thư mục « skel ».\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr ""
-"%s: cảnh báo : « CREATE_HOME » (tạo thư mục chính) không được hỗ trợ\n"
-"nên dùng tùy chọn « -m » thay vào đó.\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1928,51 +1818,26 @@
 "  -r, --remove                  _gỡ bỏ_ thư mục chính và ống chỉ thư tín\n"
 "\n"
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s: gặp lỗi khi cập nhật mục nhập nhóm.\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr "%s: không thể gỡ bỏ nhóm %s (nhóm chính cho người dùng khác).\n"
 
 #, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s: gặp lỗi khi cập nhật mục nhập nhóm bóng\n"
-
-#, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s: không thể mở tập tin nhóm\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s: không thể mở tập tin nhóm bóng\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s: gặp lỗi khi xóa mục nhập mật khẩu\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s: gặp lỗi khi xóa mục nhập mật khẩu bóng\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: người dùng %s hiện thời đã đăng nhập\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s: cảnh báo : không thể gỡ bỏ "
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s: %s không phải được %s sở hữu nên không gỡ bỏ nó\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s: cảnh báo : không thể gỡ bỏ "
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s: người dùng %s không tồn tại\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: người dùng %s là người dùng kiểu NIS\n"
 
@@ -2045,10 +1910,23 @@
 "  -U, --unlock              _mở khoá_ tài khoản người dùng\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s: gặp lỗi khi thêm mục nhập nhóm bóng mới\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: unlocking the user would result in a passwordless account.\n"
+#| "You should set a password with usermod -p to unlock this user account.\n"
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+"%s: bỏ khoá người dùng thì gây ra một tài khoản không có mật khẩu.\n"
+"Khuyên bạn đặt một mật khẩu, dùng « usermod -p », để bỏ khoá tài khoản người "
+"dùng này.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s: người dùng %s đã có\n"
+
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: chưa đưa ra cờ\n"
@@ -2061,23 +1939,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr "%s: các cờ « -L », « -p » và « -U » loại từ lẫn nhau\n"
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s: UID %lu không phải duy nhất\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "Thành viên đã có\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s: gặp lỗi khi thay đổi mục nhập mật khẩu\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s: gặp lỗi khi gỡ bỏ mục nhập mật khẩu\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s: gặp lỗi khi gỡ bỏ mục nhập mật khẩu bóng\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: thư mục %s đã có\n"
 
@@ -2098,6 +1965,14 @@
 msgstr "%s: không thể thay đổi lại tên thư mục %s thành %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: cảnh báo : %s không phải được %s sở hữu\n"
 
@@ -2107,11 +1982,15 @@
 msgid "failed to rename mailbox"
 msgstr "lỗi thay đổi tên của hộp thư"
 
-#, c-format
+#, fuzzy, 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"
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 "Bạn đã sửa đổi %s.\n"
 "Để thống nhất thì bạn cũng có thể cần phải sửa đổi %s.\n"
@@ -2138,10 +2017,16 @@
 "  -s, --shadow                  sửa đổi cơ sở dữ liệu shadow hay gshadow\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s: lỗi bỏ quyền truy cập (%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s: %s chưa thay đổi\n"
@@ -2155,3 +2040,415 @@
 #, c-format
 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 nằm trong %s)\n"
+
+#~ msgid "%s: can't lock password file\n"
+#~ msgstr "%s: không thể khoá tập tin mật khẩu\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s: không thể mở tập tin mật khẩu\n"
+
+#~ 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"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s: không thể mở tập tin mật khẩu bóng\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"
+
+#~ 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: can't update password file\n"
+#~ msgstr "%s: không thể cập nhật tập tin mật khẩu\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s: không thể cập nhật tập tin mật khẩu bóng\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\tHọ tên: %s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\tSố thứ tự phòng: %s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\tĐiện thoại chỗ làm: %s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\tĐiện thoại ở nhà: %s\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "Không thể mở tập tin mật khẩu.\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ỏ khoá tập tin mật khẩu.\n"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s: không thể khóa tập tin nhóm\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s: không thể mở tập tin nhóm\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s: không thể khóa tập tin gshadow\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s: không thể mở tập tin bóng\n"
+
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s: gặp lỗi khi cập nhật tập tin gshadow\n"
+
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s: gặp lỗi khi cập nhật tập tin nhóm\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s: dòng %d: không rõ nhóm %s\n"
+
+#~ 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 nhóm\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s: không thể khóa tập tin bóng\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s: gặp lỗi khi cập nhật tập tin bóng\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s: gặp lỗi khi cập nhật tập tin mật khẩu\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s: dòng %d: không rõ người dùng %s\n"
+
+#~ 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 "%s: unknown user\n"
+#~ msgstr "%s: không rõ người dùng\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "Không biết người dùng: %s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "Cách sử dụng: %s [-r|-R] nhóm\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a người_dùng] nhóm\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d người_dùng] nhóm\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A người_dùng,...] [-M người_dùng,...] nhóm\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M người_dùng,...] nhóm\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s: không thể lấy khóa\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s: không thể lấy khóa bóng\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s: không thể mở tập tin\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s: không thể ghi lại tập tin\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s: không thể ghi lại tập tin bóng\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s: không thể bỏ khóa tập tin\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s: không thể cập nhật mục nhập\n"
+
+#~ 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 "unknown group: %s\n"
+#~ msgstr "không rõ nhóm: %s\n"
+
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s: không thể đóng tập tin\n"
+
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s: không thể đóng tập tin bóng\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "Ai đó?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s: không rõ thành viên %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s: gặp lỗi khi thêm mục nhập nhóm mới\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s: không thể ghi lại tập tin nhóm\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s: không thể ghi lại tập tin nhóm bóng\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s: không thể khóa tập tin nhóm\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s: không thể mở tập tin nhóm\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s: không thể khóa tập tin nhóm bóng\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s: không thể mở tập tin nhóm bóng\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s: GID %u không phải duy nhất\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s: gặp lỗi khi gỡ bỏ mục nhập nhóm\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s: gặp lỗi khi gỡ bỏ mục nhập nhóm bóng\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s: không thể gỡ bỏ nhóm chính của người dùng.\n"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "Chỉ người chủ có quyền thêm thành viên vào nhóm khác nhau\n"
+
+#~ msgid "Group access is required\n"
+#~ msgstr "Cần thiết quyền truy cập nhóm\n"
+
+#~ msgid "Not primary owner of current group\n"
+#~ msgstr "Không phải chủ của nhóm hiện thời\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "Lỗi xác thực PAM đối với\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "Không thể khoá tập tin nhóm\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "Không thể mở tập tin nhóm\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "Không thể đóng tập tin nhóm\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s: không tìm thấy %s trong « /etc/group »\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s: %u không phải GID duy nhất\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s: %s không phải tên duy nhất\n"
+
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s: không thể ghi lại tập tin mật khẩu passwd\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s: không thể khoá tập tin mật khẩu\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s: không thể mở tập tin mật khẩu\n"
+
+#~ msgid ""
+#~ "%s: cannot change the primary group of user '%s' from %u to %u, since it "
+#~ "is not in the passwd file.\n"
+#~ msgstr ""
+#~ "%s: không thể thay đổi nhóm chính của người dùng « %s » từ %u thành %u, vì "
+#~ "nó không nằm trong tập tin mật khẩu passwd.\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s: không thể khóa tập tin %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s: không thể cập nhật mục nhập bóng đối với %s.\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s: không thể cập nhật mục nhập đối với nhóm %s.\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s: không thể khóa tập tin nhóm bóng\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s: không thể mở tập tin nhóm bóng\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s: không thể gỡ bỏ nhóm bóng %s\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s: không thể cập nhật tập tin nhóm bóng\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s: không thể cập nhật tập tin nhóm\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s: không thể xóa tập tin nhóm bóng\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "không rõ UID: %u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "không rõ GID: %lu\n"
+
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s: mã số nhóm (GID) « %s » không phải hợp lệ\n"
+
+#~ msgid ""
+#~ "%s: group %s created, failure during the creation of the corresponding "
+#~ "gshadow group\n"
+#~ msgstr ""
+#~ "%s: nhóm %s đã được tạo, nhưng không thành công khi tạo nhóm gshadow "
+#~ "tương ứng\n"
+
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s: mã số người dùng (UID) « %s » không phải hợp lệ\n"
+
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s: tên người dùng không hợp lệ « %s »\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s: không thể khoá « /etc/passwd ».\n"
+
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s: không thể khoá « /etc/shadow ».\n"
+
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s: không thể khoá « /etc/group ».\n"
+
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s: không thể khoá « /etc/gshadow ».\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s: không thể mở tập tin\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s: gặp lỗi khi cập nhật tập tin\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s: dòng %d: không tìm thấy người dùng %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s: không thể cập nhật mục nhập mật khẩu passwd đối với %s.\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s: không thể khoá tập tin mật khẩu passwd\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s: không thể mở tập tin mật khẩu passwd\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s: không thể gỡ bỏ mục nhập bóng đối với %s\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s: không thể cập nhật tập tin bóng\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s: không thể cập nhật tập tin mật khẩu passwd\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s: không thể cập nhật mục nhập đối với người dùng %s\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s: không thể xóa tập tin mật khẩu bóng\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s: không rõ GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s: không rõ nhóm %s\n"
+
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s: tràn bộ nhớ nên không thể cập nhật cơ sở dữ liệu nhóm bóng.\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s: không thể ghi lại tập tin mật khẩu\n"
+
+#~ msgid "%s: cannot 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: cannot lock shadow password file\n"
+#~ msgstr "%s: không thể khóa tin mật khẩu bóng\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s: không thể mở tập tin mật khẩu bóng\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s: gặp lỗi khi khóa tập tin nhóm\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s: gặp lỗi khi mở tập tin nhóm\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s: gặp lỗi khi khóa tập tin nhóm bóng\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s: gặp lỗi khi mở tập tin nhóm bóng\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s: gặp lỗi khi thêm mục nhập mật khẩu mới\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s: gặp lỗi khi thêm mục nhập mật khẩu bóng mới\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr ""
+#~ "%s: cảnh báo : « CREATE_HOME » (tạo thư mục chính) không được hỗ trợ\n"
+#~ "nên dùng tùy chọn « -m » thay vào đó.\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s: gặp lỗi khi cập nhật mục nhập nhóm.\n"
+
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s: gặp lỗi khi cập nhật mục nhập nhóm bóng\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s: không thể mở tập tin nhóm\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s: không thể mở tập tin nhóm bóng\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s: gặp lỗi khi xóa mục nhập mật khẩu\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s: gặp lỗi khi xóa mục nhập mật khẩu bóng\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s: người dùng %s không tồn tại\n"
+
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s: gặp lỗi khi thêm mục nhập nhóm bóng mới\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s: UID %lu không phải duy nhất\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s: gặp lỗi khi thay đổi mục nhập mật khẩu\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s: gặp lỗi khi gỡ bỏ mục nhập mật khẩu\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s: gặp lỗi khi gỡ bỏ mục nhập mật khẩu bóng\n"

Modified: upstream/trunk/po/zh_CN.po
===================================================================
--- upstream/trunk/po/zh_CN.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/zh_CN.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -55,6 +55,9 @@
 msgid "  Choose a new password."
 msgstr "  请选择一个新密码。"
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "您的密码将在 %ld 天内过期。\n"
@@ -66,7 +69,12 @@
 msgstr "您的密码今天过期。"
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "无法改变 tty %s"
 
 msgid "Environment overflow\n"
@@ -87,14 +95,14 @@
 "自上一次登录以来已有 %d 次登录失败。\n"
 "最后一次是 %s 在 %s 上。\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\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: Can't get unique UID (no more available UIDs)\n"
 msgstr "%s:无法获取独有的 UID\n"
 
-#, fuzzy
-msgid "Can't get unique GID (no more available GIDs)\n"
-msgstr "%s:无法获取独有的 GID\n"
-
 msgid "Too many logins.\n"
 msgstr "过多登录数量。\n"
 
@@ -184,9 +192,18 @@
 msgstr "无法确定您的 tty 终端名。"
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s:内存溢出\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) 失败\n"
 
+#, fuzzy
+#| msgid "No\n"
+msgid "No"
+msgstr "否\n"
+
 msgid "Password: "
 msgstr "密码:"
 
@@ -194,6 +211,11 @@
 msgid "%s's Password: "
 msgstr "%s 的密码:"
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s:字段太长\n"
+
 #, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
@@ -287,42 +309,33 @@
 msgstr "%s:没有权限。\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s:无法确定您的用户名。\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s:PAM 验证失败\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s:无法锁定密码文件\n"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s:无法锁定文件,请稍后再试。\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s:无法打开密码文件\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s:无法打开文件 %s\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s:无法锁定影子密码文件\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s:fork 失败:%s"
 
-#, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s:无法打开影子密码文件\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr "%s:无法降低权限(%s)\n"
 
 #, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s:无法重写影子密码文件\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s:无法重写密码文件\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s:无法更新密码文件\n"
-
-#, c-format
-msgid "%s: can't update shadow password file\n"
-msgstr "%s:无法更新影子密码文件\n"
-
-#, c-format
 msgid "%s: the shadow password file is not present\n"
 msgstr "%s:影子密码文件不存在\n"
 
@@ -330,9 +343,9 @@
 msgid "%s: failed to drop privileges (%s)\n"
 msgstr "%s:无法降低权限(%s)\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s:未知用户:%s\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s:用户 %s 不存在\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -357,57 +370,27 @@
 msgid "Full Name"
 msgstr "全名"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\t全名:%s\n"
+#, fuzzy, c-format
+#| msgid "%s: %s\n"
+msgid "\t%s: %s\n"
+msgstr "%s:%s\n"
 
 msgid "Room Number"
 msgstr "房间号码"
 
-#, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "\t房间号码:%s\n"
-
 msgid "Work Phone"
 msgstr "工作电话"
 
-#, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "\t工作电话:%s\n"
-
 msgid "Home Phone"
 msgstr "家庭电话"
 
-#, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "\t家庭电话:%s\n"
-
 msgid "Other"
 msgstr "其它"
 
 msgid "Cannot change ID to root.\n"
 msgstr "无法改变 ID 到 root。\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 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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -440,9 +423,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s:“%s”包含非法字符\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s:无法确定您的用户名。\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s:用户 %s 不存在\n"
 
 #, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -490,7 +473,7 @@
 msgstr "%s:无效的数字参数“%s”\n"
 
 #, fuzzy, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s:-a 标志只允许和 -G 标志一起使用\n"
 
 #, c-format
@@ -502,30 +485,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s:无法锁定组文件\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s:无法打开组文件\n"
-
-#, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s:无法锁定 gshadow 文件\n"
-
-#, c-format
-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,38 +492,24 @@
 msgid "%s: line %d: missing new password\n"
 msgstr "%s:第 %d 行:缺少新密码\n"
 
-#, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s:第 %d 行:未知组 %s\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s:%s 组不存在\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s:用户 %s 不存在\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s:更新影子文件时出错。\n"
-
-#, c-format
-msgid "%s: error updating password 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"
-
 #, fuzzy
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
@@ -583,8 +528,9 @@
 msgid "Login Shell"
 msgstr "登录 Shell"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "您不能为 %s 更改 shell。\n"
 
 #, c-format
@@ -595,17 +541,14 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s:无效的条目:%s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s 是无效的 shell。\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "用法:expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s:未知用户\n"
-
 #, fuzzy
 msgid ""
 "Usage: faillog [options]\n"
@@ -613,7 +556,7 @@
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -639,11 +582,16 @@
 "\t\t\t\t项合用)\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "登录        失败次数  最多   最近                     于\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [还剩 %lds]"
 
 #, c-format
@@ -651,76 +599,67 @@
 msgstr " [锁定 %lds]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "未知用户:%s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "用法:%s [-r|-R] 组\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a 用户] 组\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d 用户] 组\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "未知用户:%s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A 用户,...] [-M 用户,...] 组\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s:无法打开文件 %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M 用户,...] 组\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s:-A 需要影子组密码\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s:无法获得锁\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s:无法获得影子锁\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "无法更改 %s 的密码。\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s:无法打开文件\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s:-A 需要影子组密码\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s:无法打开文件\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s:%s 组不存在\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s:无法打开影子文件\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s:fork 失败:%s"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -739,9 +678,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s:请稍后重试\n"
 
-msgid "Who are you?\n"
-msgstr "你是谁?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "正在将用户“%s”加入到“%s”组中\n"
@@ -750,9 +686,9 @@
 msgid "Removing user %s from group %s\n"
 msgstr "正在将用户“%s”从“%s”组中删除\n"
 
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s:未知成员 %s\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s:用户 %s 不存在\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -784,111 +720,90 @@
 "  -o, --non-unique\t\t允许使用重复的(非唯一的) GID 创建组\n"
 "\n"
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s:增加新组条目时出错\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s:%s 不是有效的组名\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s:无法重写组文件\n"
+#, fuzzy, c-format
+#| msgid "%s: invalid group %s\n"
+msgid "%s: invalid group ID '%s'\n"
+msgstr "%s:无效组名 %s\n"
 
 #, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s:无法重写影子组文件\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s:无法锁定组文件\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s:无法打开组文件\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s:无法锁定影子组文件\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s:无法打开影子组文件\n"
-
-#, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s:-K 需要 KEY=VALUE\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 msgstr "%s:%s 组已存在\n"
 
-#, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s:GID %u 并不唯一\n"
-
 #, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s:无法创建 %s\n"
+#| msgid "Member already exists\n"
+msgid "%s: GID '%lu' already exists\n"
+msgstr "成员已经存在\n"
 
 msgid "Usage: groupdel group\n"
 msgstr "用法:groupdel 组\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s:删除组条目时出错\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s:无法将目录 %s 改名为 %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s:删除影子组条目时出错\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s:不能在 NIS 客户端上修改用户“%s”。\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s:不能删除用户的主组。\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s:%s 组不存在\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s:%s 组是一个 NIS 组\n"
+#, fuzzy, c-format
+#| msgid "%s: group '%s' is a NIS group.\n"
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s:“%s”组是一个 NIS 组。\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s:%s 是 NIS 管理员\n"
 
-msgid "Member already exists\n"
-msgstr "成员已经存在\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s:用户 %s 是 NIS 用户\n"
 
-msgid "Member to remove could not be found\n"
-msgstr "没有找到要删除的成员\n"
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s:update_group 内存溢出\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
-msgstr "用法:groupmems -a 用户名 | -d 用户名 | -D | -l [-g 组名]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
+msgstr ""
 
-msgid "Only root can add members to different groups\n"
-msgstr "只有 root 能向不同的组里添加成员\n"
-
-msgid "Group access is required\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
 msgstr ""
 
-msgid "Not primary owner of current group\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-msgid "PAM authentication failed for\n"
-msgstr "PAM 验证失败于\n"
-
-msgid "Unable to lock group file\n"
-msgstr "无法锁定组文件\n"
-
-msgid "Unable to open group file\n"
-msgstr "无法打开组文件\n"
-
-msgid "Cannot close group file\n"
-msgstr "无法关闭组文件\n"
-
 #, fuzzy
 msgid ""
 "Usage: groupmod [options] GROUP\n"
@@ -912,41 +827,19 @@
 "  -o, --non-unique\t\t允许使用重复的(非唯一的) GID 创建组\n"
 "\n"
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s:未在 /etc/group 中找到 %s\n"
-
-#, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s:%u 不是一个独有的 GID\n"
-
-#, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s:%s 不是一个独有的名称\n"
-
 #, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s:无法重写密码文件\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "无效的组名“%s”\n"
 
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s:无法锁定密码文件\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s:%s 组是一个 NIS 组\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s:无法打开密码文件\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s:未知用户:%s\n"
 
 #, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s:不能在 NIS 客户端上修改用户“%s”。\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "用法:%s [-r] [-s] [组 [gshadow]]\n"
 
@@ -958,18 +851,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s:-s 和 -r 是互不兼容的\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s:无法锁定文件 %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-msgstr "%s:无法打开文件 %s\n"
-
-#, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s:无法更新文件 %s\n"
-
 msgid "invalid group file entry"
 msgstr "无效的组文件条目"
 
@@ -984,6 +865,11 @@
 msgid "invalid group name '%s'\n"
 msgstr "无效的组名“%s”\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid group ID '%lu'\n"
+msgstr "无效的组名“%s”\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "%s 组:无用户 %s\n"
@@ -997,17 +883,9 @@
 msgstr "在 %s 中没有找到匹配的组文件条目\n"
 
 #, fuzzy, c-format
-msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "%s 影子组:无用户 %s\n"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s:无法为 %s 更新影子条目\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s:无法更新 %s 组的条目\n"
-
 msgid "invalid shadow group file entry"
 msgstr "无效的影子组文件条目"
 
@@ -1034,30 +912,21 @@
 msgid "%s: no changes\n"
 msgstr "%s:无改变\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s:无法锁定影子组文件\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "用法:groupdel 组\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s:无法打开影子组文件\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "用法:groupdel 组\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s:无法删除影子组 %s\n"
+#, fuzzy, c-format
+#| msgid "%s: Cannot execute %s"
+msgid "%s: cannot delete %s\n"
+msgstr "%s:无法执行 %s"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s:无法更新影子组文件\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s 无法更新组文件\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s:无法删除影子组文件\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "用法:id [-a]\n"
 
@@ -1088,6 +957,10 @@
 "  -u, --user LOGIN\t打印 LOGIN 用户的 lastlog 记录\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "用户名           端口     来自             最后登陆时间"
 
@@ -1097,15 +970,15 @@
 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"
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "用法:%s [-p] [名称]\n"
 
@@ -1202,6 +1075,11 @@
 "超过登录时间\n"
 "\n"
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "用法:id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "用法:newgrp [-] [组]\n"
 
@@ -1216,14 +1094,10 @@
 msgid "%s: failure forking: %s\n"
 msgstr "%s:fork 失败:%s"
 
-#, c-format
-msgid "unknown UID: %u\n"
-msgstr "未知的 UID:%u\n"
+#, fuzzy, c-format
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s:用户 %s 不存在\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "未知的 GID:%lu\n"
-
 msgid "too many groups\n"
 msgstr "用户组过多\n"
 
@@ -1237,60 +1111,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s:%s 组不存在\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "无效的组名“%s”\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s:无效的用户名“%s”\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s:用户 %s 不存在\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s:用户 %s 不存在\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s:无效的用户名“%s”\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s:无法锁定 /etc/passwd。\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s:无法锁定 /etc/passwd。\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s:无法锁定 /etc/passwd。\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s:无法锁定 /etc/passwd。\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1306,9 +1139,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s:第 %d 行:无法创建 GID\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s:第 %d 行:无法找到用户 %s\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s:用户 %s 不存在\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1339,15 +1172,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1416,13 +1249,10 @@
 msgstr "无法更改 %s 的密码。\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s:内存溢出\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1465,16 +1295,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "无效的用户名“%s”\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "无效的用户名“%s”\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "用户 %s:无 %u 组\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "用户 %s:目录 %s 不存在\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "用户 %s:程序 %s 不存在\n"
 
 #, c-format
@@ -1485,10 +1323,6 @@
 msgid "add user '%s' in %s? "
 msgstr ""
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s:无法为 %s 更新密码条目\n"
-
 msgid "invalid shadow password file entry"
 msgstr "无效的影子密码文件项"
 
@@ -1499,34 +1333,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "用户 %s:最近一次密码改动\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s:无法锁定密码文件\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s:无法打开文件 %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s:无法打开密码文件\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "用法:id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s:无法为 %s 删除影子条目\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s:无法更新影子文件\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "用法:id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s:无法更新密码文件\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s:不能更新用户 %s 的条目\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s:无法删除影子密码文件\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "su 到该帐户被拒。\n"
 
@@ -1592,6 +1417,16 @@
 "%s:%s\n"
 "(忽略)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s:PAM 验证失败\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "您没有被授权 su %s\n"
+
 msgid "No shell\n"
 msgstr "没有 shell\n"
 
@@ -1617,14 +1452,6 @@
 msgstr "正在进入系统维护模式"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s:未知的 GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s:未知的组 %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s:无法创建新的默认文件\n"
 
@@ -1665,10 +1492,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1704,14 +1533,6 @@
 "\n"
 
 #, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s:update_group 内存溢出\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s:update_gshadow 内存溢出\n"
-
-#, fuzzy, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s:无效的主目录“%s”\n"
 
@@ -1748,50 +1569,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s:无效的用户名“%s”\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s:无法重写密码文件\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s:无法重写影子密码文件\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s:无法锁定影子密码文件\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s:无法打开影子密码文件\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s:锁定组文件时出错\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s:打开组文件时出错\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s:锁定影子组文件时出错\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s:打开影子组文件时出错\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s:加入新密码项时出错\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s:加入新影子密码项时出错\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s:无法创建目录 %s\n"
 
@@ -1805,8 +1590,9 @@
 msgid "Setting mailbox file permissions"
 msgstr "正在设置信箱文件访问权限"
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s:用户 %s 已存在\n"
 
 #, c-format
@@ -1818,10 +1604,15 @@
 msgid "%s: can't create user\n"
 msgstr "%s:无法创建 %s\n"
 
-#, c-format
-msgid "%s: UID %u is not unique\n"
+#, fuzzy, c-format
+#| msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s:UID %u 并不唯一\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s:无法创建 %s\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
@@ -1830,10 +1621,6 @@
 "%s:警告:此主目录已经存在。\n"
 "不从 skel 目录里向其中复制任何文件。\n"
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr "%s:警告:CREATE_HOME 未被支持,请使用 -m 参数。\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1845,51 +1632,26 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s:更新组条目时出错\n"
-
-#, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr "%s:不能删除 %s 组,因为它是另外一个用户的主组。\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s:更新组条目时出错\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s:无法打开组文件\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s:无法打开影子组文件\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s:删除密码项时出错\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s:删除影子密码项时出错\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s:用户 %s 目前已登录\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s:警告:无法删除"
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s:%s 并不属于 %s,所以不会删除\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s:警告:无法删除"
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s:用户 %s 不存在\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s:用户 %s 是 NIS 用户\n"
 
@@ -1949,9 +1711,16 @@
 "  -U, --unlock\t\t\t解锁用户帐号\n"
 "\n"
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s:增加新组条目时出错\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s:用户 %s 已存在\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -1965,23 +1734,12 @@
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
 msgstr ""
 
-#, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s:uid %lu 不唯一\n"
+#, fuzzy, c-format
+#| msgid "Member already exists\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr "成员已经存在\n"
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s:改变密码项时出错\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s:删除密码项时出错\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s:删除影子密码项时出错\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s:目录 %s 不存在\n"
 
@@ -2002,6 +1760,14 @@
 msgstr "%s:无法将目录 %s 改名为 %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s:警告:%s 不属于 %s\n"
 
@@ -2015,7 +1781,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 #, fuzzy
@@ -2040,10 +1806,16 @@
 "  -s, --shadow\t\t\t编辑 shadow 或 gshadow 数据库\n"
 "\n"
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to drop privileges (%s)\n"
+msgid "%s: failed to remove %s\n"
+msgstr "%s:无法降低权限(%s)\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s:%s 没有更改\n"
@@ -2058,6 +1830,415 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s:无法恢复 %s:%s (您的修改在 %s 中)\n"
 
+#~ msgid "%s: can't lock password file\n"
+#~ msgstr "%s:无法锁定密码文件\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s:无法打开密码文件\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s:无法锁定影子密码文件\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s:无法打开影子密码文件\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s:无法重写影子密码文件\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s:无法重写密码文件\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s:无法更新密码文件\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s:无法更新影子密码文件\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\t全名:%s\n"
+
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "\t房间号码:%s\n"
+
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "\t工作电话:%s\n"
+
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "\t家庭电话:%s\n"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr "无法锁定密码文件;稍后再试。\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "无法打开密码文件。\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s:无法锁定组文件\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s:无法打开组文件\n"
+
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s:无法锁定 gshadow 文件\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s:无法打开影子文件\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s:更新影子文件时出错。\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s:更新组条目时出错\n"
+
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s:第 %d 行:未知组 %s\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s:第 %d 行:无法更新条目\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s:无法锁定影子文件\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s:更新影子文件时出错。\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s:更新密码文件时出错。\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s:第 %d 行:未知用户 %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s:第 %d 行:无法更新密码条目\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s:未知用户\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "未知用户:%s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "用法:%s [-r|-R] 组\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a 用户] 组\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d 用户] 组\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A 用户,...] [-M 用户,...] 组\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M 用户,...] 组\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s:无法获得锁\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s:无法获得影子锁\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s:无法打开文件\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s:无法重写文件\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s:无法重写影子文件\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s 无法解锁文件。\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s:无法更新条目\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s:无法更新影子条目\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "未知组:%s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s:无法打开文件\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s:无法打开影子文件\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "你是谁?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s:未知成员 %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s:增加新组条目时出错\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s:无法重写组文件\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s:无法重写影子组文件\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s:无法锁定组文件\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s:无法打开组文件\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s:无法锁定影子组文件\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s:无法打开影子组文件\n"
+
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s:GID %u 并不唯一\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s:删除组条目时出错\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s:删除影子组条目时出错\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s:不能删除用户的主组。\n"
+
+#~ msgid "Member to remove could not be found\n"
+#~ msgstr "没有找到要删除的成员\n"
+
+#~ msgid ""
+#~ "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+#~ msgstr "用法:groupmems -a 用户名 | -d 用户名 | -D | -l [-g 组名]\n"
+
+#~ msgid "Only root can add members to different groups\n"
+#~ msgstr "只有 root 能向不同的组里添加成员\n"
+
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "PAM 验证失败于\n"
+
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "无法锁定组文件\n"
+
+#~ msgid "Unable to open group file\n"
+#~ msgstr "无法打开组文件\n"
+
+#~ msgid "Cannot close group file\n"
+#~ msgstr "无法关闭组文件\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s:未在 /etc/group 中找到 %s\n"
+
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s:%u 不是一个独有的 GID\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s:%s 不是一个独有的名称\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s:无法重写密码文件\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s:无法锁定密码文件\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s:无法打开密码文件\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s:无法锁定文件 %s\n"
+
+#~ msgid "%s: cannot update file %s\n"
+#~ msgstr "%s:无法更新文件 %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s:无法为 %s 更新影子条目\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s:无法更新 %s 组的条目\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s:无法锁定影子组文件\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s:无法打开影子组文件\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s:无法删除影子组 %s\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s:无法更新影子组文件\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s 无法更新组文件\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s:无法删除影子组文件\n"
+
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "未知的 UID:%u\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "未知的 GID:%lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s:%s 组不存在\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s:用户 %s 不存在\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s:无效的用户名“%s”\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s:无法锁定 /etc/passwd。\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s:无法锁定 /etc/passwd。\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s:无法锁定 /etc/passwd。\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s:无法锁定 /etc/passwd。\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s:无法打开文件\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s:更新文件出错\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s:第 %d 行:无法找到用户 %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s:无法为 %s 更新密码条目\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s:无法锁定密码文件\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s:无法打开密码文件\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s:无法为 %s 删除影子条目\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s:无法更新影子文件\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s:无法更新密码文件\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s:不能更新用户 %s 的条目\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s:无法删除影子密码文件\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s:未知的 GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s:未知的组 %s\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s:update_gshadow 内存溢出\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s:无法重写密码文件\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s:无法重写影子密码文件\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s:无法锁定影子密码文件\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s:无法打开影子密码文件\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s:锁定组文件时出错\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s:打开组文件时出错\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s:锁定影子组文件时出错\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s:打开影子组文件时出错\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s:加入新密码项时出错\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s:加入新影子密码项时出错\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr "%s:警告:CREATE_HOME 未被支持,请使用 -m 参数。\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s:更新组条目时出错\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s:更新组条目时出错\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s:无法打开组文件\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s:无法打开影子组文件\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s:删除密码项时出错\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s:删除影子密码项时出错\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s:用户 %s 不存在\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s:增加新组条目时出错\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s:uid %lu 不唯一\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s:改变密码项时出错\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s:删除密码项时出错\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s:删除影子密码项时出错\n"
+
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s:无法获取独有的 GID\n"
 
@@ -2069,18 +2250,12 @@
 #~ msgid " on '%.100s'"
 #~ msgstr "在“%.100s”上"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s:无法锁定文件,请稍后再试。\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s:第 %d 行:无法创建 UID\n"
 
 #~ msgid "%s: name %s is not unique\n"
 #~ msgstr "%s:名称 %s 并不唯一\n"
 
-#~ msgid "No\n"
-#~ msgstr "否\n"
-
 #~ msgid ""
 #~ "Usage: chgpasswd [options]\n"
 #~ "\n"
@@ -2118,9 +2293,6 @@
 #~ msgid "Usage: %s [-s shell] [name]\n"
 #~ msgstr "用法:%s [-s shell] [名称]\n"
 
-#~ msgid "%s: invalid group %s\n"
-#~ msgstr "%s:无效组名 %s\n"
-
 #~ msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n"
 #~ msgstr "用法:groupmod [-g gid [-o]] [-n 名称] 组\n"
 
@@ -2155,9 +2327,6 @@
 #~ msgid "%s: PAM chauthtok failed\n"
 #~ msgstr "%s:PAM chauthtok 失败\n"
 
-#~ msgid "%s: Cannot execute %s"
-#~ msgstr "%s:无法执行 %s"
-
 #, fuzzy
 #~ msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 #~ msgstr "用法:%s\t[-u uid [-o]] [-g 组] [-G 组,...] \n"

Modified: upstream/trunk/po/zh_TW.po
===================================================================
--- upstream/trunk/po/zh_TW.po	2009-04-05 23:50:58 UTC (rev 2598)
+++ upstream/trunk/po/zh_TW.po	2009-04-05 23:52:46 UTC (rev 2599)
@@ -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: 2008-05-24 21:01+0200\n"
+"POT-Creation-Date: 2009-04-06 00:47+0200\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"
@@ -57,6 +57,9 @@
 msgid "  Choose a new password."
 msgstr "  請選擇一個新密碼。"
 
+msgid "You must change your password."
+msgstr ""
+
 #, c-format
 msgid "Your password will expire in %ld days.\n"
 msgstr "您的密碼將在 %ld 天內過期。\n"
@@ -68,7 +71,12 @@
 msgstr "您的密碼今天過期。"
 
 #, c-format
-msgid "Unable to change tty %s"
+msgid "Cannot open audit interface - aborting.\n"
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "Unable to change tty %s"
+msgid "Unable to change owner or mode of tty stdin: %s"
 msgstr "無法改變 tty %s"
 
 msgid "Environment overflow\n"
@@ -89,12 +97,12 @@
 "距離上一次登錄已有 %d 次登錄失敗。\n"
 "最後一次是 %s 在 %s 上。\n"
 
-#, fuzzy
-msgid "Can't get unique UID (no more available UIDs)\n"
+#, fuzzy, c-format
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s:無法獲取獨有的 gid\n"
 
-#, fuzzy
-msgid "Can't get unique GID (no more available GIDs)\n"
+#, fuzzy, c-format
+msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "%s:無法獲取獨有的 gid\n"
 
 msgid "Too many logins.\n"
@@ -188,9 +196,17 @@
 msgstr "%s:無法確定您的使用者名稱。\n"
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s:記憶體不足\n"
+
+#, c-format
 msgid "malloc(%d) failed\n"
 msgstr "malloc(%d) 失敗\n"
 
+#, fuzzy
+msgid "No"
+msgstr "取消"
+
 msgid "Password: "
 msgstr "密碼:"
 
@@ -198,6 +214,11 @@
 msgid "%s's Password: "
 msgstr "%s 的密碼:"
 
+#, fuzzy, c-format
+#| msgid "%s: fields too long\n"
+msgid "%s: failed to unlock %s\n"
+msgstr "%s:字段太長\n"
+
 #, fuzzy
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
@@ -289,41 +310,31 @@
 msgstr "%s:權限被拒。\n"
 
 #, c-format
+msgid "%s: Cannot determine your user name.\n"
+msgstr "%s:無法確定您的使用者名稱。\n"
+
+#, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s:PAM 驗証失敗\n"
 
-#, c-format
-msgid "%s: can't lock password file\n"
-msgstr "%s:無法鎖定密碼檔\n"
+#, fuzzy, c-format
+#| msgid "%s: can't lock files, try again later\n"
+msgid "%s: cannot lock %s; try again later.\n"
+msgstr "%s:無法鎖定檔案,請稍後再試。\n"
 
-#, c-format
-msgid "%s: can't open password file\n"
-msgstr "%s:無法打開密碼文件\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot open %s\n"
+msgstr "%s:無法打開檔案 %s\n"
 
-#, c-format
-msgid "%s: can't lock shadow password file\n"
-msgstr "%s:無法鎖定shadow密碼文件\n"
+#, fuzzy, c-format
+msgid "%s: failure while writing changes to %s\n"
+msgstr "%s:無效的工作電話:“%s”\n"
 
 #, c-format
-msgid "%s: can't open shadow password file\n"
-msgstr "%s:無法打開影子密碼文件\n"
+msgid "%s: failed to prepare the new %s entry '%s'\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't rewrite shadow password file\n"
-msgstr "%s:無法重寫shadow密碼檔案\n"
-
-#, c-format
-msgid "%s: can't rewrite password file\n"
-msgstr "%s:無法重寫密碼檔案\n"
-
-#, c-format
-msgid "%s: can't update password file\n"
-msgstr "%s:無法更新密碼檔案\n"
-
-#, c-format
-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"
@@ -332,9 +343,9 @@
 msgid "%s: failed to drop privileges (%s)\n"
 msgstr ""
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s:未知使用者:%s\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist in %s\n"
+msgstr "%s:使用者 %s 不存在\n"
 
 #, c-format
 msgid "Changing the aging information for %s\n"
@@ -359,57 +370,26 @@
 msgid "Full Name"
 msgstr "全名"
 
-#, c-format
-msgid "\tFull Name: %s\n"
-msgstr "\t全名:%s\n"
+#, fuzzy, c-format
+msgid "\t%s: %s\n"
+msgstr "passwd:%s\n"
 
 msgid "Room Number"
 msgstr "房間號碼"
 
-#, fuzzy, c-format
-msgid "\tRoom Number: %s\n"
-msgstr "房間號碼"
-
 msgid "Work Phone"
 msgstr "工作電話"
 
-#, fuzzy, c-format
-msgid "\tWork Phone: %s\n"
-msgstr "工作電話"
-
 msgid "Home Phone"
 msgstr "住家電話"
 
-#, fuzzy, c-format
-msgid "\tHome Phone: %s\n"
-msgstr "住家電話"
-
 msgid "Other"
 msgstr "其它"
 
 msgid "Cannot change ID to root.\n"
 msgstr "無法改變 ID 成 root。\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 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: name with non-ASCII characters: '%s'\n"
 msgstr ""
 
@@ -441,9 +421,9 @@
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s:“%s”包含無效字元\n"
 
-#, c-format
-msgid "%s: Cannot determine your user name.\n"
-msgstr "%s:無法確定您的使用者名稱。\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' does not exist\n"
+msgstr "%s:使用者 %s 不存在\n"
 
 #, fuzzy, c-format
 msgid "%s: cannot change user '%s' on NIS client.\n"
@@ -490,9 +470,10 @@
 msgid "%s: invalid numeric argument '%s'\n"
 msgstr "%s:無效的數字參數“%s”\n"
 
-#, c-format
-msgid "%s: %s flag is ONLY allowed with the %s flag\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: do not include \"l\" with other flags\n"
+msgid "%s: %s flag is only allowed with the %s flag\n"
+msgstr "%s:請不要與其它標誌一同使用“l”\n"
 
 #, c-format
 msgid "%s: the -c, -e, and -m flags are exclusive\n"
@@ -503,30 +484,6 @@
 msgstr ""
 
 #, c-format
-msgid "%s: can't lock group file\n"
-msgstr "%s:無法鎖定群組檔案\n"
-
-#, c-format
-msgid "%s: can't open group file\n"
-msgstr "%s:無法打開群組檔案\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock gshadow file\n"
-msgstr "%s:無法鎖定 shadow 檔\n"
-
-#, c-format
-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"
 
@@ -535,37 +492,23 @@
 msgstr "%s:第 %d 行:缺少新密碼\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: unknown group %s\n"
-msgstr "%s:第 %d 行:未知使用者 %s\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: line %d: group '%s' does not exist\n"
+msgstr "%s:%s 群組不存在\n"
 
 #, fuzzy, c-format
-msgid "%s: line %d: cannot update group entry\n"
+#| msgid "%s: line %d: can't update entry\n"
+msgid "%s: line %d: failed to prepare the new %s entry '%s'\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"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist\n"
+msgstr "%s:使用者 %s 不存在\n"
 
-#, c-format
-msgid "%s: error updating shadow file\n"
-msgstr "%s:更新shadow檔案時出錯。\n"
-
-#, c-format
-msgid "%s: error updating password 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"
@@ -578,8 +521,9 @@
 msgid "Login Shell"
 msgstr "登入 Shell"
 
-#, c-format
-msgid "You may not change the shell for %s.\n"
+#, fuzzy, c-format
+#| msgid "You may not change the shell for %s.\n"
+msgid "You may not change the shell for '%s'.\n"
 msgstr "您不能為 %s 更改 shell。\n"
 
 #, c-format
@@ -590,17 +534,14 @@
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s:無效的項目:%s\n"
 
-#, c-format
-msgid "%s is an invalid shell.\n"
+#, fuzzy, c-format
+#| msgid "%s is an invalid shell.\n"
+msgid "%s: %s is an invalid shell.\n"
 msgstr "%s 是無效的 shell。\n"
 
 msgid "Usage: expiry {-f|-c}\n"
 msgstr "用法:expiry {-f|-c}\n"
 
-#, c-format
-msgid "%s: unknown user\n"
-msgstr "%s:未知使用者\n"
-
 #, fuzzy
 msgid ""
 "Usage: faillog [options]\n"
@@ -608,7 +549,7 @@
 "Options:\n"
 "  -a, --all                     display faillog records for all users\n"
 "  -h, --help                    display this help message and exit\n"
-"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"  -l, --lock-time SEC           after failed login lock account to SEC "
 "seconds\n"
 "  -m, --maximum MAX             set maximum failed login counters to MAX\n"
 "  -r, --reset                   reset the counters of login failures\n"
@@ -633,11 +574,16 @@
 "\t\t\t\t及限制(當和 -r、-m 或 -l 選項搭配使用時)\n"
 "\n"
 
+#, c-format
+msgid "faillog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Login       Failures Maximum Latest                   On\n"
 msgstr "登入        失敗     最多    最後                     在\n"
 
-#, c-format
-msgid " [%lds left]"
+#, fuzzy, c-format
+#| msgid " [%lds left]"
+msgid " [%lus left]"
 msgstr " [還剩 %lds]"
 
 #, c-format
@@ -645,76 +591,67 @@
 msgstr " [鎖定 %lds]"
 
 #, c-format
-msgid "Unknown User: %s\n"
-msgstr "未知使用者:%s\n"
+msgid "faillog: Failed to reset fail count for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "Usage: %s [-r|-R] group\n"
-msgstr "用法:%s [-r|-R] 群組\n"
+msgid "faillog: Failed to set max for UID %d\n"
+msgstr ""
 
 #, c-format
-msgid "       %s [-a user] group\n"
-msgstr "       %s [-a 使用者] 群組\n"
+msgid "faillog: Failed to set locktime for UID %d\n"
+msgstr ""
 
-#, c-format
-msgid "       %s [-d user] group\n"
-msgstr "       %s [-d 使用者] 群組\n"
+#, fuzzy, c-format
+msgid "lastlog: Unknown user or range: %s\n"
+msgstr "未知使用者:%s\n"
 
-#, c-format
-msgid "       %s [-A user,...] [-M user,...] group\n"
-msgstr "       %s [-A 使用者,...] [-M 使用者,...] 群組\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "faillog: Cannot open %s: %s\n"
+msgstr "%s:無法打開檔案 %s\n"
 
 #, c-format
-msgid "       %s [-M user,...] group\n"
-msgstr "       %s [-M 使用者,...] 群組\n"
+msgid "faillog: Cannot get the size of %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: shadow group passwords required for -A\n"
-msgstr "%s:-A 需要shadow群組密碼\n"
+msgid ""
+"Usage: %s [option] GROUP\n"
+"\n"
+"Options:\n"
+"  -a, --add USER                add USER to GROUP\n"
+"  -d, --delete USER             remove USER from GROUP\n"
+"  -r, --remove-password         remove the GROUP's password\n"
+"  -R, --restrict                restrict access to GROUP to its members\n"
+"  -M, --members USER,...        set the list of members of GROUP\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get lock\n"
-msgstr "%s:無法獲得鎖定\n"
+msgid ""
+"  -A, --administrators ADMIN,...\n"
+"                                set the list of administrators for GROUP\n"
+"Except for the -A and -M options, the options cannot be combined.\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't get shadow lock\n"
-msgstr "%s:無法獲得shadow鎖定\n"
+#, fuzzy
+#| msgid "The password for %s cannot be changed.\n"
+msgid "The options cannot be combined.\n"
+msgstr "無法更改 %s 的密碼。\n"
 
 #, c-format
-msgid "%s: can't open file\n"
-msgstr "%s:無法打開檔案\n"
+msgid "%s: shadow group passwords required for -A\n"
+msgstr "%s:-A 需要shadow群組密碼\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"
-
 #, fuzzy, c-format
-msgid "%s: can't close file\n"
-msgstr "%s:無法打開檔案\n"
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist in %s\n"
+msgstr "%s:%s 群組不存在\n"
 
 #, fuzzy, c-format
-msgid "%s: can't close shadow file\n"
-msgstr "%s:無法打開 shadow 檔\n"
+msgid "%s: failure while closing read-only %s\n"
+msgstr "%s:無效的工作電話:“%s”\n"
 
 #, c-format
 msgid "Changing the password for group %s\n"
@@ -733,9 +670,6 @@
 msgid "%s: Try again later\n"
 msgstr "%s:請稍後重試\n"
 
-msgid "Who are you?\n"
-msgstr "你是誰?\n"
-
 #, c-format
 msgid "Adding user %s to group %s\n"
 msgstr "正在將使用者“%s”加入到“%s”群組中\n"
@@ -744,9 +678,9 @@
 msgid "Removing user %s from group %s\n"
 msgstr "正在將使用者“%s”從“%s”群組中刪除\n"
 
-#, c-format
-msgid "%s: unknown member %s\n"
-msgstr "%s:未知成員 %s\n"
+#, fuzzy, c-format
+msgid "%s: user '%s' is not a member of '%s'\n"
+msgstr "%s:使用者 %s 不存在\n"
 
 #, c-format
 msgid "%s: Not a tty\n"
@@ -768,115 +702,87 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid "%s: error adding new group entry\n"
-msgstr "%s:增加新群組項目時出錯\n"
-
-#, c-format
-msgid "%s: %s is not a valid group name\n"
+#, fuzzy, c-format
+#| msgid "%s: %s is not a valid group name\n"
+msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s:%s 不是有效的群組名\n"
 
-#, c-format
-msgid "%s: cannot rewrite group file\n"
-msgstr "%s:無法重寫群組檔案\n"
+#, fuzzy, c-format
+msgid "%s: invalid group ID '%s'\n"
+msgstr "無效的群組名“%s”\n"
 
-#, c-format
-msgid "%s: cannot rewrite shadow group file\n"
-msgstr "%s:無法重寫shadow群組檔案\n"
-
-#, c-format
-msgid "%s: unable to lock group file\n"
-msgstr "%s:無法鎖定群組檔案\n"
-
-#, c-format
-msgid "%s: unable to open group file\n"
-msgstr "%s:無法打開群組檔案\n"
-
-#, c-format
-msgid "%s: unable to lock shadow group file\n"
-msgstr "%s:無法鎖定shadow群組檔案\n"
-
-#, c-format
-msgid "%s: unable to open shadow group file\n"
-msgstr "%s:無法打開shadow群組檔案\n"
-
 #, fuzzy, c-format
 msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s:-O 需要 NAME=VALUE\n"
 
-#, c-format
-msgid "%s: group %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s exists\n"
+msgid "%s: group '%s' already exists\n"
 msgstr "%s:%s 群組已存在\n"
 
-#, fuzzy, c-format
-msgid "%s: GID %u is not unique\n"
-msgstr "%s:gid %u 並不唯一\n"
+#, c-format
+msgid "%s: GID '%lu' already exists\n"
+msgstr ""
 
-#, fuzzy, c-format
-msgid "%s: can't create group\n"
-msgstr "%s:無法建立 %s\n"
-
 msgid "Usage: groupdel group\n"
 msgstr "用法:groupdel 群組\n"
 
-#, c-format
-msgid "%s: error removing group entry\n"
-msgstr "%s:刪除群組項目時出錯\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot rename directory %s to %s\n"
+msgid "%s: cannot remove entry '%s' from %s\n"
+msgstr "%s:無法將目錄 %s 改名為 %s\n"
 
-#, c-format
-msgid "%s: error removing shadow group entry\n"
-msgstr "%s:刪除shadow群組項目時出錯\n"
+#, fuzzy, c-format
+msgid "%s: cannot remove the primary group of user '%s'\n"
+msgstr "%s:不能在 NIS 用戶端上修改使用者“%s”。\n"
 
-#, c-format
-msgid "%s: cannot remove user's primary group.\n"
-msgstr "%s:不能刪除使用者的主群組。\n"
-
-#, c-format
-msgid "%s: group %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "%s: group %s does not exist\n"
+msgid "%s: group '%s' does not exist\n"
 msgstr "%s:%s 群組不存在\n"
 
-#, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s:%s 群組是一個 NIS 群組\n"
+#, fuzzy, c-format
+msgid "%s: group '%s' is a NIS group\n"
+msgstr "%s:“%s”群組是一個 NIS 群組。\n"
 
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s:%s 是 NIS 管理員\n"
 
-msgid "Member already exists\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: user %s is a NIS user\n"
+msgid "%s: user '%s' is already a member of '%s'\n"
+msgstr "%s:使用者 %s 是 NIS 使用者\n"
 
-msgid "Member to remove could not be found\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%s: Out of memory. Cannot update %s.\n"
+msgstr "%s:update_group 時記憶體不足\n"
 
-msgid "Usage: groupmems -a username | -d username | -D | -l [-g groupname]\n"
+msgid ""
+"Usage: groupmems [options] [action]\n"
+"\n"
+"Options:\n"
+"  -g, --group groupname         change groupname instead of the user's "
+"group\n"
+"                                (root only)\n"
+"\n"
+"Actions:\n"
+"  -a, --add username            add username to the members of the group\n"
+"  -d, --delete username         remove username from the members of the "
+"group\n"
+"  -p, --purge                   purge all members from the group\n"
+"  -l, --list                    list the members of the group\n"
+"\n"
 msgstr ""
 
-msgid "Only root can add members to different groups\n"
+#, c-format
+msgid "%s: your groupname does not match your username\n"
 msgstr ""
 
-msgid "Group access is required\n"
+#, c-format
+msgid "%s: only root can use the -g/--group option\n"
 msgstr ""
 
-msgid "Not primary owner of current group\n"
-msgstr ""
-
-#, fuzzy
-msgid "PAM authentication failed for\n"
-msgstr "%s:PAM 驗証失敗\n"
-
-#, fuzzy
-msgid "Unable to lock group file\n"
-msgstr "%s:無法鎖定群組檔案\n"
-
-#, fuzzy
-msgid "Unable to open group file\n"
-msgstr "%s:無法打開群組檔案\n"
-
-#, fuzzy
-msgid "Cannot close group file\n"
-msgstr "%s:無法打開群組檔案\n"
-
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
@@ -890,41 +796,19 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid "%s: %s not found in /etc/group\n"
-msgstr "%s:未在 /etc/group 中找到 %s\n"
-
 #, fuzzy, c-format
-msgid "%s: %u is not a unique GID\n"
-msgstr "%s:%u 不是一個唯一的 gid\n"
+msgid "%s: invalid group name '%s'\n"
+msgstr "無效的群組名“%s”\n"
 
 #, c-format
-msgid "%s: %s is not a unique name\n"
-msgstr "%s:%s 不是一個唯一的名稱\n"
+msgid "%s: group %s is a NIS group\n"
+msgstr "%s:%s 群組是一個 NIS 群組\n"
 
-#, fuzzy, c-format
-msgid "%s: cannot rewrite passwd file\n"
-msgstr "%s:無法重寫密碼檔案\n"
-
 #, c-format
-msgid "%s: unable to lock password file\n"
-msgstr "%s:無法鎖定密碼檔案\n"
+msgid "%s: unknown user %s\n"
+msgstr "%s:未知使用者:%s\n"
 
 #, c-format
-msgid "%s: unable to open password file\n"
-msgstr "%s:無法打開密碼檔案\n"
-
-#, c-format
-msgid ""
-"%s: cannot change the primary group of user '%s' from %u to %u, since it is "
-"not in the passwd file.\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s: cannot change the primary group of user '%s' from %u to %u.\n"
-msgstr "%s:不能在 NIS 用戶端上修改使用者“%s”。\n"
-
-#, c-format
 msgid "Usage: %s [-r] [-s] [group [gshadow]]\n"
 msgstr "用法:%s [-r] [-s] [群組 [gshadow]]\n"
 
@@ -936,18 +820,6 @@
 msgid "%s: -s and -r are incompatibile\n"
 msgstr "%s:-s 和 -r 是互不相容的\n"
 
-#, c-format
-msgid "%s: cannot lock file %s\n"
-msgstr "%s:無法鎖定檔案 %s\n"
-
-#, c-format
-msgid "%s: cannot open file %s\n"
-msgstr "%s:無法打開檔案 %s\n"
-
-#, c-format
-msgid "%s: cannot update file %s\n"
-msgstr "%s:無法更新檔案 %s\n"
-
 msgid "invalid group file entry"
 msgstr "無效的群組檔案項目"
 
@@ -962,6 +834,10 @@
 msgid "invalid group name '%s'\n"
 msgstr "無效的群組名“%s”\n"
 
+#, fuzzy, c-format
+msgid "invalid group ID '%lu'\n"
+msgstr "無效的群組名“%s”\n"
+
 #, c-format
 msgid "group %s: no user %s\n"
 msgstr "%s 群組:無使用者 %s\n"
@@ -975,17 +851,9 @@
 msgstr "沒有找到匹配的群組檔案項目\n"
 
 #, fuzzy, c-format
-msgid "add group '%s' in %s ?"
+msgid "add group '%s' in %s? "
 msgstr "%s shadow群組:無使用者 %s\n"
 
-#, c-format
-msgid "%s: can't update shadow entry for %s\n"
-msgstr "%s:無法為 %s 更新shadow項目\n"
-
-#, c-format
-msgid "%s: can't update entry for group %s\n"
-msgstr "%s:無法更新 %s 群組的項目\n"
-
 msgid "invalid shadow group file entry"
 msgstr "無效的shadow群組檔案項目"
 
@@ -1012,30 +880,21 @@
 msgid "%s: no changes\n"
 msgstr "%s:無改變\n"
 
-#, c-format
-msgid "%s: can't lock shadow group file\n"
-msgstr "%s:無法鎖定shadow群組檔案\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpconv\n"
+msgstr "用法:groupdel 群組\n"
 
-#, c-format
-msgid "%s: can't open shadow group file\n"
-msgstr "%s:無法打開shadow群組檔案\n"
+#, fuzzy
+#| msgid "Usage: groupdel group\n"
+msgid "Usage: grpunconv\n"
+msgstr "用法:groupdel 群組\n"
 
-#, c-format
-msgid "%s: can't remove shadow group %s\n"
-msgstr "%s:無法移除shadow群組 %s\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot update file %s\n"
+msgid "%s: cannot delete %s\n"
+msgstr "%s:無法更新檔案 %s\n"
 
-#, c-format
-msgid "%s: can't update shadow group file\n"
-msgstr "%s:無法更新shadow群組檔案\n"
-
-#, c-format
-msgid "%s: can't update group file\n"
-msgstr "%s 無法更新群組檔案\n"
-
-#, c-format
-msgid "%s: can't delete shadow group file\n"
-msgstr "%s:無法刪除shadow群組檔案\n"
-
 msgid "Usage: id [-a]\n"
 msgstr "用法:id [-a]\n"
 
@@ -1065,6 +924,10 @@
 "  -u, --user LOGIN\t根據指定的 LOGIN 列出該使用者最後的歷史記錄\n"
 "\n"
 
+#, c-format
+msgid "lastlog: Failed to get the entry for UID %d\n"
+msgstr ""
+
 msgid "Username         Port     From             Latest"
 msgstr "使用者名         埠號     來自             最後登入時間"
 
@@ -1074,15 +937,15 @@
 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 ""
 
 #, c-format
+msgid "lastlog: Cannot get the size of %s: %s\n"
+msgstr ""
+
+#, c-format
 msgid "Usage: %s [-p] [name]\n"
 msgstr "用法:%s [-p] [名稱]\n"
 
@@ -1181,6 +1044,11 @@
 "\n"
 msgstr ""
 
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: logoutd\n"
+msgstr "用法:id\n"
+
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "用法:newgrp [-] [群組]\n"
 
@@ -1196,13 +1064,9 @@
 msgstr "%s:無效的工作電話:“%s”\n"
 
 #, fuzzy, c-format
-msgid "unknown UID: %u\n"
-msgstr "未知的 GID:%lu\n"
+msgid "%s: GID '%lu' does not exist\n"
+msgstr "%s:使用者 %s 不存在\n"
 
-#, c-format
-msgid "unknown GID: %lu\n"
-msgstr "未知的 GID:%lu\n"
-
 msgid "too many groups\n"
 msgstr "使用者群組過多\n"
 
@@ -1216,60 +1080,19 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: group ID `%s' is not valid\n"
+msgid "%s: group '%s' is a shadow group, but does not exist in /etc/group\n"
 msgstr "%s:%s 群組不存在\n"
 
 #, fuzzy, c-format
-msgid "%s: invalid group name `%s'\n"
-msgstr "無效的群組名“%s”\n"
+#| msgid "%s: invalid user name '%s'\n"
+msgid "%s: invalid user ID '%s'\n"
+msgstr "%s:無效使用者名稱“%s”\n"
 
-#, 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 ""
-
-#, fuzzy, c-format
-msgid "%s: user ID `%s' is not valid\n"
-msgstr "%s:使用者 %s 不存在\n"
-
-#, fuzzy, c-format
-msgid "%s: user `%s' does not exist\n"
-msgstr "%s:使用者 %s 不存在\n"
-
-#, fuzzy, c-format
-msgid "%s: invalid user name `%s'\n"
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s:無效使用者名稱“%s”\n"
 
 #, c-format
-msgid "%s: can't lock /etc/passwd.\n"
-msgstr "%s:無法鎖定 /etc/passwd。\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/shadow.\n"
-msgstr "%s:無法鎖定 /etc/passwd。\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/group.\n"
-msgstr "%s:無法鎖定 /etc/passwd。\n"
-
-#, fuzzy, c-format
-msgid "%s: can't lock /etc/gshadow.\n"
-msgstr "%s:無法鎖定 /etc/passwd。\n"
-
-#, c-format
-msgid "%s: can't open files\n"
-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"
 
@@ -1285,9 +1108,9 @@
 msgid "%s: line %d: can't create group\n"
 msgstr "%s:第 %d 行:無法建立 GID\n"
 
-#, c-format
-msgid "%s: line %d: cannot find user %s\n"
-msgstr "%s:第 %d 行:無法找到使用者 %s\n"
+#, fuzzy, c-format
+msgid "%s: line %d: user '%s' does not exist in %s\n"
+msgstr "%s:使用者 %s 不存在\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
@@ -1318,15 +1141,15 @@
 "  -k, --keep-tokens             change password only if expired\n"
 "  -i, --inactive INACTIVE       set password inactive after expiration\n"
 "                                to INACTIVE\n"
-"  -l, --lock                    lock the named account\n"
+"  -l, --lock                    lock the password of the named account\n"
 "  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
 "                                change to MIN_DAYS\n"
 "  -q, --quiet                   quiet mode\n"
 "  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
 "  -S, --status                  report password status on the named account\n"
-"  -u, --unlock                  unlock the named account\n"
+"  -u, --unlock                  unlock the password of the named account\n"
 "  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"  -x, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
@@ -1387,13 +1210,10 @@
 msgstr "無法更改 %s 的密碼。\n"
 
 #, c-format
-msgid "%s: out of memory\n"
-msgstr "%s:記憶體不足\n"
-
-#, c-format
 msgid ""
-"%s: unlocking the user would result in a passwordless account.\n"
-"You should set a password with usermod -p to unlock this user account.\n"
+"%s: unlocking the password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock the password of this "
+"account.\n"
 msgstr ""
 
 #, c-format
@@ -1437,16 +1257,24 @@
 msgid "invalid user name '%s'\n"
 msgstr "無效的使用者名稱“%s”\n"
 
-#, c-format
-msgid "user %s: no group %u\n"
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "invalid user ID '%lu'\n"
+msgstr "無效的使用者名稱“%s”\n"
+
+#, fuzzy, c-format
+#| msgid "user %s: no group %u\n"
+msgid "user '%s': no group %lu\n"
 msgstr "使用者 %s:無 %u 群組\n"
 
-#, c-format
-msgid "user %s: directory %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: directory %s does not exist\n"
+msgid "user '%s': directory '%s' does not exist\n"
 msgstr "使用者 %s:目錄 %s 不存在\n"
 
-#, c-format
-msgid "user %s: program %s does not exist\n"
+#, fuzzy, c-format
+#| msgid "user %s: program %s does not exist\n"
+msgid "user '%s': program '%s' does not exist\n"
 msgstr "使用者 %s:程式 %s 不存在\n"
 
 #, fuzzy, c-format
@@ -1457,10 +1285,6 @@
 msgid "add user '%s' in %s? "
 msgstr "%s shadow群組:無使用者 %s\n"
 
-#, c-format
-msgid "%s: can't update passwd entry for %s\n"
-msgstr "%s:無法為 %s 更新密碼項目\n"
-
 msgid "invalid shadow password file entry"
 msgstr "無效的shadow密碼檔案項目"
 
@@ -1471,34 +1295,25 @@
 msgid "user %s: last password change in the future\n"
 msgstr "使用者 %s:最近一次密碼更動\n"
 
-#, c-format
-msgid "%s: can't lock passwd file\n"
-msgstr "%s:無法鎖定密碼檔案\n"
+#, fuzzy, c-format
+#| msgid "%s: cannot open file %s\n"
+msgid "%s: cannot sort entries in %s\n"
+msgstr "%s:無法打開檔案 %s\n"
 
-#, c-format
-msgid "%s: can't open passwd file\n"
-msgstr "%s:無法打開密碼檔案\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwconv\n"
+msgstr "用法:id\n"
 
 #, c-format
-msgid "%s: can't remove shadow entry for %s\n"
-msgstr "%s:無法為 %s 刪除shadow項目\n"
+msgid "%s: failed to change the mode of %s to 0600\n"
+msgstr ""
 
-#, c-format
-msgid "%s: can't update shadow file\n"
-msgstr "%s:無法更新shadow檔案\n"
+#, fuzzy
+#| msgid "Usage: id\n"
+msgid "Usage: pwunconv\n"
+msgstr "用法:id\n"
 
-#, c-format
-msgid "%s: can't update passwd file\n"
-msgstr "%s:無法更新密碼檔案\n"
-
-#, c-format
-msgid "%s: can't update entry for user %s\n"
-msgstr "%s:不能更新使用者 %s 的項目\n"
-
-#, c-format
-msgid "%s: can't delete shadow password file\n"
-msgstr "%s:無法刪除shadow密碼檔案\n"
-
 msgid "Access to su to that account DENIED.\n"
 msgstr "su 到該帳戶被拒。\n"
 
@@ -1553,6 +1368,16 @@
 "%s:%s\n"
 "(忽略)\n"
 
+#, fuzzy, c-format
+#| msgid "%s: PAM authentication failed\n"
+msgid "%s: Authentication failure\n"
+msgstr "%s:PAM 驗証失敗\n"
+
+#, fuzzy, c-format
+#| msgid "You are not authorized to su %s\n"
+msgid "%s: You are not authorized to su at that time\n"
+msgstr "您沒有被授權 su %s\n"
+
 msgid "No shell\n"
 msgstr "沒有 shell\n"
 
@@ -1578,14 +1403,6 @@
 msgstr "正在進入系統維護模式"
 
 #, c-format
-msgid "%s: unknown GID %s\n"
-msgstr "%s:未知的 GID %s\n"
-
-#, c-format
-msgid "%s: unknown group %s\n"
-msgstr "%s:未知的群組 %s\n"
-
-#, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s:無法建立新的預設檔案\n"
 
@@ -1625,10 +1442,12 @@
 "  -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"
+"  -l, --no-log-init             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"
+"  -M, --no-create-home          do not create user's home directory\n"
+"                                (overrides /etc/login.defs)\n"
 "  -N, --no-user-group           do not create a group with the same name as\n"
 "                                the user\n"
 "  -o, --non-unique              allow create user with duplicate\n"
@@ -1644,14 +1463,6 @@
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the group database.\n"
-msgstr "%s:update_group 時記憶體不足\n"
-
-#, fuzzy, c-format
-msgid "%s: Out of memory. Cannot update the shadow group database.\n"
-msgstr "%s:update_gshadow 時記憶體不足\n"
-
-#, fuzzy, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s:無效的主目錄“%s”\n"
 
@@ -1688,50 +1499,14 @@
 msgstr ""
 
 #, c-format
-msgid "%s: invalid user name '%s'\n"
-msgstr "%s:無效使用者名稱“%s”\n"
+msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite password file\n"
-msgstr "%s:無法重寫密碼檔案\n"
+msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+msgstr ""
 
 #, c-format
-msgid "%s: cannot rewrite shadow password file\n"
-msgstr "%s:無法重寫shadow密碼檔案\n"
-
-#, c-format
-msgid "%s: cannot lock shadow password file\n"
-msgstr "%s:無法鎖定shadow密碼檔案\n"
-
-#, c-format
-msgid "%s: cannot open shadow password file\n"
-msgstr "%s:無法打開shadow密碼檔案\n"
-
-#, c-format
-msgid "%s: error locking group file\n"
-msgstr "%s:鎖定群組檔案時出錯\n"
-
-#, c-format
-msgid "%s: error opening group file\n"
-msgstr "%s:打開群組檔案時出錯\n"
-
-#, c-format
-msgid "%s: error locking shadow group file\n"
-msgstr "%s:鎖定shadow群組檔案時出錯\n"
-
-#, c-format
-msgid "%s: error opening shadow group file\n"
-msgstr "%s:打開shadow群組檔案時出錯\n"
-
-#, c-format
-msgid "%s: error adding new password entry\n"
-msgstr "%s:加入新密碼項目時出錯\n"
-
-#, c-format
-msgid "%s: error adding new shadow password entry\n"
-msgstr "%s:加入新shadow密碼項時出錯\n"
-
-#, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s:無法建立目錄 %s\n"
 
@@ -1745,8 +1520,9 @@
 msgid "Setting mailbox file permissions"
 msgstr ""
 
-#, c-format
-msgid "%s: user %s exists\n"
+#, fuzzy, c-format
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists\n"
 msgstr "%s:使用者 %s 已存在\n"
 
 #, c-format
@@ -1760,19 +1536,19 @@
 msgstr "%s:無法建立 %s\n"
 
 #, fuzzy, c-format
-msgid "%s: UID %u is not unique\n"
+msgid "%s: UID %lu is not unique\n"
 msgstr "%s:gid %u 並不唯一\n"
 
+#, fuzzy, c-format
+msgid "%s: can't create group\n"
+msgstr "%s:無法建立 %s\n"
+
 #, c-format
 msgid ""
 "%s: warning: the home directory already exists.\n"
 "Not copying any file from skel directory into it.\n"
 msgstr ""
 
-#, c-format
-msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
-msgstr "%s:警告:CREATE_HOME 不支援,請使用 -m 參數。\n"
-
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
@@ -1784,51 +1560,24 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid "%s: error updating group entry\n"
-msgstr "%s:更新群組項目時出錯\n"
-
 #, fuzzy, c-format
-msgid "%s: Cannot remove group %s which is a primary group for another user.\n"
+msgid "%s: group %s is the primary group of another user and is not removed.\n"
 msgstr "%s:不能刪除使用者的主群組。\n"
 
-#, fuzzy, c-format
-msgid "%s: error updating shadow group entry\n"
-msgstr "%s:更新群組項目時出錯\n"
-
 #, c-format
-msgid "%s: cannot open group file\n"
-msgstr "%s:無法打開群組檔案\n"
-
-#, c-format
-msgid "%s: cannot open shadow group file\n"
-msgstr "%s:無法打開shadow群組檔案\n"
-
-#, c-format
-msgid "%s: error deleting password entry\n"
-msgstr "%s:刪除密碼項目時出錯\n"
-
-#, c-format
-msgid "%s: error deleting shadow password entry\n"
-msgstr "%s:刪除shadow密碼項目時出錯\n"
-
-#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s:使用者 %s 目前已登入\n"
 
+#, fuzzy, c-format
+#| msgid "%s: warning: can't remove "
+msgid "%s: warning: can't remove %s: %s"
+msgstr "%s:警告:無法刪除"
+
 #, c-format
 msgid "%s: %s not owned by %s, not removing\n"
 msgstr "%s:%s 並不屬於 %s,所以不會刪除\n"
 
 #, c-format
-msgid "%s: warning: can't remove "
-msgstr "%s:警告:無法刪除"
-
-#, c-format
-msgid "%s: user %s does not exist\n"
-msgstr "%s:使用者 %s 不存在\n"
-
-#, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s:使用者 %s 是 NIS 使用者\n"
 
@@ -1867,9 +1616,16 @@
 "\n"
 msgstr ""
 
+#, c-format
+msgid ""
+"%s: unlocking the user's password would result in a passwordless account.\n"
+"You should set a password with usermod -p to unlock this user's password.\n"
+msgstr ""
+
 #, fuzzy, c-format
-msgid "%s: error adding new shadow group entry\n"
-msgstr "%s:增加新群組項目時出錯\n"
+#| msgid "%s: user %s exists\n"
+msgid "%s: user '%s' already exists in %s\n"
+msgstr "%s:使用者 %s 已存在\n"
 
 #, c-format
 msgid "%s: no flags given\n"
@@ -1884,22 +1640,10 @@
 msgstr ""
 
 #, c-format
-msgid "%s: uid %lu is not unique\n"
-msgstr "%s:uid %lu 不唯一\n"
+msgid "%s: UID '%lu' already exists\n"
+msgstr ""
 
 #, c-format
-msgid "%s: error changing password entry\n"
-msgstr "%s:改變密碼項目時出錯\n"
-
-#, c-format
-msgid "%s: error removing password entry\n"
-msgstr "%s:移除密碼項時出錯\n"
-
-#, c-format
-msgid "%s: error removing shadow password entry\n"
-msgstr "%s:刪除shadow密碼項目時出錯\n"
-
-#, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s:目錄 %s 不存在\n"
 
@@ -1920,6 +1664,14 @@
 msgstr "%s:無法將目錄 %s 改名為 %s\n"
 
 #, c-format
+msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgstr ""
+
+#, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s:警告:%s 不屬於 %s\n"
 
@@ -1933,7 +1685,7 @@
 msgid ""
 "You have modified %s.\n"
 "You may need to modify %s for consistency.\n"
-"Please use the command `%s' to do so.\n"
+"Please use the command '%s' to do so.\n"
 msgstr ""
 
 msgid ""
@@ -1948,10 +1700,15 @@
 "\n"
 msgstr ""
 
-#, c-format
-msgid ""
-"\n"
-"%s: %s is unchanged\n"
+#, fuzzy, c-format
+msgid "%s: failed to remove %s\n"
+msgstr "%s:無效的工作電話:“%s”\n"
+
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s: %s is unchanged\n"
+msgid "%s: %s is unchanged\n"
 msgstr ""
 "\n"
 "%s:%s 沒有更改\n"
@@ -1966,7 +1723,415 @@
 msgid "%s: can't restore %s: %s (your changes are in %s)\n"
 msgstr "%s:無法復原 %s:%s (您的修改在 %s 中)\n"
 
+#~ msgid "%s: can't lock password file\n"
+#~ msgstr "%s:無法鎖定密碼檔\n"
+
+#~ msgid "%s: can't open password file\n"
+#~ msgstr "%s:無法打開密碼文件\n"
+
+#~ msgid "%s: can't lock shadow password file\n"
+#~ msgstr "%s:無法鎖定shadow密碼文件\n"
+
+#~ msgid "%s: can't open shadow password file\n"
+#~ msgstr "%s:無法打開影子密碼文件\n"
+
+#~ msgid "%s: can't rewrite shadow password file\n"
+#~ msgstr "%s:無法重寫shadow密碼檔案\n"
+
+#~ msgid "%s: can't rewrite password file\n"
+#~ msgstr "%s:無法重寫密碼檔案\n"
+
+#~ msgid "%s: can't update password file\n"
+#~ msgstr "%s:無法更新密碼檔案\n"
+
+#~ msgid "%s: can't update shadow password file\n"
+#~ msgstr "%s:無法更新shadow密碼檔案\n"
+
+#~ msgid "\tFull Name: %s\n"
+#~ msgstr "\t全名:%s\n"
+
 #, fuzzy
+#~ msgid "\tRoom Number: %s\n"
+#~ msgstr "房間號碼"
+
+#, fuzzy
+#~ msgid "\tWork Phone: %s\n"
+#~ msgstr "工作電話"
+
+#, fuzzy
+#~ msgid "\tHome Phone: %s\n"
+#~ msgstr "住家電話"
+
+#~ msgid "Cannot lock the password file; try again later.\n"
+#~ msgstr "無法鎖定密碼檔案﹔稍後再試。\n"
+
+#~ msgid "Cannot open the password file.\n"
+#~ msgstr "無法打開密碼檔案。\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"
+
+#~ msgid "%s: can't lock group file\n"
+#~ msgstr "%s:無法鎖定群組檔案\n"
+
+#~ msgid "%s: can't open group file\n"
+#~ msgstr "%s:無法打開群組檔案\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock gshadow file\n"
+#~ msgstr "%s:無法鎖定 shadow 檔\n"
+
+#~ msgid "%s: can't open shadow file\n"
+#~ msgstr "%s:無法打開 shadow 檔\n"
+
+#, fuzzy
+#~ msgid "%s: error updating gshadow file\n"
+#~ msgstr "%s:更新shadow檔案時出錯。\n"
+
+#, fuzzy
+#~ msgid "%s: error updating group file\n"
+#~ msgstr "%s:更新群組項目時出錯\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: unknown group %s\n"
+#~ msgstr "%s:第 %d 行:未知使用者 %s\n"
+
+#, fuzzy
+#~ msgid "%s: line %d: cannot update group entry\n"
+#~ msgstr "%s:第 %d 行:無法更新項目\n"
+
+#~ msgid "%s: can't lock shadow file\n"
+#~ msgstr "%s:無法鎖定 shadow 檔\n"
+
+#~ msgid "%s: error updating shadow file\n"
+#~ msgstr "%s:更新shadow檔案時出錯。\n"
+
+#~ msgid "%s: error updating password file\n"
+#~ msgstr "%s:更新密碼檔案時出錯。\n"
+
+#~ msgid "%s: line %d: unknown user %s\n"
+#~ msgstr "%s:第 %d 行:未知使用者 %s\n"
+
+#~ msgid "%s: line %d: cannot update password entry\n"
+#~ msgstr "%s:第 %d 行:無法更新密碼項目\n"
+
+#~ msgid "%s: unknown user\n"
+#~ msgstr "%s:未知使用者\n"
+
+#~ msgid "Unknown User: %s\n"
+#~ msgstr "未知使用者:%s\n"
+
+#~ msgid "Usage: %s [-r|-R] group\n"
+#~ msgstr "用法:%s [-r|-R] 群組\n"
+
+#~ msgid "       %s [-a user] group\n"
+#~ msgstr "       %s [-a 使用者] 群組\n"
+
+#~ msgid "       %s [-d user] group\n"
+#~ msgstr "       %s [-d 使用者] 群組\n"
+
+#~ msgid "       %s [-A user,...] [-M user,...] group\n"
+#~ msgstr "       %s [-A 使用者,...] [-M 使用者,...] 群組\n"
+
+#~ msgid "       %s [-M user,...] group\n"
+#~ msgstr "       %s [-M 使用者,...] 群組\n"
+
+#~ msgid "%s: can't get lock\n"
+#~ msgstr "%s:無法獲得鎖定\n"
+
+#~ msgid "%s: can't get shadow lock\n"
+#~ msgstr "%s:無法獲得shadow鎖定\n"
+
+#~ msgid "%s: can't open file\n"
+#~ msgstr "%s:無法打開檔案\n"
+
+#~ msgid "%s: can't re-write file\n"
+#~ msgstr "%s:無法重寫檔案\n"
+
+#~ msgid "%s: can't re-write shadow file\n"
+#~ msgstr "%s:無法重寫shadow檔案\n"
+
+#~ msgid "%s: can't unlock file\n"
+#~ msgstr "%s 無法解鎖檔案。\n"
+
+#~ msgid "%s: can't update entry\n"
+#~ msgstr "%s:無法更新項目\n"
+
+#~ msgid "%s: can't update shadow entry\n"
+#~ msgstr "%s:無法更新shadow項目\n"
+
+#~ msgid "unknown group: %s\n"
+#~ msgstr "未知群組:%s\n"
+
+#, fuzzy
+#~ msgid "%s: can't close file\n"
+#~ msgstr "%s:無法打開檔案\n"
+
+#, fuzzy
+#~ msgid "%s: can't close shadow file\n"
+#~ msgstr "%s:無法打開 shadow 檔\n"
+
+#~ msgid "Who are you?\n"
+#~ msgstr "你是誰?\n"
+
+#~ msgid "%s: unknown member %s\n"
+#~ msgstr "%s:未知成員 %s\n"
+
+#~ msgid "%s: error adding new group entry\n"
+#~ msgstr "%s:增加新群組項目時出錯\n"
+
+#~ msgid "%s: cannot rewrite group file\n"
+#~ msgstr "%s:無法重寫群組檔案\n"
+
+#~ msgid "%s: cannot rewrite shadow group file\n"
+#~ msgstr "%s:無法重寫shadow群組檔案\n"
+
+#~ msgid "%s: unable to lock group file\n"
+#~ msgstr "%s:無法鎖定群組檔案\n"
+
+#~ msgid "%s: unable to open group file\n"
+#~ msgstr "%s:無法打開群組檔案\n"
+
+#~ msgid "%s: unable to lock shadow group file\n"
+#~ msgstr "%s:無法鎖定shadow群組檔案\n"
+
+#~ msgid "%s: unable to open shadow group file\n"
+#~ msgstr "%s:無法打開shadow群組檔案\n"
+
+#, fuzzy
+#~ msgid "%s: GID %u is not unique\n"
+#~ msgstr "%s:gid %u 並不唯一\n"
+
+#~ msgid "%s: error removing group entry\n"
+#~ msgstr "%s:刪除群組項目時出錯\n"
+
+#~ msgid "%s: error removing shadow group entry\n"
+#~ msgstr "%s:刪除shadow群組項目時出錯\n"
+
+#~ msgid "%s: cannot remove user's primary group.\n"
+#~ msgstr "%s:不能刪除使用者的主群組。\n"
+
+#, fuzzy
+#~ msgid "PAM authentication failed for\n"
+#~ msgstr "%s:PAM 驗証失敗\n"
+
+#, fuzzy
+#~ msgid "Unable to lock group file\n"
+#~ msgstr "%s:無法鎖定群組檔案\n"
+
+#, fuzzy
+#~ msgid "Unable to open group file\n"
+#~ msgstr "%s:無法打開群組檔案\n"
+
+#, fuzzy
+#~ msgid "Cannot close group file\n"
+#~ msgstr "%s:無法打開群組檔案\n"
+
+#~ msgid "%s: %s not found in /etc/group\n"
+#~ msgstr "%s:未在 /etc/group 中找到 %s\n"
+
+#, fuzzy
+#~ msgid "%s: %u is not a unique GID\n"
+#~ msgstr "%s:%u 不是一個唯一的 gid\n"
+
+#~ msgid "%s: %s is not a unique name\n"
+#~ msgstr "%s:%s 不是一個唯一的名稱\n"
+
+#, fuzzy
+#~ msgid "%s: cannot rewrite passwd file\n"
+#~ msgstr "%s:無法重寫密碼檔案\n"
+
+#~ msgid "%s: unable to lock password file\n"
+#~ msgstr "%s:無法鎖定密碼檔案\n"
+
+#~ msgid "%s: unable to open password file\n"
+#~ msgstr "%s:無法打開密碼檔案\n"
+
+#~ msgid "%s: cannot lock file %s\n"
+#~ msgstr "%s:無法鎖定檔案 %s\n"
+
+#~ msgid "%s: can't update shadow entry for %s\n"
+#~ msgstr "%s:無法為 %s 更新shadow項目\n"
+
+#~ msgid "%s: can't update entry for group %s\n"
+#~ msgstr "%s:無法更新 %s 群組的項目\n"
+
+#~ msgid "%s: can't lock shadow group file\n"
+#~ msgstr "%s:無法鎖定shadow群組檔案\n"
+
+#~ msgid "%s: can't open shadow group file\n"
+#~ msgstr "%s:無法打開shadow群組檔案\n"
+
+#~ msgid "%s: can't remove shadow group %s\n"
+#~ msgstr "%s:無法移除shadow群組 %s\n"
+
+#~ msgid "%s: can't update shadow group file\n"
+#~ msgstr "%s:無法更新shadow群組檔案\n"
+
+#~ msgid "%s: can't update group file\n"
+#~ msgstr "%s 無法更新群組檔案\n"
+
+#~ msgid "%s: can't delete shadow group file\n"
+#~ msgstr "%s:無法刪除shadow群組檔案\n"
+
+#, fuzzy
+#~ msgid "unknown UID: %u\n"
+#~ msgstr "未知的 GID:%lu\n"
+
+#~ msgid "unknown GID: %lu\n"
+#~ msgstr "未知的 GID:%lu\n"
+
+#, fuzzy
+#~ msgid "%s: group ID `%s' is not valid\n"
+#~ msgstr "%s:%s 群組不存在\n"
+
+#, fuzzy
+#~ msgid "%s: user ID `%s' is not valid\n"
+#~ msgstr "%s:使用者 %s 不存在\n"
+
+#, fuzzy
+#~ msgid "%s: invalid user name `%s'\n"
+#~ msgstr "%s:無效使用者名稱“%s”\n"
+
+#~ msgid "%s: can't lock /etc/passwd.\n"
+#~ msgstr "%s:無法鎖定 /etc/passwd。\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/shadow.\n"
+#~ msgstr "%s:無法鎖定 /etc/passwd。\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/group.\n"
+#~ msgstr "%s:無法鎖定 /etc/passwd。\n"
+
+#, fuzzy
+#~ msgid "%s: can't lock /etc/gshadow.\n"
+#~ msgstr "%s:無法鎖定 /etc/passwd。\n"
+
+#~ msgid "%s: can't open files\n"
+#~ msgstr "%s:無法打開檔案\n"
+
+#~ msgid "%s: error updating files\n"
+#~ msgstr "%s:更新檔案出錯\n"
+
+#~ msgid "%s: line %d: cannot find user %s\n"
+#~ msgstr "%s:第 %d 行:無法找到使用者 %s\n"
+
+#~ msgid "%s: can't update passwd entry for %s\n"
+#~ msgstr "%s:無法為 %s 更新密碼項目\n"
+
+#~ msgid "%s: can't lock passwd file\n"
+#~ msgstr "%s:無法鎖定密碼檔案\n"
+
+#~ msgid "%s: can't open passwd file\n"
+#~ msgstr "%s:無法打開密碼檔案\n"
+
+#~ msgid "%s: can't remove shadow entry for %s\n"
+#~ msgstr "%s:無法為 %s 刪除shadow項目\n"
+
+#~ msgid "%s: can't update shadow file\n"
+#~ msgstr "%s:無法更新shadow檔案\n"
+
+#~ msgid "%s: can't update passwd file\n"
+#~ msgstr "%s:無法更新密碼檔案\n"
+
+#~ msgid "%s: can't update entry for user %s\n"
+#~ msgstr "%s:不能更新使用者 %s 的項目\n"
+
+#~ msgid "%s: can't delete shadow password file\n"
+#~ msgstr "%s:無法刪除shadow密碼檔案\n"
+
+#~ msgid "%s: unknown GID %s\n"
+#~ msgstr "%s:未知的 GID %s\n"
+
+#~ msgid "%s: unknown group %s\n"
+#~ msgstr "%s:未知的群組 %s\n"
+
+#, fuzzy
+#~ msgid "%s: Out of memory. Cannot update the shadow group database.\n"
+#~ msgstr "%s:update_gshadow 時記憶體不足\n"
+
+#~ msgid "%s: cannot rewrite password file\n"
+#~ msgstr "%s:無法重寫密碼檔案\n"
+
+#~ msgid "%s: cannot rewrite shadow password file\n"
+#~ msgstr "%s:無法重寫shadow密碼檔案\n"
+
+#~ msgid "%s: cannot lock shadow password file\n"
+#~ msgstr "%s:無法鎖定shadow密碼檔案\n"
+
+#~ msgid "%s: cannot open shadow password file\n"
+#~ msgstr "%s:無法打開shadow密碼檔案\n"
+
+#~ msgid "%s: error locking group file\n"
+#~ msgstr "%s:鎖定群組檔案時出錯\n"
+
+#~ msgid "%s: error opening group file\n"
+#~ msgstr "%s:打開群組檔案時出錯\n"
+
+#~ msgid "%s: error locking shadow group file\n"
+#~ msgstr "%s:鎖定shadow群組檔案時出錯\n"
+
+#~ msgid "%s: error opening shadow group file\n"
+#~ msgstr "%s:打開shadow群組檔案時出錯\n"
+
+#~ msgid "%s: error adding new password entry\n"
+#~ msgstr "%s:加入新密碼項目時出錯\n"
+
+#~ msgid "%s: error adding new shadow password entry\n"
+#~ msgstr "%s:加入新shadow密碼項時出錯\n"
+
+#~ msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
+#~ msgstr "%s:警告:CREATE_HOME 不支援,請使用 -m 參數。\n"
+
+#~ msgid "%s: error updating group entry\n"
+#~ msgstr "%s:更新群組項目時出錯\n"
+
+#, fuzzy
+#~ msgid "%s: error updating shadow group entry\n"
+#~ msgstr "%s:更新群組項目時出錯\n"
+
+#~ msgid "%s: cannot open group file\n"
+#~ msgstr "%s:無法打開群組檔案\n"
+
+#~ msgid "%s: cannot open shadow group file\n"
+#~ msgstr "%s:無法打開shadow群組檔案\n"
+
+#~ msgid "%s: error deleting password entry\n"
+#~ msgstr "%s:刪除密碼項目時出錯\n"
+
+#~ msgid "%s: error deleting shadow password entry\n"
+#~ msgstr "%s:刪除shadow密碼項目時出錯\n"
+
+#~ msgid "%s: user %s does not exist\n"
+#~ msgstr "%s:使用者 %s 不存在\n"
+
+#, fuzzy
+#~ msgid "%s: error adding new shadow group entry\n"
+#~ msgstr "%s:增加新群組項目時出錯\n"
+
+#~ msgid "%s: uid %lu is not unique\n"
+#~ msgstr "%s:uid %lu 不唯一\n"
+
+#~ msgid "%s: error changing password entry\n"
+#~ msgstr "%s:改變密碼項目時出錯\n"
+
+#~ msgid "%s: error removing password entry\n"
+#~ msgstr "%s:移除密碼項時出錯\n"
+
+#~ msgid "%s: error removing shadow password entry\n"
+#~ msgstr "%s:刪除shadow密碼項目時出錯\n"
+
+#, fuzzy
 #~ msgid "%s: can't get unique GID\n"
 #~ msgstr "%s:無法獲取獨有的 gid\n"
 
@@ -1978,9 +2143,6 @@
 #~ msgid " on '%.100s'"
 #~ msgstr "在“%.100s”上"
 
-#~ msgid "%s: can't lock files, try again later\n"
-#~ msgstr "%s:無法鎖定檔案,請稍後再試。\n"
-
 #~ msgid "%s: line %d: can't create UID\n"
 #~ msgstr "%s:第 %d 行:無法建立 UID\n"
 
@@ -1988,10 +2150,6 @@
 #~ 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